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

fix(strictMacroDefinition): updated logic for getting params

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

5
src/rules/file/strictMacroDefinition.spec.ts
View File

@@ -114,6 +114,11 @@ describe('strictMacroDefinition', () => {
}) })
describe('multi-content macro declarations', () => { describe('multi-content macro declarations', () => {
it('should return an empty array when the content has correct macro definition syntax', () => {
const content = `%macro mp_ds2cards(base_ds=, tgt_ds=\n ,cards_file="%sysfunc(pathname(work))/cardgen.sas"\n ,maxobs=max\n ,random_sample=NO\n ,showlog=YES\n ,outencoding=\n ,append=NO\n)/*/STORE SOURCE*/;`
expect(strictMacroDefinition.test(content)).toEqual([])
})
it('should return an array with a single diagnostic when Macro definition has space in param', () => { it('should return an array with a single diagnostic when Macro definition has space in param', () => {
const content = `%macro const content = `%macro
somemacro(va r1);` somemacro(va r1);`

4
src/rules/file/strictMacroDefinition.ts
View File

@@ -32,12 +32,12 @@ const test = (value: string, config?: LintConfig) => {
macros.forEach((macro) => { macros.forEach((macro) => {
const declaration = macro.declaration const declaration = macro.declaration
const regExpParams = new RegExp(/\((.*?)\)/) const regExpParams = new RegExp(/(?<=\().*(?=\))/)
const regExpParamsResult = regExpParams.exec(declaration) const regExpParamsResult = regExpParams.exec(declaration)
let _declaration = declaration let _declaration = declaration
if (regExpParamsResult) { if (regExpParamsResult) {
const paramsPresent = regExpParamsResult[1] const paramsPresent = regExpParamsResult[0]
const paramsTrimmed = paramsPresent.trim() const paramsTrimmed = paramsPresent.trim()
const params = paramsTrimmed.split(',') const params = paramsTrimmed.split(',')