Merge pull request #5087 from weswigham/tslint-update

weswigham · weswigham · commit ff3d0f9211c8 · 2015-10-02T15:43:00.000-07:00
tslint had a new release and added the no inferrable types rule
diff --git a/Jakefile.js b/Jakefile.js
@@ -813,7 +813,6 @@ task("update-sublime", ["local", serverFile], function() {
 var tslintRuleDir = "scripts/tslint";
 var tslintRules = ([
     "nextLineRule",
-    "noInferrableTypesRule",
     "noNullRule",
     "booleanTriviaRule"
 ]);
diff --git a/scripts/tslint/noInferrableTypesRule.ts b/scripts/tslint/noInferrableTypesRule.ts
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -157,7 +157,7 @@ namespace FourSlash {
             return true;
         }
 
-        public setCancelled(numberOfCalls: number = 0): void {
+        public setCancelled(numberOfCalls = 0): void {
             ts.Debug.assert(numberOfCalls >= 0);
             this.numberOfCallsBeforeCancellation = numberOfCalls;
         }
@@ -761,7 +761,7 @@ namespace FourSlash {
             this.raiseError(`verifyReferencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(references)})`);
         }
 
-        public verifyReferencesCountIs(count: number, localFilesOnly: boolean = true) {
+        public verifyReferencesCountIs(count: number, localFilesOnly = true) {
             this.taoInvalidReason = "verifyReferences NYI";
 
             let references = this.getReferencesAtCaret();

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ namespace FourSlash {`
`157`	`157`	`return true;`
`158`	`158`	`}`
`159`	`159`
`160`		`- public setCancelled(numberOfCalls: number = 0): void {`
	`160`	`+ public setCancelled(numberOfCalls = 0): void {`
`161`	`161`	`ts.Debug.assert(numberOfCalls >= 0);`
`162`	`162`	`this.numberOfCallsBeforeCancellation = numberOfCalls;`
`163`	`163`	`}`
`@@ -761,7 +761,7 @@ namespace FourSlash {`
`761`	`761`	this.raiseError(`verifyReferencesAtPositionListContains failed - could not find the item: ${JSON.stringify(missingItem)} in the returned list: (${JSON.stringify(references)})`);
`762`	`762`	`}`
`763`	`763`
`764`		`- public verifyReferencesCountIs(count: number, localFilesOnly: boolean = true) {`
	`764`	`+ public verifyReferencesCountIs(count: number, localFilesOnly = true) {`
`765`	`765`	`this.taoInvalidReason = "verifyReferences NYI";`
`766`	`766`
`767`	`767`	`let references = this.getReferencesAtCaret();`