Merge pull request microsoft#15078 from Microsoft/lint-linter

Andy · web-flow · commit 397efbde56ea · 2017-04-11T15:28:51.000-07:00
Lint custom lint rules
diff --git a/Gulpfile.ts b/Gulpfile.ts
@@ -1024,7 +1024,7 @@ gulp.task("lint", "Runs tslint on the compiler sources. Optional arguments are:
     const fileMatcher = cmdLineOptions["files"];
     const files = fileMatcher
         ? `src/**/${fileMatcher}`
-        : "Gulpfile.ts 'src/**/*.ts' --exclude src/lib/es5.d.ts --exclude 'src/lib/*.generated.d.ts'";
+        : "Gulpfile.ts 'scripts/tslint/*.ts' 'src/**/*.ts' --exclude src/lib/es5.d.ts --exclude 'src/lib/*.generated.d.ts'";
     const cmd = `node node_modules/tslint/bin/tslint ${files} --format stylish`;
     console.log("Linting: " + cmd);
     child_process.execSync(cmd, { stdio: [0, 1, 2] });
diff --git a/Jakefile.js b/Jakefile.js
@@ -1197,7 +1197,7 @@ task("lint", ["build-rules"], () => {
     const fileMatcher = process.env.f || process.env.file || process.env.files;
     const files = fileMatcher
         ? `src/**/${fileMatcher}`
-        : "Gulpfile.ts 'src/**/*.ts' --exclude src/lib/es5.d.ts --exclude 'src/lib/*.generated.d.ts'";
+        : "Gulpfile.ts 'scripts/tslint/*.ts' 'src/**/*.ts' --exclude src/lib/es5.d.ts --exclude 'src/lib/*.generated.d.ts'";
     const cmd = `node node_modules/tslint/bin/tslint ${files} --format stylish`;
     console.log("Linting: " + cmd);
     jake.exec([cmd], { interactive: true }, () => {
diff --git a/scripts/tslint/booleanTriviaRule.ts b/scripts/tslint/booleanTriviaRule.ts
@@ -67,7 +67,7 @@ function walk(ctx: Lint.WalkContext<void>): void {
             return;
         }
 
-        let ranges = ts.getTrailingCommentRanges(sourceFile.text, arg.pos) || ts.getLeadingCommentRanges(sourceFile.text, arg.pos);
+        const ranges = ts.getTrailingCommentRanges(sourceFile.text, arg.pos) || ts.getLeadingCommentRanges(sourceFile.text, arg.pos);
         if (ranges === undefined || ranges.length !== 1 || ranges[0].kind !== ts.SyntaxKind.MultiLineCommentTrivia) {
             ctx.addFailureAtNode(arg, "Tag boolean argument with parameter name");
             return;

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ function walk(ctx: Lint.WalkContext<void>): void {`
`67`	`67`	`return;`
`68`	`68`	`}`
`69`	`69`
`70`		`- let ranges = ts.getTrailingCommentRanges(sourceFile.text, arg.pos) \|\| ts.getLeadingCommentRanges(sourceFile.text, arg.pos);`
	`70`	`+ const ranges = ts.getTrailingCommentRanges(sourceFile.text, arg.pos) \|\| ts.getLeadingCommentRanges(sourceFile.text, arg.pos);`
`71`	`71`	`if (ranges === undefined \|\| ranges.length !== 1 \|\| ranges[0].kind !== ts.SyntaxKind.MultiLineCommentTrivia) {`
`72`	`72`	`ctx.addFailureAtNode(arg, "Tag boolean argument with parameter name");`
`73`	`73`	`return;`