sasjs/lint
1
0
Fork 0
mirror of https://github.com/sasjs/lint.git synced 2026-01-09 05:20:06 +00:00
Code Issues Projects Releases Wiki Activity

fix(trimComments): handle case special comment case

Browse Source
This commit is contained in:
Saad Jutt
2021-05-21 18:05:22 +05:00
parent f793eb3a76
commit d391a4e8fc
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/trimComments.spec.ts
View File

@@ -8,6 +8,18 @@ describe('trimComments', () => {
`) `)
).toEqual({ statement: 'some code;', commentStarted: false }) ).toEqual({ statement: 'some code;', commentStarted: false })
expect(
trimComments(`
/*/ some comment */ some code;
`)
).toEqual({ statement: 'some code;', commentStarted: false })
expect(
trimComments(`
some code;/*/ some comment */ some code;
`)
).toEqual({ statement: 'some code; some code;', commentStarted: false })
expect( expect(
trimComments(`/* some comment */ trimComments(`/* some comment */
/* some comment */ CODE_Keyword1 /* some comment */ CODE_Keyword2/* some comment */;/* some comment */ /* some comment */ CODE_Keyword1 /* some comment */ CODE_Keyword2/* some comment */;/* some comment */

10
src/utils/trimComments.ts
View File

@@ -6,7 +6,9 @@ export const trimComments = (
let trimmed = trimEnd ? (statement || '').trimEnd() : (statement || '').trim() let trimmed = trimEnd ? (statement || '').trimEnd() : (statement || '').trim()
if (commentStarted || trimmed.startsWith('/*')) { if (commentStarted || trimmed.startsWith('/*')) {
const parts = trimmed.split('*/') const parts = trimmed.startsWith('/*')
? trimmed.slice(2).split('*/')
: trimmed.split('*/')
if (parts.length === 2) { if (parts.length === 2) {
return { return {
statement: (parts.pop() as string).trim(), statement: (parts.pop() as string).trim(),
@@ -20,10 +22,8 @@ export const trimComments = (
} }
} else if (trimmed.includes('/*')) { } else if (trimmed.includes('/*')) {
const statementBeforeCommentStarts = trimmed.slice(0, trimmed.indexOf('/*')) const statementBeforeCommentStarts = trimmed.slice(0, trimmed.indexOf('/*'))
const remainingStatement = trimmed.slice( trimmed = trimmed.slice(trimmed.indexOf('/*') + 2)
trimmed.indexOf('*/') + 2, const remainingStatement = trimmed.slice(trimmed.indexOf('*/') + 2)
trimmed.length
)
const result = trimComments(remainingStatement, false, true) const result = trimComments(remainingStatement, false, true)
const completeStatement = statementBeforeCommentStarts + result.statement const completeStatement = statementBeforeCommentStarts + result.statement