Merge 734f485 into 33d330e

microsoft · Dec 4, 2018 · 95d0307 · 95d0307
2 parents 33d330e + 734f485
commit 95d0307
Show file tree

Hide file tree

Showing 233 changed files with 3,364 additions and 6,940 deletions.
diff --git a/src/chaiPreferContainsToIndexOfRule.ts b/src/chaiPreferContainsToIndexOfRule.ts
@@ -5,7 +5,7 @@ import { AstUtils } from './utils/AstUtils';
 import { ChaiUtils } from './utils/ChaiUtils';
 import { ExtendedMetadata } from './utils/ExtendedMetadata';
 
-const FAILURE_STRING: string = 'Found chai call with indexOf that can be converted to .contain assertion: ';
+const FAILURE_STRING: string = 'Found chai call with indexOf that can be converted to .contain assertion:';
 
 export class Rule extends Lint.Rules.AbstractRule {
     public static metadata: ExtendedMetadata = {

diff --git a/src/chaiVagueErrorsRule.ts b/src/chaiVagueErrorsRule.ts
@@ -7,9 +7,9 @@ import { ExtendedMetadata } from './utils/ExtendedMetadata';
 const BASE_ERROR: string = 'Found chai call with vague failure message. ';
 const FAILURE_STRING: string = BASE_ERROR + 'Please add an explicit failure message';
 const FAILURE_STRING_COMPARE_TRUE: string =
-    BASE_ERROR + 'Move the strict equality comparison from the expect call into the assertion value';
+    BASE_ERROR + 'Move the strict equality comparison from the expect call into the assertion value.';
 const FAILURE_STRING_COMPARE_FALSE: string =
-    BASE_ERROR + 'Move the strict inequality comparison from the expect call into the assertion value. ';
+    BASE_ERROR + 'Move the strict inequality comparison from the expect call into the assertion value';
 
 export class Rule extends Lint.Rules.AbstractRule {
     public static metadata: ExtendedMetadata = {

diff --git a/src/missingJsdocRule.ts b/src/missingJsdocRule.ts
@@ -35,7 +35,7 @@ export class Rule extends Lint.Rules.AbstractRule {
 class MissingJSDocWalker extends Lint.RuleWalker {
     protected visitSourceFile(node: ts.SourceFile): void {
         if (!/^\/\*\*\s*$/gm.test(node.getFullText())) {
-            this.addFailureAt(node.getStart(), node.getWidth(), Rule.FAILURE_STRING);
+            this.addFailureAt(0, 0, Rule.FAILURE_STRING);
         }
         // do not continue walking
     }

diff --git a/src/noBackboneGetSetOutsideModelRule.ts b/src/noBackboneGetSetOutsideModelRule.ts
@@ -34,11 +34,11 @@ class NoBackboneGetSetOutsideModelRuleWalker extends Lint.RuleWalker {
             const functionName: string = AstUtils.getFunctionName(node);
             if (functionName === 'get' && node.arguments.length === 1 && node.arguments[0].kind === ts.SyntaxKind.StringLiteral) {
                 const msg: string = Rule.GET_FAILURE_STRING + node.getText();
-                this.addFailureAt(node.getStart(), node.getEnd(), msg);
+                this.addFailureAt(node.getStart(), node.getWidth(), msg);
             }
             if (functionName === 'set' && node.arguments.length === 2 && node.arguments[0].kind === ts.SyntaxKind.StringLiteral) {
                 const msg: string = Rule.SET_FAILURE_STRING + node.getText();
-                this.addFailureAt(node.getStart(), node.getEnd(), msg);
+                this.addFailureAt(node.getStart(), node.getWidth(), msg);
             }
         }
         super.visitCallExpression(node);

diff --git a/src/noSuspiciousCommentRule.ts b/src/noSuspiciousCommentRule.ts
@@ -6,7 +6,7 @@ import { ExtendedMetadata } from './utils/ExtendedMetadata';
 
 const FAILURE_STRING: string = 'Suspicious comment found: ';
 const SUSPICIOUS_WORDS = ['BUG', 'HACK', 'FIXME', 'LATER', 'LATER2', 'TODO'];
-const FAILURE_STRING_OPTION: string = '\nTo disable this warning, the comment should include one of the following regex: ';
+const FAILURE_STRING_OPTION: string = 'To disable this warning, the comment should include one of the following regex: ';
 
 export class Rule extends Lint.Rules.AbstractRule {
     public static metadata: ExtendedMetadata = {
@@ -76,7 +76,7 @@ class NoSuspiciousCommentRuleWalker extends Lint.RuleWalker {
     private foundSuspiciousComment(startPosition: number, commentText: string, suspiciousWord: string) {
         let errorMessage: string = FAILURE_STRING + suspiciousWord;
         if (this.exceptionRegex.length > 0) {
-            errorMessage += '.' + this.getFailureMessageWithExceptionRegexOption();
+            errorMessage += '. ' + this.getFailureMessageWithExceptionRegexOption();
         }
         this.addFailureAt(startPosition, commentText.length, errorMessage);
     }

diff --git a/src/tests/ChaiPreferContainsToIndexOfRuleTests.ts b/src/tests/ChaiPreferContainsToIndexOfRuleTests.ts