tweak rules

weswigham · weswigham · commit a69825e84e7e · 2015-12-01T16:27:19.000-08:00
diff --git a/scripts/tslint/noIncrementDecrementRule.ts b/scripts/tslint/noIncrementDecrementRule.ts
@@ -3,7 +3,8 @@ import * as ts from "typescript";
 
 
 export class Rule extends Lint.Rules.AbstractRule {
-    public static FAILURE_STRING = "Don't use '++' or '--' operators outside for loops or statements - prefer '+= 1' and '-= 1'.";
+    public static POSTFIX_FAILURE_STRING = "Don't use '++' or '--' postfix operators outside statements, for loops, or element access expressions.";
+    public static PREFIX_FAILURE_STRING = "Don't use '++' or '--' prefix operators.";
 
     public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
         return this.applyWithWalker(new IncrementDecrementWalker(sourceFile, this.getOptions()));
@@ -22,14 +23,14 @@ class IncrementDecrementWalker extends Lint.RuleWalker {
     visitPrefixUnaryExpression(node: ts.PrefixUnaryExpression) {
         super.visitPrefixUnaryExpression(node);
         if (node.operator === ts.SyntaxKind.PlusPlusToken || node.operator == ts.SyntaxKind.MinusMinusToken) {
-            this.visitIncrementDecrement(node);
+            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), Rule.PREFIX_FAILURE_STRING));
         }
     }
 
     visitIncrementDecrement(node: ts.UnaryExpression) {
-        if (node.parent && (node.parent.kind === ts.SyntaxKind.ExpressionStatement || node.parent.kind === ts.SyntaxKind.ForStatement)) {
+        if (node.parent && (node.parent.kind === ts.SyntaxKind.ExpressionStatement || node.parent.kind === ts.SyntaxKind.ForStatement || node.parent.kind === ts.SyntaxKind.ElementAccessExpression)) {
             return;
         }
-        this.addFailure(this.createFailure(node.getStart(), node.getWidth(), Rule.FAILURE_STRING));
+        this.addFailure(this.createFailure(node.getStart(), node.getWidth(), Rule.POSTFIX_FAILURE_STRING));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@ import * as ts from "typescript";`
`3`	`3`
`4`	`4`
`5`	`5`	`export class Rule extends Lint.Rules.AbstractRule {`
`6`		`- public static FAILURE_STRING = "Don't use '++' or '--' operators outside for loops or statements - prefer '+= 1' and '-= 1'.";`
	`6`	`+ public static POSTFIX_FAILURE_STRING = "Don't use '++' or '--' postfix operators outside statements, for loops, or element access expressions.";`
	`7`	`+ public static PREFIX_FAILURE_STRING = "Don't use '++' or '--' prefix operators.";`
`7`	`8`
`8`	`9`	`public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {`
`9`	`10`	`return this.applyWithWalker(new IncrementDecrementWalker(sourceFile, this.getOptions()));`
`@@ -22,14 +23,14 @@ class IncrementDecrementWalker extends Lint.RuleWalker {`
`22`	`23`	`visitPrefixUnaryExpression(node: ts.PrefixUnaryExpression) {`
`23`	`24`	`super.visitPrefixUnaryExpression(node);`
`24`	`25`	`if (node.operator === ts.SyntaxKind.PlusPlusToken \|\| node.operator == ts.SyntaxKind.MinusMinusToken) {`
`25`		`- this.visitIncrementDecrement(node);`
	`26`	`+ this.addFailure(this.createFailure(node.getStart(), node.getWidth(), Rule.PREFIX_FAILURE_STRING));`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`visitIncrementDecrement(node: ts.UnaryExpression) {`
`30`		`- if (node.parent && (node.parent.kind === ts.SyntaxKind.ExpressionStatement \|\| node.parent.kind === ts.SyntaxKind.ForStatement)) {`
	`31`	`+ if (node.parent && (node.parent.kind === ts.SyntaxKind.ExpressionStatement \|\| node.parent.kind === ts.SyntaxKind.ForStatement \|\| node.parent.kind === ts.SyntaxKind.ElementAccessExpression)) {`
`31`	`32`	`return;`
`32`	`33`	`}`
`33`		`- this.addFailure(this.createFailure(node.getStart(), node.getWidth(), Rule.FAILURE_STRING));`
	`34`	`+ this.addFailure(this.createFailure(node.getStart(), node.getWidth(), Rule.POSTFIX_FAILURE_STRING));`
`34`	`35`	`}`
`35`	`36`	`}`