Turn on no-unused-variable rule

- Fixes palantir#505 - Also rename some variables to better adhere to variable-name rule
jonaskello · Aug 13, 2015 · 9e2cbcd · 9e2cbcd
1 parent d8a3402
commit 9e2cbcd
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 164 deletions.
diff --git a/lib/tslint.d.ts b/lib/tslint.d.ts
@@ -239,9 +239,9 @@ declare module Lint {
 declare module Lint {
     interface LintResult {
         failureCount: number;
+        failures: RuleFailure[];
         format: string;
         output: string;
-        failures: RuleFailure[];
     }
     interface ILinterOptions {
         configuration: any;

diff --git a/src/formatterLoader.ts b/src/formatterLoader.ts
@@ -17,7 +17,7 @@
 module Lint {
     const fs = require("fs");
     const path = require("path");
-    const _s = require("underscore.string");
+    const {camelize} = require("underscore.string");
 
     const moduleDirectory = path.dirname(module.filename);
     const CORE_FORMATTERS_DIRECTORY = path.resolve(moduleDirectory, "..", "build", "formatters");
@@ -27,7 +27,7 @@ module Lint {
             return name;
         }
 
-        const camelizedName = _s.camelize(name + "Formatter");
+        const camelizedName = camelize(name + "Formatter");
 
         // first check for core formatters
         let Formatter = loadFormatter(CORE_FORMATTERS_DIRECTORY, camelizedName);

diff --git a/src/ruleLoader.ts b/src/ruleLoader.ts
@@ -17,7 +17,7 @@
 module Lint {
     const fs = require("fs");
     const path = require("path");
-    const _s = require("underscore.string");
+    const {camelize, strLeft, strRight} = require("underscore.string");
 
     const moduleDirectory = path.dirname(module.filename);
     const CORE_RULES_DIRECTORY = path.resolve(moduleDirectory, "..", "build", "rules");
@@ -68,8 +68,8 @@ module Lint {
         // finally check for rules within the first level of directories,
         // using dash prefixes as the sub-directory names
         if (rulesDirectory) {
-            const subDirectory = _s.strLeft(rulesDirectory, "-");
-            const ruleName = _s.strRight(rulesDirectory, "-");
+            const subDirectory = strLeft(rulesDirectory, "-");
+            const ruleName = strRight(rulesDirectory, "-");
             if (subDirectory !== rulesDirectory && ruleName !== rulesDirectory) {
                 camelizedName = transformName(ruleName);
                 Rule = loadRule(rulesDirectory, subDirectory, camelizedName);
@@ -89,7 +89,7 @@ module Lint {
         if (nameMatch == null) {
             return name + "Rule";
         }
-        return nameMatch[1] + _s.camelize(nameMatch[2]) + nameMatch[3] + "Rule";
+        return nameMatch[1] + camelize(nameMatch[2]) + nameMatch[3] + "Rule";
     }
 
     function loadRule(...paths: string[]) {

diff --git a/src/rules/labelPositionRule.ts b/src/rules/labelPositionRule.ts
@@ -18,13 +18,11 @@ export class Rule extends Lint.Rules.AbstractRule {
     public static FAILURE_STRING = "unexpected label on statement";
 
     public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-        return this.applyWithWalker(new LabelPosWalker(sourceFile, this.getOptions()));
+        return this.applyWithWalker(new LabelPositionWalker(sourceFile, this.getOptions()));
     }
 }
 
-class LabelPosWalker extends Lint.RuleWalker {
-    private isValidLabel: boolean;
-
+class LabelPositionWalker extends Lint.RuleWalker {
     public visitLabeledStatement(node: ts.LabeledStatement) {
         const statement = node.statement;
         if (statement.kind !== ts.SyntaxKind.DoStatement

diff --git a/src/rules/noShadowedVariableRule.ts b/src/rules/noShadowedVariableRule.ts
@@ -57,7 +57,6 @@ class NoShadowedVariableWalker extends Lint.BlockScopeAwareRuleWalker<ScopeInfo,
         const variableIdentifier = <ts.Identifier> node.name;
         const variableName = variableIdentifier.text;
         const currentScope = this.getCurrentScope();
-        const currentBlockScope = this.getCurrentBlockScope();
 
         if (this.isVarInAnyScope(variableName)) {
             this.addFailureOnIdentifier(variableIdentifier);

diff --git a/src/rules/noSwitchCaseFallThroughRule.ts b/src/rules/noSwitchCaseFallThroughRule.ts
@@ -54,7 +54,6 @@ export class NoSwitchCaseFallThroughWalker extends Lint.RuleWalker {
 
     private fallThroughAllowed(nextCaseOrDefaultStatement: ts.Node) {
         const sourceFileText = nextCaseOrDefaultStatement.getSourceFile().text;
-        const childCount = nextCaseOrDefaultStatement.getChildCount();
         const firstChild = nextCaseOrDefaultStatement.getChildAt(0);
         const commentRanges = ts.getLeadingCommentRanges(sourceFileText, firstChild.getFullStart());
         if (commentRanges != null) {

diff --git a/src/rules/noVarKeywordRule.ts b/src/rules/noVarKeywordRule.ts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-const OPTION_LEADING_UNDERSCORE = "no-var-keyword";
-
 export class Rule extends Lint.Rules.AbstractRule {
     public static FAILURE_STRING = "forbidden var keyword";