1
0
mirror of https://github.com/sasjs/lint.git synced 2025-12-10 17:34:36 +00:00

Compare commits

...

17 Commits

Author SHA1 Message Date
Allan Bowe
a9a3a67f3d Merge pull request #22 from sasjs/issue-16
feat: new rules noNestedMacros & hasMacroParentheses
2021-04-06 21:18:43 +01:00
Muhammad Saad
524439fba0 Merge branch 'main' into issue-16 2021-04-07 01:07:29 +05:00
Saad Jutt
883b0f69f7 fix: correct highlighting 2021-04-07 01:03:20 +05:00
Saad Jutt
1808d9851a test: for hasMacroParentheses & noNestedMacros 2021-04-07 00:58:38 +05:00
Allan Bowe
39b8c4b0c4 Update README.md 2021-04-06 15:50:02 +01:00
Saad Jutt
3530badf49 feat: new rules noNestedMacros & hasMacroParentheses 2021-04-06 19:45:42 +05:00
Allan Bowe
3b130a797e Update README.md 2021-04-06 15:42:20 +01:00
Allan Bowe
3970f05dc9 Merge pull request #21 from sasjs/issue-12
feat: new rule hasMacroNameInMend
2021-04-06 10:54:11 +01:00
Saad Jutt
443bdc0a50 fix(hasMacroNameInMend): added support for comments having code in it 2021-04-06 14:34:51 +05:00
Saad Jutt
2f07bfa0a1 chore: updated tests 2021-04-05 22:58:59 +05:00
Saad Jutt
86554a074c chore: tests fix 2021-04-05 22:00:45 +05:00
Saad Jutt
5782886bdc fix(hasMacroNameInMend): linting through comments 2021-04-05 21:56:28 +05:00
Saad Jutt
a0e2c2d843 feat: new rule hasMacroNameInMend 2021-04-05 21:30:09 +05:00
Allan Bowe
82bef9f26b Update README.md 2021-04-03 23:57:47 +01:00
Allan Bowe
986aa18197 Update README.md 2021-04-03 22:42:57 +01:00
Allan Bowe
68e0c85efd Update README.md 2021-04-03 22:33:18 +01:00
Allan Bowe
d7b90d33ab chore: README 2021-04-03 21:32:23 +00:00
15 changed files with 934 additions and 8 deletions

View File

@@ -6,5 +6,8 @@
"maxLineLength": 80, "maxLineLength": 80,
"lowerCaseFileNames": true, "lowerCaseFileNames": true,
"noTabIndentation": true, "noTabIndentation": true,
"indentationMultiple": 2 "indentationMultiple": 2,
"hasMacroNameInMend": false,
"noNestedMacros": true,
"hasMacroParentheses": true
} }

115
README.md
View File

@@ -1,2 +1,113 @@
# lint # SAS Code linting and formatting
Linting and formatting for SAS® code
Our goal is to help SAS developers everywhere spend less time on code reviews, bug fixing and arguing about standards - and more time delivering extraordinary business value.
## Linting
@sasjs/lint is used by the following products:
* [@sasjs/vscode-extension](https://github.com/sasjs/vscode-extension) - just download SASjs in the VSCode marketplace, and select view/problems in the menu bar.
* [@sasjs/cli](https://cli.sasjs.io/lint) - run `sasjs lint` to get a list of all files with their problems, along with line and column indexes.
Configuration is via a `.sasjslint` file with the following structure (these are also the defaults if no .sasjslint file is found):
```json
{
"noEncodedPasswords": true,
"hasDoxygenHeader": true,
"indentationMultiple": 2,
"lowerCaseFileNames": true,
"maxLineLength": 80,
"noSpacesInFileNames": true,
"noTabIndentation": true,
"noTrailingSpaces": true
}
```
### SAS Lint Settings
#### noEncodedPasswords
This will highlight any rows that contain a `{sas00X}` type password, or `{sasenc}`. These passwords (especially 001 and 002) are NOT secure, and should NEVER be pushed to source control or saved to the filesystem without special permissions applied.
Severity: ERROR
#### hasDoxygenHeader
The SASjs framework recommends the use of Doxygen headers for describing all types of SAS program. This check will identify files where a doxygen header does not begin in the first line.
Severity: WARNING
#### indentationMultiple
This will check each line to ensure that the count of leading spaces can be divided cleanly by this multiple.
Severity: WARNING
#### lowerCaseFileNames
On *nix systems, it is imperative that autocall macros are in lowercase. When sharing code between windows and *nix systems, the difference in case sensitivity can also be a cause of lost developer time. For this reason, we recommend that sas filenames are always lowercase.
Severity: WARNING
#### maxLineLength
Code becomes far more readable when line lengths are short. The most compelling reason for short line lengths is to avoid the need to scroll when performing a side-by-side 'compare' between two files (eg as part of a GIT feature branch review). A longer discussion on optimal code line length can be found [here](https://stackoverflow.com/questions/578059/studies-on-optimal-code-width)
In batch mode, long SAS code lines may also be truncated, causing hard-to-detect errors.
For this reason we strongly recommend a line length limit, and we set the bar at 80. To turn this feature off, set the value to 0.
Severity: WARNING
#### noSpacesInFileNames
The 'beef' we have with spaces in filenames is twofold:
* Loss of the in-built ability to 'click' a filepath and have the file open automatically
* The need to quote such filepaths in order to use them in CLI commands
In addition, when such files are used in URLs, they are often padded with a messy "%20" type quotation. And of course, for macros (where the macro should match the filename) then spaces are simply not valid.
Severity: WARNING
#### noTabIndentation
Whilst there are some arguments for using tabs to indent (such as the ability to set your own indentation width, and to save on characters) there are many, many, many developers who think otherwise. We're in that camp. Sorry (not sorry).
Severity: WARNING
#### noTrailingSpaces
This will highlight lines with trailing spaces. Trailing spaces serve no useful purpose in a SAS program.
severity: WARNING
### Upcoming Linting Rules:
* `noTabs` -> does what it says on the tin
* `noGremlins` -> identifies all invisible characters, other than spaces / tabs / line endings. If you really need that bell character, use a hex literal!
* `hasMendName` -> show the macro name in the %mend statement
* `noNestedMacros` -> highlight where macros are defined inside other macros
* `lineEndings` -> set a standard line ending, such as LF or CRLF
## SAS Formatter
A formatter will automatically apply rules when you hit SAVE, which can save a LOT of time.
We're looking to implement the following rules:
* Remove trailing spaces
* Change tabs to spaces
* Add the macro name to the %mend statement
* Add a doxygen header template if none exists
Later we will investigate some harder stuff, such as automatic indentation and code layout
## Sponsorship & Contributions
SASjs is an open source framework! Contributions are welcomed. If you would like to see a feature, because it would be useful in your project, but you don't have the requisite (Typescript) experience - then how about you engage us on a short project and we build it for you?
Contact [Allan Bowe](https://www.linkedin.com/in/allanbowe/) for further details.
## SAS 9 Health check
The SASjs Linter (and formatter) is a great way to de-risk and accelerate the delivery of SAS code into production environments. However, code is just one part of a SAS estate. If you are running SAS 9, you may be interested to know what 'gremlins' are lurking in your system. Maybe you are preparing for a migration. Maybe you are preparing to hand over the control of your environment. Either way, an assessment of your existing system would put minds at rest and pro-actively identify trouble spots.
The SAS 9 Health Check is a 'plug & play' product, that uses the [SAS 9 REST API](https://sas9api.io) to run hundreds of metadata and system checks to identify common problems. The checks are non-invasive, and becuase it is a client app, there is NOTHING TO INSTALL on your SAS server. We offer this assessment for a low fixed fee, and if you engage our (competitively priced) services to address the issues we highlight, then the assessment is free.
Contact [Allan Bowe](https://www.linkedin.com/in/allanbowe/) for further details.

View File

@@ -0,0 +1,266 @@
import { Severity } from '../types/Severity'
import { hasMacroNameInMend } from './hasMacroNameInMend'
describe('hasMacroNameInMend', () => {
it('should return an empty array when %mend has correct macro name', () => {
const content = `
%macro somemacro();
%put &sysmacroname;
%mend somemacro;`
expect(hasMacroNameInMend.test(content)).toEqual([])
})
it('should return an empty array when %mend has correct macro name without parentheses', () => {
const content = `
%macro somemacro;
%put &sysmacroname;
%mend somemacro;`
expect(hasMacroNameInMend.test(content)).toEqual([])
})
it('should return an array with a single diagnostic when %mend has no macro name', () => {
const content = `
%macro somemacro;
%put &sysmacroname;
%mend;`
expect(hasMacroNameInMend.test(content)).toEqual([
{
message: '%mend missing macro name',
lineNumber: 4,
startColumnNumber: 3,
endColumnNumber: 9,
severity: Severity.Warning
}
])
})
it('should return an array with a single diagnostic when %mend has incorrect macro name', () => {
const content = `
%macro somemacro;
%put &sysmacroname;
%mend someanothermacro;`
expect(hasMacroNameInMend.test(content)).toEqual([
{
message: 'mismatch macro name in %mend statement',
lineNumber: 4,
startColumnNumber: 9,
endColumnNumber: 24,
severity: Severity.Warning
}
])
})
it('should return an empty array when the file is undefined', () => {
const content = undefined
expect(hasMacroNameInMend.test((content as unknown) as string)).toEqual([])
})
describe('nestedMacros', () => {
it('should return an empty array when %mend has correct macro name', () => {
const content = `
%macro outer();
%macro inner();
%put inner;
%mend inner;
%inner()
%put outer;
%mend outer;`
expect(hasMacroNameInMend.test(content)).toEqual([])
})
it('should return an array with a single diagnostic when %mend has no macro name(inner)', () => {
const content = `
%macro outer();
%macro inner();
%put inner;
%mend;
%inner()
%put outer;
%mend outer;`
expect(hasMacroNameInMend.test(content)).toEqual([
{
message: '%mend missing macro name',
lineNumber: 6,
startColumnNumber: 5,
endColumnNumber: 11,
severity: Severity.Warning
}
])
})
it('should return an array with a single diagnostic when %mend has no macro name(outer)', () => {
const content = `
%macro outer();
%macro inner();
%put inner;
%mend inner;
%inner()
%put outer;
%mend;`
expect(hasMacroNameInMend.test(content)).toEqual([
{
message: '%mend missing macro name',
lineNumber: 9,
startColumnNumber: 3,
endColumnNumber: 9,
severity: Severity.Warning
}
])
})
it('should return an array with two diagnostics when %mend has no macro name(none)', () => {
const content = `
%macro outer();
%macro inner();
%put inner;
%mend;
%inner()
%put outer;
%mend;`
expect(hasMacroNameInMend.test(content)).toEqual([
{
message: '%mend missing macro name',
lineNumber: 6,
startColumnNumber: 5,
endColumnNumber: 11,
severity: Severity.Warning
},
{
message: '%mend missing macro name',
lineNumber: 9,
startColumnNumber: 3,
endColumnNumber: 9,
severity: Severity.Warning
}
])
})
})
describe('with extra spaces and comments', () => {
it('should return an empty array when %mend has correct macro name', () => {
const content = `
/* 1st comment */
%macro somemacro ;
%put &sysmacroname;
/* 2nd
comment */
/* 3rd comment */ %mend somemacro ;`
expect(hasMacroNameInMend.test(content)).toEqual([])
})
it('should return an array with a single diagnostic when %mend has correct macro name having code in comments', () => {
const content = `/**
@file examplemacro.sas
@brief an example of a macro to be used in a service
@details This macro is great. Yadda yadda yadda. Usage:
* code formatting applies when indented by 4 spaces; code formatting applies when indented by 4 spaces; code formatting applies when indented by 4 spaces; code formatting applies when indented by 4 spaces; code formatting applies when indented by 4 spaces;
some code
%macro examplemacro123();
%examplemacro()
<h4> SAS Macros </h4>
@li doesnothing.sas
@author Allan Bowe
**/
%macro examplemacro();
proc sql;
create table areas
as select area
from sashelp.springs;
%doesnothing();
%mend;`
expect(hasMacroNameInMend.test(content)).toEqual([
{
message: '%mend missing macro name',
lineNumber: 29,
startColumnNumber: 5,
endColumnNumber: 11,
severity: Severity.Warning
}
])
})
it('should return an array with a single diagnostic when %mend has incorrect macro name', () => {
const content = `
%macro somemacro;
/* some comments */
%put &sysmacroname;
/* some comments */
%mend someanothermacro ;`
expect(hasMacroNameInMend.test(content)).toEqual([
{
message: 'mismatch macro name in %mend statement',
lineNumber: 6,
startColumnNumber: 14,
endColumnNumber: 29,
severity: Severity.Warning
}
])
})
it('should return an array with a single diagnostic when %mend has no macro name', () => {
const content = `
%macro somemacro ;
/* some comments */%put &sysmacroname;
%mend ;`
expect(hasMacroNameInMend.test(content)).toEqual([
{
message: '%mend missing macro name',
lineNumber: 4,
startColumnNumber: 5,
endColumnNumber: 11,
severity: Severity.Warning
}
])
})
describe('nestedMacros', () => {
it('should return an empty array when %mend has correct macro name', () => {
const content = `
%macro outer( ) ;
%macro inner();
%put inner;
%mend inner;
%inner()
%put outer;
%mend outer;`
expect(hasMacroNameInMend.test(content)).toEqual([])
})
})
})
})

View File

@@ -0,0 +1,79 @@
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'
const message = '$mend statement missing or incorrect'
const test = (value: string) => {
const diagnostics: Diagnostic[] = []
const statements: string[] = value ? value.split(';') : []
const stack: string[] = []
let trimmedStatement = '',
commentStarted = false
statements.forEach((statement, index) => {
;({ statement: trimmedStatement, commentStarted } = trimComments(
statement,
commentStarted
))
if (trimmedStatement.startsWith('%macro ')) {
const macroName = trimmedStatement
.slice(7, trimmedStatement.length)
.trim()
.split('(')[0]
stack.push(macroName)
} else if (trimmedStatement.startsWith('%mend')) {
const macroStarted = stack.pop()
const macroName = trimmedStatement
.split(' ')
.filter((s: string) => !!s)[1]
if (!macroName) {
diagnostics.push({
message: '%mend missing macro name',
lineNumber: getLineNumber(statements, index + 1),
startColumnNumber: getColNumber(statement, '%mend'),
endColumnNumber: getColNumber(statement, '%mend') + 6,
severity: Severity.Warning
})
} else if (macroName !== macroStarted) {
diagnostics.push({
message: 'mismatch macro name in %mend statement',
lineNumber: getLineNumber(statements, index + 1),
startColumnNumber: getColNumber(statement, macroName),
endColumnNumber:
getColNumber(statement, macroName) + macroName.length - 1,
severity: Severity.Warning
})
}
}
})
if (stack.length) {
diagnostics.push({
message: 'missing %mend statement for macro(s)',
lineNumber: statements.length + 1,
startColumnNumber: 1,
endColumnNumber: 1,
severity: Severity.Warning
})
}
return diagnostics
}
/**
* Lint rule that checks for the presence of macro name in %mend statement.
*/
export const hasMacroNameInMend: FileLintRule = {
type: LintRuleType.File,
name,
description,
message,
test
}

View File

@@ -0,0 +1,128 @@
import { Severity } from '../types/Severity'
import { hasMacroParentheses } from './hasMacroParentheses'
describe('hasMacroParentheses', () => {
it('should return an empty array when macro defined correctly', () => {
const content = `
%macro somemacro();
%put &sysmacroname;
%mend somemacro;`
expect(hasMacroParentheses.test(content)).toEqual([])
})
it('should return an array with a single diagnostics when macro defined without parentheses', () => {
const content = `
%macro somemacro;
%put &sysmacroname;
%mend somemacro;`
expect(hasMacroParentheses.test(content)).toEqual([
{
message: 'Macro definition missing parentheses',
lineNumber: 2,
startColumnNumber: 10,
endColumnNumber: 18,
severity: Severity.Warning
}
])
})
it('should return an array with a single diagnostics when macro defined without name', () => {
const content = `
%macro ();
%put &sysmacroname;
%mend;`
expect(hasMacroParentheses.test(content)).toEqual([
{
message: 'Macro definition missing name',
lineNumber: 2,
startColumnNumber: 3,
endColumnNumber: 12,
severity: Severity.Warning
}
])
})
it('should return an array with a single diagnostics when macro defined without name and parentheses', () => {
const content = `
%macro ;
%put &sysmacroname;
%mend;`
expect(hasMacroParentheses.test(content)).toEqual([
{
message: 'Macro definition missing name',
lineNumber: 2,
startColumnNumber: 3,
endColumnNumber: 10,
severity: Severity.Warning
}
])
})
it('should return an empty array when the file is undefined', () => {
const content = undefined
expect(hasMacroParentheses.test((content as unknown) as string)).toEqual([])
})
describe('with extra spaces and comments', () => {
it('should return an empty array when %mend has correct macro name', () => {
const content = `
/* 1st comment */
%macro somemacro();
%put &sysmacroname;
/* 2nd
comment */
/* 3rd comment */ %mend somemacro ;`
expect(hasMacroParentheses.test(content)).toEqual([])
})
it('should return an array with a single diagnostic when macro defined without parentheses having code in comments', () => {
const content = `/**
@file examplemacro.sas
@brief an example of a macro to be used in a service
@details This macro is great. Yadda yadda yadda. Usage:
* code formatting applies when indented by 4 spaces; code formatting applies when indented by 4 spaces; code formatting applies when indented by 4 spaces; code formatting applies when indented by 4 spaces; code formatting applies when indented by 4 spaces;
some code
%macro examplemacro123();
%examplemacro()
<h4> SAS Macros </h4>
@li doesnothing.sas
@author Allan Bowe
**/
%macro examplemacro;
proc sql;
create table areas
as select area
from sashelp.springs;
%doesnothing();
%mend;`
expect(hasMacroParentheses.test(content)).toEqual([
{
message: 'Macro definition missing parentheses',
lineNumber: 19,
startColumnNumber: 12,
endColumnNumber: 23,
severity: Severity.Warning
}
])
})
})
})

View File

@@ -0,0 +1,77 @@
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 = 'hasMacroParentheses'
const description = 'Macros are always defined with parentheses'
const message = 'Macro definition missing parentheses'
const test = (value: string) => {
const diagnostics: Diagnostic[] = []
const statements: string[] = value ? value.split(';') : []
let trimmedStatement = '',
commentStarted = false
statements.forEach((statement, index) => {
;({ statement: trimmedStatement, commentStarted } = trimComments(
statement,
commentStarted
))
if (trimmedStatement.startsWith('%macro')) {
const macroNameDefinition = trimmedStatement
.slice(7, trimmedStatement.length)
.trim()
const macroNameDefinitionParts = macroNameDefinition.split('(')
const macroName = macroNameDefinitionParts[0]
if (!macroName)
diagnostics.push({
message: 'Macro definition missing name',
lineNumber: getLineNumber(statements, index + 1),
startColumnNumber: getColNumber(statement, '%macro'),
endColumnNumber: statement.length,
severity: Severity.Warning
})
else if (macroNameDefinitionParts.length === 1)
diagnostics.push({
message,
lineNumber: getLineNumber(statements, index + 1),
startColumnNumber: getColNumber(statement, macroNameDefinition),
endColumnNumber:
getColNumber(statement, macroNameDefinition) +
macroNameDefinition.length -
1,
severity: Severity.Warning
})
else if (macroName !== macroName.trim())
diagnostics.push({
message: 'Macro definition cannot have space',
lineNumber: getLineNumber(statements, index + 1),
startColumnNumber: getColNumber(statement, macroNameDefinition),
endColumnNumber:
getColNumber(statement, macroNameDefinition) +
macroNameDefinition.length -
1,
severity: Severity.Warning
})
}
})
return diagnostics
}
/**
* Lint rule that checks for the presence of macro name in %mend statement.
*/
export const hasMacroParentheses: FileLintRule = {
type: LintRuleType.File,
name,
description,
message,
test
}

View File

@@ -0,0 +1,78 @@
import { Severity } from '../types/Severity'
import { noNestedMacros } from './noNestedMacros'
describe('noNestedMacros', () => {
it('should return an empty array when no nested macro', () => {
const content = `
%macro somemacro();
%put &sysmacroname;
%mend somemacro;`
expect(noNestedMacros.test(content)).toEqual([])
})
it('should return an array with a single diagnostics when nested macro defined', () => {
const content = `
%macro outer();
/* any amount of arbitrary code */
%macro inner();
%put inner;
%mend;
%inner()
%put outer;
%mend;
%outer()`
expect(noNestedMacros.test(content)).toEqual([
{
message: "Macro definition present inside another macro 'outer'",
lineNumber: 4,
startColumnNumber: 7,
endColumnNumber: 20,
severity: Severity.Warning
}
])
})
it('should return an array with a single diagnostics when nested macro defined 2 levels', () => {
const content = `
%macro outer();
/* any amount of arbitrary code */
%macro inner();
%put inner;
%macro inner2();
%put inner2;
%mend;
%mend;
%inner()
%put outer;
%mend;
%outer()`
expect(noNestedMacros.test(content)).toEqual([
{
message: "Macro definition present inside another macro 'outer'",
lineNumber: 4,
startColumnNumber: 7,
endColumnNumber: 20,
severity: Severity.Warning
},
{
message: "Macro definition present inside another macro 'inner'",
lineNumber: 7,
startColumnNumber: 17,
endColumnNumber: 31,
severity: Severity.Warning
}
])
})
it('should return an empty array when the file is undefined', () => {
const content = undefined
expect(noNestedMacros.test((content as unknown) as string)).toEqual([])
})
})

View File

@@ -0,0 +1,59 @@
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 = 'noNestedMacros'
const description = 'Defining nested macro is not good practice'
const message = 'Macro definition present inside another macro'
const test = (value: string) => {
const diagnostics: Diagnostic[] = []
const statements: string[] = value ? value.split(';') : []
const stack: string[] = []
let trimmedStatement = '',
commentStarted = false
statements.forEach((statement, index) => {
;({ statement: trimmedStatement, commentStarted } = trimComments(
statement,
commentStarted
))
if (trimmedStatement.startsWith('%macro ')) {
const macroName = trimmedStatement
.slice(7, trimmedStatement.length)
.trim()
.split('(')[0]
if (stack.length) {
const parentMacro = stack.slice(-1).pop()
diagnostics.push({
message: `${message} '${parentMacro}'`,
lineNumber: getLineNumber(statements, index + 1),
startColumnNumber: getColNumber(statement, '%macro'),
endColumnNumber:
getColNumber(statement, '%macro') + trimmedStatement.length - 1,
severity: Severity.Warning
})
}
stack.push(macroName)
} else if (trimmedStatement.startsWith('%mend')) {
stack.pop()
}
})
return diagnostics
}
/**
* Lint rule that checks for the presence of macro name in %mend statement.
*/
export const noNestedMacros: FileLintRule = {
type: LintRuleType.File,
name,
description,
message,
test
}

View File

@@ -40,6 +40,60 @@ describe('LintConfig', () => {
expect(config.fileLintRules[0].type).toEqual(LintRuleType.File) expect(config.fileLintRules[0].type).toEqual(LintRuleType.File)
}) })
it('should create an instance with the hasMacroNameInMend flag set', () => {
const config = new LintConfig({ hasMacroNameInMend: true })
expect(config).toBeTruthy()
expect(config.lineLintRules.length).toEqual(0)
expect(config.fileLintRules.length).toEqual(1)
expect(config.fileLintRules[0].name).toEqual('hasMacroNameInMend')
expect(config.fileLintRules[0].type).toEqual(LintRuleType.File)
})
it('should create an instance with the hasMacroNameInMend flag off', () => {
const config = new LintConfig({ hasMacroNameInMend: false })
expect(config).toBeTruthy()
expect(config.lineLintRules.length).toEqual(0)
expect(config.fileLintRules.length).toEqual(0)
})
it('should create an instance with the noNestedMacros flag set', () => {
const config = new LintConfig({ noNestedMacros: true })
expect(config).toBeTruthy()
expect(config.lineLintRules.length).toEqual(0)
expect(config.fileLintRules.length).toEqual(1)
expect(config.fileLintRules[0].name).toEqual('noNestedMacros')
expect(config.fileLintRules[0].type).toEqual(LintRuleType.File)
})
it('should create an instance with the noNestedMacros flag off', () => {
const config = new LintConfig({ noNestedMacros: false })
expect(config).toBeTruthy()
expect(config.lineLintRules.length).toEqual(0)
expect(config.fileLintRules.length).toEqual(0)
})
it('should create an instance with the hasMacroParentheses flag set', () => {
const config = new LintConfig({ hasMacroParentheses: true })
expect(config).toBeTruthy()
expect(config.lineLintRules.length).toEqual(0)
expect(config.fileLintRules.length).toEqual(1)
expect(config.fileLintRules[0].name).toEqual('hasMacroParentheses')
expect(config.fileLintRules[0].type).toEqual(LintRuleType.File)
})
it('should create an instance with the hasMacroParentheses flag off', () => {
const config = new LintConfig({ hasMacroParentheses: false })
expect(config).toBeTruthy()
expect(config.lineLintRules.length).toEqual(0)
expect(config.fileLintRules.length).toEqual(0)
})
it('should create an instance with the indentation multiple set', () => { it('should create an instance with the indentation multiple set', () => {
const config = new LintConfig({ indentationMultiple: 5 }) const config = new LintConfig({ indentationMultiple: 5 })
@@ -58,18 +112,44 @@ describe('LintConfig', () => {
const config = new LintConfig({ const config = new LintConfig({
noTrailingSpaces: true, noTrailingSpaces: true,
noEncodedPasswords: true, noEncodedPasswords: true,
hasDoxygenHeader: true hasDoxygenHeader: true,
noSpacesInFileNames: true,
lowerCaseFileNames: true,
maxLineLength: 80,
noTabIndentation: true,
indentationMultiple: 2,
hasMacroNameInMend: true,
noNestedMacros: true,
hasMacroParentheses: true
}) })
expect(config).toBeTruthy() expect(config).toBeTruthy()
expect(config.lineLintRules.length).toEqual(2) expect(config.lineLintRules.length).toEqual(5)
expect(config.lineLintRules[0].name).toEqual('noTrailingSpaces') expect(config.lineLintRules[0].name).toEqual('noTrailingSpaces')
expect(config.lineLintRules[0].type).toEqual(LintRuleType.Line) expect(config.lineLintRules[0].type).toEqual(LintRuleType.Line)
expect(config.lineLintRules[1].name).toEqual('noEncodedPasswords') expect(config.lineLintRules[1].name).toEqual('noEncodedPasswords')
expect(config.lineLintRules[1].type).toEqual(LintRuleType.Line) expect(config.lineLintRules[1].type).toEqual(LintRuleType.Line)
expect(config.lineLintRules[2].name).toEqual('noTabs')
expect(config.lineLintRules[2].type).toEqual(LintRuleType.Line)
expect(config.lineLintRules[3].name).toEqual('maxLineLength')
expect(config.lineLintRules[3].type).toEqual(LintRuleType.Line)
expect(config.lineLintRules[4].name).toEqual('indentationMultiple')
expect(config.lineLintRules[4].type).toEqual(LintRuleType.Line)
expect(config.fileLintRules.length).toEqual(1) expect(config.fileLintRules.length).toEqual(4)
expect(config.fileLintRules[0].name).toEqual('hasDoxygenHeader') expect(config.fileLintRules[0].name).toEqual('hasDoxygenHeader')
expect(config.fileLintRules[0].type).toEqual(LintRuleType.File) expect(config.fileLintRules[0].type).toEqual(LintRuleType.File)
expect(config.fileLintRules[1].name).toEqual('hasMacroNameInMend')
expect(config.fileLintRules[1].type).toEqual(LintRuleType.File)
expect(config.fileLintRules[2].name).toEqual('noNestedMacros')
expect(config.fileLintRules[2].type).toEqual(LintRuleType.File)
expect(config.fileLintRules[3].name).toEqual('hasMacroParentheses')
expect(config.fileLintRules[3].type).toEqual(LintRuleType.File)
expect(config.pathLintRules.length).toEqual(2)
expect(config.pathLintRules[0].name).toEqual('noSpacesInFileNames')
expect(config.pathLintRules[0].type).toEqual(LintRuleType.Path)
expect(config.pathLintRules[1].name).toEqual('lowerCaseFileNames')
expect(config.pathLintRules[1].type).toEqual(LintRuleType.Path)
}) })
}) })

View File

@@ -6,6 +6,9 @@ import { noEncodedPasswords } from '../rules/noEncodedPasswords'
import { noSpacesInFileNames } from '../rules/noSpacesInFileNames' import { noSpacesInFileNames } from '../rules/noSpacesInFileNames'
import { noTabIndentation } from '../rules/noTabIndentation' import { noTabIndentation } from '../rules/noTabIndentation'
import { noTrailingSpaces } from '../rules/noTrailingSpaces' import { noTrailingSpaces } from '../rules/noTrailingSpaces'
import { hasMacroNameInMend } from '../rules/hasMacroNameInMend'
import { noNestedMacros } from '../rules/noNestedMacros'
import { hasMacroParentheses } from '../rules/hasMacroParentheses'
import { FileLintRule, LineLintRule, PathLintRule } from './LintRule' import { FileLintRule, LineLintRule, PathLintRule } from './LintRule'
/** /**
@@ -56,5 +59,17 @@ export class LintConfig {
if (json?.lowerCaseFileNames) { if (json?.lowerCaseFileNames) {
this.pathLintRules.push(lowerCaseFileNames) this.pathLintRules.push(lowerCaseFileNames)
} }
if (json?.hasMacroNameInMend) {
this.fileLintRules.push(hasMacroNameInMend)
}
if (json?.noNestedMacros) {
this.fileLintRules.push(noNestedMacros)
}
if (json?.hasMacroParentheses) {
this.fileLintRules.push(hasMacroParentheses)
}
} }
} }

View File

@@ -0,0 +1,3 @@
export const getColNumber = (statement: string, text: string): number => {
return (statement.split('\n').pop() as string).indexOf(text) + 1
}

View File

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

View File

@@ -17,7 +17,7 @@ describe('getLintConfig', () => {
const config = await getLintConfig() const config = await getLintConfig()
expect(config).toBeInstanceOf(LintConfig) expect(config).toBeInstanceOf(LintConfig)
expect(config.fileLintRules.length).toEqual(1) expect(config.fileLintRules.length).toEqual(3)
expect(config.lineLintRules.length).toEqual(5) expect(config.lineLintRules.length).toEqual(5)
expect(config.pathLintRules.length).toEqual(2) expect(config.pathLintRules.length).toEqual(2)
}) })

View File

@@ -14,7 +14,10 @@ export const DefaultLintConfiguration = {
lowerCaseFileNames: true, lowerCaseFileNames: true,
maxLineLength: 80, maxLineLength: 80,
noTabIndentation: true, noTabIndentation: true,
indentationMultiple: 2 indentationMultiple: 2,
hasMacroNameInMend: false,
noNestedMacros: true,
hasMacroParentheses: true
} }
/** /**

19
src/utils/trimComments.ts Normal file
View File

@@ -0,0 +1,19 @@
export 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 }
}