Merge branch 'develop' into 1.5

CHANGELOG.md

@@ -1,4 +1,18 @@
 Change Log
+===
+v2.2.0-beta
+---
+* Upgraded Typescript compiler to 1.5
+* **BREAKING CHANGES**
+	* due to changes to the typescript compiler API, old custom rules may no longer work and may need to be rewritten
+	* the JSON formatter's line and character positions are now back to being 0-indexed instead of 1-indexed
+* [bugs] #328 #334 #319 #351 #365 #254
+* [bug] fixes for tslint behavior around template strings (fixes #357, #349, #332, and more)
+* [new-rule] `align` rule now enforces vertical alignment on parameters, arguments, and statements
+* [new-rule] `switch-default` enforces a `default` case in `switch` statements
+* [feature] `no-duplicate-variable` rule now additionally checks if function parameters have been shadowed
+* Additional fixes to existing rules to work as before with the typescript 1.5 compiler
+
 ===
 v2.1.1
 ---

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "2.1.1",
+  "version": "2.2.0-beta",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"
@@ -32,7 +32,7 @@
     "grunt-mocha-test": "~0.6.2",
     "grunt-ts": "~1.12.1",
     "grunt-tslint": "~2.0.0",
-    "typescript": "1.5.0-alpha"
+    "typescript": "1.5.0-beta"
   },
   "license": "Apache 2.0"
 }

src/language/utils.ts

@@ -42,6 +42,7 @@ module Lint {
 
     export function createCompilerOptions(): ts.CompilerOptions {
         return {
+            noResolve: true,
             target: ts.ScriptTarget.ES5
         };
     }

src/rules/noDuplicateVariableRule.ts

@@ -50,6 +50,10 @@ class NoDuplicateVariableWalker extends Lint.ScopeAwareRuleWalker<ScopeInfo> {
         // don't call super, we don't want to walk method signatures either
     }
 
+    public visitFunctionType(node: ts.Node): void {
+        // don't call super, we don't want to walk function types as well
+    }
+
     public visitCatchClause(node: ts.CatchClause): void {
         // don't visit the catch clause variable declaration, just visit the block
         // the catch clause variable declaration has its own special scoping rules

src/rules/noUnusedVariableRule.ts

@@ -59,6 +59,12 @@ class NoUnusedVariablesWalker extends Lint.RuleWalker {
         super.visitImportEqualsDeclaration(node);
     }
 
+    public visitCatchClause(node: ts.CatchClause): void {
+        // don't visit the catch clause variable declaration, just visit the block
+        // the catch clause variable declaration needs to be there but doesn't need to be used
+        this.visitBlock(node.block);
+    }
+
     // check variable declarations
     public visitVariableDeclaration(node: ts.VariableDeclaration): void {
         var propertyName = <ts.Identifier> node.name;
@@ -168,8 +174,8 @@ class NoUnusedVariablesWalker extends Lint.RuleWalker {
     }
 
     private validateReferencesForVariable(name: string, position: number) {
-        var references = this.languageService.getReferencesAtPosition("file.ts", position);
-        if (references.length <= 1) {
+        var highlights = this.languageService.getDocumentHighlights("file.ts", position, ["file.ts"]);
+        if (highlights[0].highlightSpans.length <= 1) {
             var failureString = Rule.FAILURE_STRING + "'" + name + "'";
             var failure = this.createFailure(position, name.length, failureString);
             this.addFailure(failure);

src/rules/noUseBeforeDeclareRule.ts

@@ -70,15 +70,17 @@ class NoUseBeforeDeclareWalker extends Lint.ScopeAwareRuleWalker<{}> {
     }
 
     private validateUsageForVariable(name: string, position: number) {
-        var references = this.languageService.getReferencesAtPosition("file.ts", position);
-        if (references) {
-            references.forEach((reference) => {
-                var referencePosition = reference.textSpan.start;
-                if (referencePosition < position) {
-                    var failureString = Rule.FAILURE_STRING_PREFIX + name + Rule.FAILURE_STRING_POSTFIX;
-                    var failure = this.createFailure(referencePosition, name.length, failureString);
-                    this.addFailure(failure);
-                }
+        var highlights = this.languageService.getDocumentHighlights("file.ts", position, ["file.ts"]);
+        if (highlights) {
+            highlights.forEach((highlight) => {
+                highlight.highlightSpans.forEach((highlightSpan) => {
+                    var referencePosition = highlightSpan.textSpan.start;
+                    if (referencePosition < position) {
+                        var failureString = Rule.FAILURE_STRING_PREFIX + name + Rule.FAILURE_STRING_POSTFIX;
+                        var failure = this.createFailure(referencePosition, name.length, failureString);
+                        this.addFailure(failure);
+                    }
+                });
             });
         }
     }

src/rules/semicolonRule.ts

@@ -83,6 +83,20 @@ class SemicolonWalker extends Lint.RuleWalker {
         super.visitDebuggerStatement(node);
     }
 
+    public visitPropertyDeclaration(node: ts.PropertyDeclaration) {
+        this.checkSemicolonAt(node);
+
+        super.visitPropertyDeclaration(node);
+    }
+
+    public visitInterfaceDeclaration(node: ts.InterfaceDeclaration) {
+        node.members.forEach((member) => {
+            this.checkSemicolonAt(member);
+        });
+
+        super.visitInterfaceDeclaration(node);
+    }
+
     private checkSemicolonAt(node: ts.Node) {
         var children = node.getChildren(this.getSourceFile());
         for (var i = 0; i < children.length; i++) {

src/rules/tsconfig.json

@@ -16,6 +16,7 @@
         "../../lib/tslint.d.ts",
         "../../typings/node.d.ts",
         "../../typings/typescriptServices.d.ts",
+        "../../typings/typescriptServicesScanner.d.ts",
         "./alignRule.ts",
         "./banRule.ts",
         "./classNameRule.ts",

src/rules/typedefWhitespaceRule.ts

@@ -82,7 +82,7 @@ class TypedefWhitespaceWalker extends Lint.RuleWalker {
         super.visitVariableDeclaration(node);
     }
 
-    public checkSpace(option: string, node: ts.Node, typeNode: ts.TypeNode | ts.StringLiteralExpression, positionBeforeColon: number) {
+    public checkSpace(option: string, node: ts.Node, typeNode: ts.TypeNode | ts.StringLiteral, positionBeforeColon: number) {
         if (this.hasOption(option) && typeNode != null && positionBeforeColon != null) {
             var hasLeadingWhitespace: boolean;
             var scanner = ts.createScanner(ts.ScriptTarget.ES5, false, node.getText());

src/rules/useStrictRule.ts

@@ -71,7 +71,7 @@ class UseStrictWalker extends Lint.ScopeAwareRuleWalker<{}> {
                 var firstChild = firstStatement.getChildAt(0);
 
                 if (firstChild.kind === ts.SyntaxKind.StringLiteral &&
-                        (<ts.StringLiteralExpression> firstChild).text === UseStrictWalker.USE_STRICT_STRING) {
+                        (<ts.StringLiteral> firstChild).text === UseStrictWalker.USE_STRICT_STRING) {
                     isFailure = false;
                 }
             }

src/tsconfig.json

@@ -17,6 +17,7 @@
     "files": [
         "../typings/node.d.ts",
         "../typings/typescriptServices.d.ts",
+        "../typings/typescriptServicesScanner.d.ts",
         "./language/formatter/abstractFormatter.ts",
         "./language/formatter/formatter.ts",
         "./language/languageServiceHost.ts",

src/tslint.ts

@@ -36,7 +36,7 @@ module Lint {
         private source: string;
         private options: ILinterOptions;
 
-        public static VERSION = "2.1.1";
+        public static VERSION = "2.2.0-beta";
 
         constructor(fileName: string, source: string, options: ILinterOptions) {
             this.fileName = fileName;

test/files/rules/duplicate-variable.test.ts

@@ -113,7 +113,9 @@ function blah(arg1: {[key: string]: any, arg2: {[key:string]: any}) {
 export interface IClipboard {
     copy(key: string, state: any): void;
     paste(key: string): any;
-    findMaxOrMin(values: any[], defaultValue: number, operation: (...values: any[]) => number)
+    findMaxOrMin(values: any[], defaultValue: number, operation: (...values: any[]) => number);
+    functionA: (value: string) => void;
+    functionB: (value: string) => void;
 }
 
 try {

test/files/rules/nounusedvariable-imports.test.ts

@@ -4,3 +4,9 @@ import  xyz = require("xyz");
 export import a = require("a");
 
 $(_.xyz());
+
+/// <reference path="../externalFormatter.test.ts" />
+
+module S {
+  var template = '';
+}

test/files/rules/nounusedvariable-var.test.ts

@@ -10,3 +10,9 @@ class ABCD {
         z = 3;
     }
 }
+
+try {
+  // code here
+} catch (e) {
+  // e is unused but that's still ok
+}

test/files/rules/semicolon.test.ts

@@ -36,3 +36,15 @@ function useStrictMissingSemicolon() {
     "use strict"
     return null;
 }
+
+class MyClass {
+    public name : string
+    private index : number
+    private email : string; // no error
+}
+
+interface ITest {
+    foo?: string
+    bar: number
+    baz: boolean; // no error
+}

test/rules/noUnusedVariableRuleTests.ts

@@ -18,13 +18,14 @@ describe("<no-unused-variable>", () => {
     it("restricts unused imports", () => {
         var fileName = "rules/nounusedvariable-imports.test.ts";
         var Rule = Lint.Test.getRule("no-unused-variable");
-        var failureString = Rule.FAILURE_STRING + "'xyz'";
-        var failure = Lint.Test.createFailuresOnFile(fileName, failureString)([3, 9], [3, 12]);
+        var failure1 = Lint.Test.createFailuresOnFile(fileName, Rule.FAILURE_STRING + "'xyz'")([3, 9], [3, 12]);
+        var failure2 = Lint.Test.createFailuresOnFile(fileName, Rule.FAILURE_STRING + "'template'")([11, 7], [11, 15]);
 
         var actualFailures = Lint.Test.applyRuleOnFile(fileName, Rule);
 
-        assert.lengthOf(actualFailures, 1);
-        Lint.Test.assertContainsFailure(actualFailures, failure);
+        assert.lengthOf(actualFailures, 2);
+        Lint.Test.assertContainsFailure(actualFailures, failure1);
+        Lint.Test.assertContainsFailure(actualFailures, failure2);
     });
 
     it("restricts unused variables", () => {

test/rules/semicolonRuleTests.ts

@@ -28,7 +28,7 @@ describe("<semicolon>", () => {
     });
 
     it("warns on all statements", () => {
-        assert.equal(actualFailures.length, 15);
+        assert.equal(actualFailures.length, 19);
     });
 
     it("warns on variable statements", () => {
@@ -75,4 +75,14 @@ describe("<semicolon>", () => {
     it("warns on use strict statements", () => {
         Lint.Test.assertContainsFailure(actualFailures, createFailure([36, 17], [36, 17]));
     });
+
+    it("warns on property declarations", () => {
+        Lint.Test.assertContainsFailure(actualFailures, createFailure([41, 25], [41, 25]));
+        Lint.Test.assertContainsFailure(actualFailures, createFailure([42, 27], [42, 27]));
+    });
+
+    it("warns on interface declaration", () => {
+        Lint.Test.assertContainsFailure(actualFailures, createFailure([47, 17], [47, 17]));
+        Lint.Test.assertContainsFailure(actualFailures, createFailure([48, 16], [48, 16]));
+    });
 });

test/tsconfig.json

@@ -16,6 +16,7 @@
     "files": [
         "../typings/node.d.ts",
         "../typings/typescriptServices.d.ts",
+        "../typings/typescriptServicesScanner.d.ts",
         "../lib/tslint.d.ts",
         "./typings/chai-assert.d.ts",
         "./typings/chai.d.ts",