Feedback from PR, remove unused identifiers

weswigham · weswigham · commit 2793bc2acda9 · 2015-09-17T14:29:52.000-07:00
diff --git a/scripts/tslint/nextLineRule.ts b/scripts/tslint/nextLineRule.ts
@@ -24,9 +24,9 @@ class NextLineWalker extends Lint.RuleWalker {
             const elseKeyword = getFirstChildOfKind(node, ts.SyntaxKind.ElseKeyword);
             if (this.hasOption(OPTION_ELSE) && !!elseKeyword) {
                 const thenStatementEndLoc = sourceFile.getLineAndCharacterOfPosition(thenStatement.getEnd());
-                const elseKeywordLoc = sourceFile.getLineAndCharacterOfPosition(elseKeyword.getStart());
+                const elseKeywordLoc = sourceFile.getLineAndCharacterOfPosition(elseKeyword.getStart(sourceFile));
                 if (thenStatementEndLoc.line !== (elseKeywordLoc.line - 1)) {
-                    const failure = this.createFailure(elseKeyword.getStart(), elseKeyword.getWidth(), Rule.ELSE_FAILURE_STRING);
+                    const failure = this.createFailure(elseKeyword.getStart(sourceFile), elseKeyword.getWidth(sourceFile), Rule.ELSE_FAILURE_STRING);
                     this.addFailure(failure);
                 }
             }
@@ -40,17 +40,15 @@ class NextLineWalker extends Lint.RuleWalker {
         const catchClause = node.catchClause;
 
         // "visit" try block
-        const tryKeyword = node.getChildAt(0);
         const tryBlock = node.tryBlock;
-        const tryOpeningBrace = tryBlock.getChildAt(0);
 
         if (this.hasOption(OPTION_CATCH) && !!catchClause) {
-            const tryClosingBrace = node.tryBlock.getChildAt(node.tryBlock.getChildCount() - 1);
-            const catchKeyword = catchClause.getChildAt(0);
+            const tryClosingBrace = tryBlock.getLastToken(sourceFile);
+            const catchKeyword = catchClause.getFirstToken(sourceFile);
             const tryClosingBraceLoc = sourceFile.getLineAndCharacterOfPosition(tryClosingBrace.getEnd());
-            const catchKeywordLoc = sourceFile.getLineAndCharacterOfPosition(catchKeyword.getStart());
+            const catchKeywordLoc = sourceFile.getLineAndCharacterOfPosition(catchKeyword.getStart(sourceFile));
             if (tryClosingBraceLoc.line !== (catchKeywordLoc.line - 1)) {
-                const failure = this.createFailure(catchKeyword.getStart(), catchKeyword.getWidth(), Rule.CATCH_FAILURE_STRING);
+                const failure = this.createFailure(catchKeyword.getStart(sourceFile), catchKeyword.getWidth(sourceFile), Rule.CATCH_FAILURE_STRING);
                 this.addFailure(failure);
             }
         }
diff --git a/scripts/tslint/noInferrableTypesRule.ts b/scripts/tslint/noInferrableTypesRule.ts
@@ -27,8 +27,14 @@ class InferrableTypeWalker extends Lint.RuleWalker {
                         }
                     break;
                     case ts.SyntaxKind.StringKeyword:
-                        if (e.initializer.kind === ts.SyntaxKind.StringLiteral || e.initializer.kind === ts.SyntaxKind.NoSubstitutionTemplateLiteral) {
-                            failure = 'string';
+                        switch (e.initializer.kind) {
+                            case ts.SyntaxKind.StringLiteral:
+                            case ts.SyntaxKind.NoSubstitutionTemplateLiteral:
+                            case ts.SyntaxKind.TemplateExpression:
+                                failure = 'string';
+                                break;
+                            default:
+                                break;
                         }
                     break;
                 }

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,14 @@ class InferrableTypeWalker extends Lint.RuleWalker {`
`27`	`27`	`}`
`28`	`28`	`break;`
`29`	`29`	`case ts.SyntaxKind.StringKeyword:`
`30`		`- if (e.initializer.kind === ts.SyntaxKind.StringLiteral \|\| e.initializer.kind === ts.SyntaxKind.NoSubstitutionTemplateLiteral) {`
`31`		`- failure = 'string';`
	`30`	`+ switch (e.initializer.kind) {`
	`31`	`+ case ts.SyntaxKind.StringLiteral:`
	`32`	`+ case ts.SyntaxKind.NoSubstitutionTemplateLiteral:`
	`33`	`+ case ts.SyntaxKind.TemplateExpression:`
	`34`	`+ failure = 'string';`
	`35`	`+ break;`
	`36`	`+ default:`
	`37`	`+ break;`
`32`	`38`	`}`
`33`	`39`	`break;`
`34`	`40`	`}`