chore(*): rename macro properties

src/rules/file/hasMacroNameInMend.ts

@@ -24,8 +24,7 @@ const test = (value: string, config?: LintConfig) => {
         lineNumber: macro.endLineNumber,
         startColumnNumber: getColumnNumber(endLine, '%mend'),
         endColumnNumber:
-          getColumnNumber(endLine, '%mend') +
+          getColumnNumber(endLine, '%mend') + macro.termination.length,
-          macro.terminationTrimmedStatement.length,
         severity: Severity.Warning
       })
     } else if (macro.endLineNumber === null && macro.startLineNumber !== null) {
@@ -79,8 +78,7 @@ const fix = (value: string, config?: LintConfig): string => {
       const endLine = lines[macro.endLineNumber - 1]
       const startColumnNumber = getColumnNumber(endLine, '%mend')
       const endColumnNumber =
-        getColumnNumber(endLine, '%mend') +
+        getColumnNumber(endLine, '%mend') + macro.termination.length
-        macro.terminationTrimmedStatement.length
 
       const beforeStatement = endLine.slice(0, startColumnNumber - 1)
       const afterStatement = endLine.slice(endColumnNumber)

src/rules/file/hasMacroParentheses.ts

@@ -17,19 +17,19 @@ const test = (value: string, config?: LintConfig) => {
       diagnostics.push({
         message: 'Macro definition missing name',
         lineNumber: macro.startLineNumber!,
-        startColumnNumber: getColumnNumber(macro.declaration, '%macro'),
+        startColumnNumber: getColumnNumber(macro.declarationLine, '%macro'),
         endColumnNumber:
-          getColumnNumber(macro.declaration, '%macro') +
+          getColumnNumber(macro.declarationLine, '%macro') +
-          macro.declarationTrimmedStatement.length,
+          macro.declaration.length,
         severity: Severity.Warning
       })
-    } else if (!macro.declaration.includes('(')) {
+    } else if (!macro.declarationLine.includes('(')) {
       diagnostics.push({
         message,
         lineNumber: macro.startLineNumber!,
-        startColumnNumber: getColumnNumber(macro.declaration, macro.name),
+        startColumnNumber: getColumnNumber(macro.declarationLine, macro.name),
         endColumnNumber:
-          getColumnNumber(macro.declaration, macro.name) +
+          getColumnNumber(macro.declarationLine, macro.name) +
           macro.name.length -
           1,
         severity: Severity.Warning
@@ -38,9 +38,9 @@ const test = (value: string, config?: LintConfig) => {
       diagnostics.push({
         message: 'Macro definition contains space(s)',
         lineNumber: macro.startLineNumber!,
-        startColumnNumber: getColumnNumber(macro.declaration, macro.name),
+        startColumnNumber: getColumnNumber(macro.declarationLine, macro.name),
         endColumnNumber:
-          getColumnNumber(macro.declaration, macro.name) +
+          getColumnNumber(macro.declarationLine, macro.name) +
           macro.name.length -
           1 +
           `()`.length,

src/utils/parseMacros.spec.ts

@@ -12,10 +12,10 @@ describe('parseMacros', () => {
     expect(macros.length).toEqual(1)
     expect(macros).toContainEqual({
       name: 'test',
-      declaration: '%macro test;',
+      declarationLine: '%macro test;',
+      terminationLine: '%mend',
+      declaration: '%macro test',
       termination: '%mend',
-      declarationTrimmedStatement: '%macro test',
-      terminationTrimmedStatement: '%mend',
       startLineNumber: 1,
       endLineNumber: 3,
       parentMacro: '',
@@ -38,10 +38,10 @@ describe('parseMacros', () => {
     expect(macros.length).toEqual(2)
     expect(macros).toContainEqual({
       name: 'foo',
-      declaration: '%macro foo;',
+      declarationLine: '%macro foo;',
-      termination: '%mend;',
+      terminationLine: '%mend;',
-      declarationTrimmedStatement: '%macro foo',
+      declaration: '%macro foo',
-      terminationTrimmedStatement: '%mend',
+      termination: '%mend',
       startLineNumber: 1,
       endLineNumber: 3,
       parentMacro: '',
@@ -51,10 +51,10 @@ describe('parseMacros', () => {
     })
     expect(macros).toContainEqual({
       name: 'bar',
-      declaration: '%macro bar();',
+      declarationLine: '%macro bar();',
-      termination: '%mend bar;',
+      terminationLine: '%mend bar;',
-      declarationTrimmedStatement: '%macro bar()',
+      declaration: '%macro bar()',
-      terminationTrimmedStatement: '%mend bar',
+      termination: '%mend bar',
       startLineNumber: 4,
       endLineNumber: 6,
       parentMacro: '',
@@ -77,10 +77,10 @@ describe('parseMacros', () => {
     expect(macros.length).toEqual(2)
     expect(macros).toContainEqual({
       name: 'test',
+      declarationLine: '%macro test()',
+      terminationLine: '%mend test',
       declaration: '%macro test()',
       termination: '%mend test',
-      declarationTrimmedStatement: '%macro test()',
-      terminationTrimmedStatement: '%mend test',
       startLineNumber: 1,
       endLineNumber: 6,
       parentMacro: '',
@@ -90,10 +90,10 @@ describe('parseMacros', () => {
     })
     expect(macros).toContainEqual({
       name: 'test2',
-      declaration: '  %macro test2',
+      declarationLine: '  %macro test2',
-      termination: '  %mend',
+      terminationLine: '  %mend',
-      declarationTrimmedStatement: '%macro test2',
+      declaration: '%macro test2',
-      terminationTrimmedStatement: '%mend',
+      termination: '%mend',
       startLineNumber: 3,
       endLineNumber: 5,
       parentMacro: 'test',

src/utils/parseMacros.ts

@@ -6,10 +6,10 @@ interface Macro {
   name: string
   startLineNumber: number | null
   endLineNumber: number | null
+  declarationLine: string
+  terminationLine: string
   declaration: string
   termination: string
-  declarationTrimmedStatement: string
-  terminationTrimmedStatement: string
   parentMacro: string
   hasMacroNameInMend: boolean
   hasParentheses: boolean
@@ -54,10 +54,10 @@ export const parseMacros = (text: string, config?: LintConfig): Macro[] => {
           hasParentheses: trimmedStatement.endsWith('()'),
           hasMacroNameInMend: false,
           mismatchedMendMacroName: '',
-          declaration: line,
+          declarationLine: line,
-          termination: '',
+          terminationLine: '',
-          declarationTrimmedStatement: trimmedStatement,
+          declaration: trimmedStatement,
-          terminationTrimmedStatement: ''
+          termination: ''
         })
       } else if (trimmedStatement.startsWith('%mend')) {
         if (macroStack.length) {
@@ -69,8 +69,8 @@ export const parseMacros = (text: string, config?: LintConfig): Macro[] => {
           macro.mismatchedMendMacroName = macro.hasMacroNameInMend
             ? ''
             : mendMacroName
-          macro.termination = line
+          macro.terminationLine = line
-          macro.terminationTrimmedStatement = trimmedStatement
+          macro.termination = trimmedStatement
           macros.push(macro)
         } else {
           macros.push({
@@ -81,10 +81,10 @@ export const parseMacros = (text: string, config?: LintConfig): Macro[] => {
             hasParentheses: false,
             hasMacroNameInMend: false,
             mismatchedMendMacroName: '',
+            declarationLine: '',
+            terminationLine: line,
             declaration: '',
-            termination: line,
+            termination: trimmedStatement
-            declarationTrimmedStatement: '',
-            terminationTrimmedStatement: trimmedStatement
           })
         }
       }