feat: new rules noNestedMacros & hasMacroParentheses

src/rules/hasMacroNameInMend.ts

@@ -2,6 +2,9 @@ import { Diagnostic } from '../types/Diagnostic'
 import { FileLintRule } from '../types/LintRule'
 import { LintRuleType } from '../types/LintRuleType'
 import { Severity } from '../types/Severity'
+import { trimComments } from '../utils/trimComments'
+import { getLineNumber } from '../utils/getLineNumber'
+import { getColNumber } from '../utils/getColNumber'
 
 const name = 'hasMacroNameInMend'
 const description = 'The %mend statement should contain the macro name'
@@ -46,7 +49,7 @@ const test = (value: string) => {
           lineNumber: getLineNumber(statements, index + 1),
           startColumnNumber: getColNumber(statement, macroName),
           endColumnNumber:
-            getColNumber(statement, macroName) + macroName.length,
+            getColNumber(statement, macroName) + macroName.length - 1,
           severity: Severity.Warning
         })
       }
@@ -64,36 +67,6 @@ const test = (value: string) => {
   return diagnostics
 }
 
-const trimComments = (
-  statement: string,
-  commentStarted: boolean = false
-): { statement: string; commentStarted: boolean } => {
-  let trimmed = statement.trim()
-
-  if (commentStarted || trimmed.startsWith('/*')) {
-    const parts = trimmed.split('*/')
-    if (parts.length > 1) {
-      return {
-        statement: (parts.pop() as string).trim(),
-        commentStarted: false
-      }
-    } else {
-      return { statement: '', commentStarted: true }
-    }
-  }
-  return { statement: trimmed, commentStarted: false }
-}
-
-const getLineNumber = (statements: string[], index: number): number => {
-  const combinedCode = statements.slice(0, index).join(';')
-  const lines = (combinedCode.match(/\n/g) || []).length + 1
-  return lines
-}
-
-const getColNumber = (statement: string, text: string): number => {
-  return (statement.split('\n').pop() as string).indexOf(text) + 1
-}
-
 /**
  * Lint rule that checks for the presence of macro name in %mend statement.
  */