fix: Updated Code + messages has macro name

src/rules/hasMacroNameInMend.spec.ts

@@ -28,7 +28,7 @@ describe('hasMacroNameInMend', () => {
 
     expect(hasMacroNameInMend.test(content)).toEqual([
       {
-        message: '%mend statement is missing macro name',
+        message: '%mend statement is missing macro name - somemacro',
         lineNumber: 4,
         startColumnNumber: 3,
         endColumnNumber: 9,
@@ -83,7 +83,7 @@ describe('hasMacroNameInMend', () => {
 
     expect(hasMacroNameInMend.test(content)).toEqual([
       {
-        message: '%mend statement has mismatched macro name',
+        message: `%mend statement has mismatched macro name, it should be 'somemacro'`,
         lineNumber: 4,
         startColumnNumber: 9,
         endColumnNumber: 24,
@@ -126,7 +126,7 @@ describe('hasMacroNameInMend', () => {
 
       expect(hasMacroNameInMend.test(content)).toEqual([
         {
-          message: '%mend statement is missing macro name',
+          message: '%mend statement is missing macro name - inner',
           lineNumber: 6,
           startColumnNumber: 5,
           endColumnNumber: 11,
@@ -148,7 +148,7 @@ describe('hasMacroNameInMend', () => {
 
       expect(hasMacroNameInMend.test(content)).toEqual([
         {
-          message: '%mend statement is missing macro name',
+          message: '%mend statement is missing macro name - outer',
           lineNumber: 9,
           startColumnNumber: 3,
           endColumnNumber: 9,
@@ -170,14 +170,14 @@ describe('hasMacroNameInMend', () => {
 
       expect(hasMacroNameInMend.test(content)).toEqual([
         {
-          message: '%mend statement is missing macro name',
+          message: '%mend statement is missing macro name - inner',
           lineNumber: 6,
           startColumnNumber: 5,
           endColumnNumber: 11,
           severity: Severity.Warning
         },
         {
-          message: '%mend statement is missing macro name',
+          message: '%mend statement is missing macro name - outer',
           lineNumber: 9,
           startColumnNumber: 3,
           endColumnNumber: 9,
@@ -235,7 +235,7 @@ describe('hasMacroNameInMend', () => {
 
       expect(hasMacroNameInMend.test(content)).toEqual([
         {
-          message: '%mend statement is missing macro name',
+          message: '%mend statement is missing macro name - examplemacro',
           lineNumber: 29,
           startColumnNumber: 5,
           endColumnNumber: 11,
@@ -254,7 +254,7 @@ describe('hasMacroNameInMend', () => {
 
       expect(hasMacroNameInMend.test(content)).toEqual([
         {
-          message: '%mend statement has mismatched macro name',
+          message: `%mend statement has mismatched macro name, it should be 'somemacro'`,
           lineNumber: 6,
           startColumnNumber: 14,
           endColumnNumber: 29,
@@ -271,7 +271,7 @@ describe('hasMacroNameInMend', () => {
 
       expect(hasMacroNameInMend.test(content)).toEqual([
         {
-          message: '%mend statement is missing macro name',
+          message: '%mend statement is missing macro name - somemacro',
           lineNumber: 4,
           startColumnNumber: 5,
           endColumnNumber: 11,

src/rules/hasMacroNameInMend.ts

@@ -13,11 +13,19 @@ const message = '%mend statement has missing or incorrect macro name'
 const test = (value: string) => {
   const diagnostics: Diagnostic[] = []
 
-  const statements: string[] = value ? value.split(';') : []
+  const lines: string[] = value ? value.split('\n') : []
 
   const declaredMacros: { name: string; lineNumber: number }[] = []
   let isCommentStarted = false
-  statements.forEach((statement, index) => {
+  lines.forEach((line, index) => {
+    const { statement: trimmedLine, commentStarted } = trimComments(
+      line,
+      isCommentStarted
+    )
+    isCommentStarted = commentStarted
+    const statements: string[] = trimmedLine ? trimmedLine.split(';') : []
+
+    statements.forEach((statement) => {
       const { statement: trimmedStatement, commentStarted } = trimComments(
         statement,
         isCommentStarted
@@ -31,7 +39,7 @@ const test = (value: string) => {
           .split('(')[0]
         declaredMacros.push({
           name: macroName,
-        lineNumber: getLineNumber(statements, index + 1)
+          lineNumber: getLineNumber(lines, index + 1)
         })
       } else if (trimmedStatement.startsWith('%mend')) {
         const declaredMacro = declaredMacros.pop()
@@ -41,24 +49,29 @@ const test = (value: string) => {
 
         if (!macroName) {
           diagnostics.push({
-          message: '%mend statement is missing macro name',
+            message: `%mend statement is missing macro name - ${
-          lineNumber: getLineNumber(statements, index + 1),
+              declaredMacro!.name
-          startColumnNumber: getColumnNumber(statement, '%mend'),
+            }`,
-          endColumnNumber: getColumnNumber(statement, '%mend') + 6,
+            lineNumber: getLineNumber(lines, index + 1),
+            startColumnNumber: getColumnNumber(line, '%mend'),
+            endColumnNumber: getColumnNumber(line, '%mend') + 6,
             severity: Severity.Warning
           })
         } else if (macroName !== declaredMacro!.name) {
           diagnostics.push({
-          message: '%mend statement has mismatched macro name',
+            message: `%mend statement has mismatched macro name, it should be '${
-          lineNumber: getLineNumber(statements, index + 1),
+              declaredMacro!.name
-          startColumnNumber: getColumnNumber(statement, macroName),
+            }'`,
+            lineNumber: getLineNumber(lines, index + 1),
+            startColumnNumber: getColumnNumber(line, macroName),
             endColumnNumber:
-            getColumnNumber(statement, macroName) + macroName.length - 1,
+              getColumnNumber(line, macroName) + macroName.length - 1,
             severity: Severity.Warning
           })
         }
       }
     })
+  })
 
   declaredMacros.forEach((declaredMacro) => {
     diagnostics.push({

src/rules/hasMacroParentheses.spec.ts

@@ -36,7 +36,7 @@ describe('hasMacroParentheses', () => {
 
     expect(hasMacroParentheses.test(content)).toEqual([
       {
-        message: 'Macro definition missing name',
+        message: 'Macro definition contains space(s)',
         lineNumber: 2,
         startColumnNumber: 3,
         endColumnNumber: 12,
@@ -53,10 +53,10 @@ describe('hasMacroParentheses', () => {
 
     expect(hasMacroParentheses.test(content)).toEqual([
       {
-        message: 'Macro definition missing name',
+        message: 'Macro definition contains space(s)',
         lineNumber: 2,
         startColumnNumber: 3,
-        endColumnNumber: 10,
+        endColumnNumber: 9,
         severity: Severity.Warning
       }
     ])

src/rules/hasMacroParentheses.ts

@@ -12,10 +12,17 @@ const message = 'Macro definition missing parentheses'
 const test = (value: string) => {
   const diagnostics: Diagnostic[] = []
 
-  const statements: string[] = value ? value.split(';') : []
+  const lines: string[] = value ? value.split('\n') : []
-
   let isCommentStarted = false
-  statements.forEach((statement, index) => {
+  lines.forEach((line, index) => {
+    const { statement: trimmedLine, commentStarted } = trimComments(
+      line,
+      isCommentStarted
+    )
+    isCommentStarted = commentStarted
+    const statements: string[] = trimmedLine ? trimmedLine.split(';') : []
+
+    statements.forEach((statement) => {
       const { statement: trimmedStatement, commentStarted } = trimComments(
         statement,
         isCommentStarted
@@ -32,19 +39,20 @@ const test = (value: string) => {
 
         if (!macroName)
           diagnostics.push({
-          message: 'Macro definition missing name',
+            message: 'Macro definition contains space(s)',
-          lineNumber: getLineNumber(statements, index + 1),
+            lineNumber: getLineNumber(lines, index + 1),
-          startColumnNumber: getColumnNumber(statement, '%macro'),
+            startColumnNumber: getColumnNumber(line, '%macro'),
-          endColumnNumber: statement.length,
+            endColumnNumber:
+              getColumnNumber(line, '%macro') + trimmedStatement.length,
             severity: Severity.Warning
           })
         else if (macroNameDefinitionParts.length === 1)
           diagnostics.push({
             message,
-          lineNumber: getLineNumber(statements, index + 1),
+            lineNumber: getLineNumber(lines, index + 1),
-          startColumnNumber: getColumnNumber(statement, macroNameDefinition),
+            startColumnNumber: getColumnNumber(line, macroNameDefinition),
             endColumnNumber:
-            getColumnNumber(statement, macroNameDefinition) +
+              getColumnNumber(line, macroNameDefinition) +
               macroNameDefinition.length -
               1,
             severity: Severity.Warning
@@ -52,16 +60,17 @@ const test = (value: string) => {
         else if (macroName !== macroName.trim())
           diagnostics.push({
             message: 'Macro definition contains space(s)',
-          lineNumber: getLineNumber(statements, index + 1),
+            lineNumber: getLineNumber(lines, index + 1),
-          startColumnNumber: getColumnNumber(statement, macroNameDefinition),
+            startColumnNumber: getColumnNumber(line, macroNameDefinition),
             endColumnNumber:
-            getColumnNumber(statement, macroNameDefinition) +
+              getColumnNumber(line, macroNameDefinition) +
               macroNameDefinition.length -
               1,
             severity: Severity.Warning
           })
       }
     })
+  })
   return diagnostics
 }
 

src/rules/noNestedMacros.ts

@@ -11,12 +11,19 @@ const description = 'Enfoces the absence of nested macro definitions.'
 const message = `Macro definition for '{macro}' present in macro '{parent}'`
 const test = (value: string) => {
   const diagnostics: Diagnostic[] = []
-
-  const statements: string[] = value ? value.split(';') : []
-
   const declaredMacros: string[] = []
+
+  const lines: string[] = value ? value.split('\n') : []
   let isCommentStarted = false
-  statements.forEach((statement, index) => {
+  lines.forEach((line, index) => {
+    const { statement: trimmedLine, commentStarted } = trimComments(
+      line,
+      isCommentStarted
+    )
+    isCommentStarted = commentStarted
+    const statements: string[] = trimmedLine ? trimmedLine.split(';') : []
+
+    statements.forEach((statement) => {
       const { statement: trimmedStatement, commentStarted } = trimComments(
         statement,
         isCommentStarted
@@ -34,10 +41,10 @@ const test = (value: string) => {
             message: message
               .replace('{macro}', macroName)
               .replace('{parent}', parentMacro!),
-          lineNumber: getLineNumber(statements, index + 1),
+            lineNumber: getLineNumber(lines, index + 1),
-          startColumnNumber: getColumnNumber(statement, '%macro'),
+            startColumnNumber: getColumnNumber(line, '%macro'),
             endColumnNumber:
-            getColumnNumber(statement, '%macro') + trimmedStatement.length - 1,
+              getColumnNumber(line, '%macro') + trimmedStatement.length - 1,
             severity: Severity.Warning
           })
         }
@@ -46,6 +53,7 @@ const test = (value: string) => {
         declaredMacros.pop()
       }
     })
+  })
   return diagnostics
 }
 

src/utils/getLineNumber.ts

@@ -1,5 +1,4 @@
-export const getLineNumber = (statements: string[], index: number): number => {
+export const getLineNumber = (lines: string[], index: number): number => {
-  const combinedCode = statements.slice(0, index).join(';')
+  const combinedCode = lines.slice(0, index).join('\n')
-  const lines = (combinedCode.match(/\n/g) || []).length + 1
+  return (combinedCode.match(/\n/g) || []).length + 1
-  return lines
 }