From c56887d6e6160c128d36de0483db625e28c72798 Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Thu, 15 Apr 2021 16:33:31 +0500 Subject: [PATCH] fix(hasMacroNameInMend): default sets to true --- .sasjslint | 2 +- src/lint/lintFile.spec.ts | 9 ++++++++- src/lint/lintFolder.spec.ts | 9 ++++++++- src/lint/lintProject.spec.ts | 9 ++++++++- src/utils/getLintConfig.spec.ts | 2 +- src/utils/getLintConfig.ts | 2 +- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.sasjslint b/.sasjslint index 2d6a33f..1d5ba7c 100644 --- a/.sasjslint +++ b/.sasjslint @@ -7,7 +7,7 @@ "lowerCaseFileNames": true, "noTabIndentation": true, "indentationMultiple": 2, - "hasMacroNameInMend": false, + "hasMacroNameInMend": true, "noNestedMacros": true, "hasMacroParentheses": true } \ No newline at end of file diff --git a/src/lint/lintFile.spec.ts b/src/lint/lintFile.spec.ts index a7de9ef..96a2af1 100644 --- a/src/lint/lintFile.spec.ts +++ b/src/lint/lintFile.spec.ts @@ -8,7 +8,7 @@ describe('lintFile', () => { path.join(__dirname, '..', 'Example File.sas') ) - expect(results.length).toEqual(8) + expect(results.length).toEqual(9) expect(results).toContainEqual({ message: 'Line contains trailing spaces', lineNumber: 1, @@ -65,5 +65,12 @@ describe('lintFile', () => { endColumnNumber: 1, severity: Severity.Warning }) + expect(results).toContainEqual({ + message: '%mend statement is missing macro name - mf_getuniquelibref', + lineNumber: 17, + startColumnNumber: 3, + endColumnNumber: 9, + severity: 1 + }) }) }) diff --git a/src/lint/lintFolder.spec.ts b/src/lint/lintFolder.spec.ts index 7124d3e..6cde363 100644 --- a/src/lint/lintFolder.spec.ts +++ b/src/lint/lintFolder.spec.ts @@ -10,7 +10,7 @@ describe('lintFolder', () => { const diagnostics = results.get( path.join(__dirname, '..', 'Example File.sas') )! - expect(diagnostics.length).toEqual(8) + expect(diagnostics.length).toEqual(9) expect(diagnostics).toContainEqual({ message: 'Line contains trailing spaces', lineNumber: 1, @@ -67,5 +67,12 @@ describe('lintFolder', () => { endColumnNumber: 1, severity: Severity.Warning }) + expect(diagnostics).toContainEqual({ + message: '%mend statement is missing macro name - mf_getuniquelibref', + lineNumber: 17, + startColumnNumber: 3, + endColumnNumber: 9, + severity: 1 + }) }) }) diff --git a/src/lint/lintProject.spec.ts b/src/lint/lintProject.spec.ts index 3a0b200..223c88e 100644 --- a/src/lint/lintProject.spec.ts +++ b/src/lint/lintProject.spec.ts @@ -15,7 +15,7 @@ describe('lintProject', () => { const diagnostics = results.get( path.join(__dirname, '..', 'Example File.sas') )! - expect(diagnostics.length).toEqual(8) + expect(diagnostics.length).toEqual(9) expect(diagnostics).toContainEqual({ message: 'Line contains trailing spaces', lineNumber: 1, @@ -72,6 +72,13 @@ describe('lintProject', () => { endColumnNumber: 1, severity: Severity.Warning }) + expect(diagnostics).toContainEqual({ + message: '%mend statement is missing macro name - mf_getuniquelibref', + lineNumber: 17, + startColumnNumber: 3, + endColumnNumber: 9, + severity: 1 + }) }) it('should throw an error when a project root is not found', async () => { diff --git a/src/utils/getLintConfig.spec.ts b/src/utils/getLintConfig.spec.ts index 1ea0d94..f59570d 100644 --- a/src/utils/getLintConfig.spec.ts +++ b/src/utils/getLintConfig.spec.ts @@ -17,7 +17,7 @@ describe('getLintConfig', () => { const config = await getLintConfig() expect(config).toBeInstanceOf(LintConfig) - expect(config.fileLintRules.length).toEqual(3) + expect(config.fileLintRules.length).toEqual(4) expect(config.lineLintRules.length).toEqual(5) expect(config.pathLintRules.length).toEqual(2) }) diff --git a/src/utils/getLintConfig.ts b/src/utils/getLintConfig.ts index 43df7c4..69b179e 100644 --- a/src/utils/getLintConfig.ts +++ b/src/utils/getLintConfig.ts @@ -15,7 +15,7 @@ export const DefaultLintConfiguration = { maxLineLength: 80, noTabIndentation: true, indentationMultiple: 2, - hasMacroNameInMend: false, + hasMacroNameInMend: true, noNestedMacros: true, hasMacroParentheses: true }