Switch to 1.5.0-beta, temporarily add typings for missing scanner

CalvinFernandez · May 4, 2015 · 3b8e280 · 3b8e280
1 parent 2984a02
commit 3b8e280
Show file tree

Hide file tree

Showing 9 changed files with 190 additions and 379 deletions.
diff --git a/lib/tslint.d.ts b/lib/tslint.d.ts
@@ -1,4 +1,5 @@
 /// <reference path="../typings/typescriptServices.d.ts" />
+/// <reference path="../typings/typescriptServicesScanner.d.ts" />
 /// <reference path="../typings/node.d.ts" />
 declare module Lint {
     interface IOptions {

diff --git a/package.json b/package.json
@@ -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"
 }
diff --git a/src/language/utils.ts b/src/language/utils.ts
@@ -16,6 +16,7 @@
 
 ///<reference path="../../typings/node.d.ts" />
 ///<reference path="../../typings/typescriptServices.d.ts" />
+///<reference path='../../typings/typescriptServicesScanner.d.ts'/>
 ///<reference path='./rule/rule.ts'/>
 
 module Lint {

diff --git a/src/language/walker/syntaxWalker.ts b/src/language/walker/syntaxWalker.ts
@@ -15,6 +15,7 @@
 */
 
 ///<reference path="../../../typings/typescriptServices.d.ts" />
+///<reference path='../../../typings/typescriptServicesScanner.d.ts'/>
 
 module Lint {
     export class SyntaxWalker {

diff --git a/src/rules/typedefWhitespaceRule.ts b/src/rules/typedefWhitespaceRule.ts
@@ -84,7 +84,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());

diff --git a/src/rules/useStrictRule.ts b/src/rules/useStrictRule.ts
@@ -73,7 +73,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;
                 }
             }

diff --git a/src/tslint.ts b/src/tslint.ts
@@ -16,6 +16,7 @@
 
 /// <reference path='../typings/node.d.ts'/>
 /// <reference path='../typings/typescriptServices.d.ts'/>
+/// <reference path='../typings/typescriptServicesScanner.d.ts'/>
 
 /// <reference path='ruleLoader.ts'/>
 /// <reference path='configuration.ts'/>