Merge pull request #8056 from weswigham/remove-custom-no-null-rule

Remove custom no-null rule, use tslint builtin no null rule
microsoft · Apr 13, 2016 · 5b0b09c · 5b0b09c
2 parents 109e0e2 + 37a0e8f
commit 5b0b09c
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 33 deletions.
diff --git a/Jakefile.js b/Jakefile.js
@@ -903,7 +903,6 @@ task("update-sublime", ["local", serverFile], function() {
 var tslintRuleDir = "scripts/tslint";
 var tslintRules = ([
     "nextLineRule",
-    "noNullRule",
     "preferConstRule",
     "booleanTriviaRule",
     "typeOperatorSpacingRule",

diff --git a/scripts/tslint/noNullRule.ts b/scripts/tslint/noNullRule.ts
diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
@@ -1,7 +1,7 @@
 /// <reference path="harness.ts" />
 /// <reference path="runnerbase.ts" />
 /// <reference path="typeWriter.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 const enum CompilerTestType {
     Conformance,

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -18,7 +18,7 @@
 /// <reference path="harnessLanguageService.ts" />
 /// <reference path="harness.ts" />
 /// <reference path="fourslashRunner.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 namespace FourSlash {
     ts.disableIncrementalParsing = false;

diff --git a/src/harness/fourslashRunner.ts b/src/harness/fourslashRunner.ts
@@ -1,7 +1,7 @@
 ///<reference path="fourslash.ts" />
 ///<reference path="harness.ts"/>
 ///<reference path="runnerbase.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 const enum FourSlashTestType {
     Native,

diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -23,7 +23,7 @@
 /// <reference path="external\chai.d.ts"/>
 /// <reference path="sourceMapRecorder.ts"/>
 /// <reference path="runnerbase.ts"/>
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 // Block scoped definitions work poorly for global variables, temporarily enable var
 /* tslint:disable:no-var-keyword */

diff --git a/src/harness/loggedIO.ts b/src/harness/loggedIO.ts
@@ -1,7 +1,7 @@
 /// <reference path="..\..\src\compiler\sys.ts" />
 /// <reference path="..\..\src\harness\harness.ts" />
 /// <reference path="..\..\src\harness\runnerbase.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 interface FileInformation {
     contents: string;

diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
@@ -1,6 +1,6 @@
 ///<reference path="harness.ts" />
 ///<reference path="runnerbase.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 // Test case is json of below type in tests/cases/project/
 interface ProjectRunnerTestCase {

diff --git a/src/harness/runner.ts b/src/harness/runner.ts
@@ -20,7 +20,7 @@
 /// <reference path="rwcRunner.ts" />
 /// <reference path="harness.ts" />
 
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 let runners: RunnerBase[] = [];
 let iterations = 1;

diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts
@@ -2,7 +2,7 @@
 /// <reference path="runnerbase.ts" />
 /// <reference path="loggedIO.ts" />
 /// <reference path="..\compiler\commandLineParser.ts"/>
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 namespace RWC {
     function runWithIOLog(ioLog: IOLog, fn: (oldIO: Harness.IO) => void) {

diff --git a/src/harness/test262Runner.ts b/src/harness/test262Runner.ts
@@ -1,6 +1,6 @@
 /// <reference path="harness.ts" />
 /// <reference path="runnerbase.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 class Test262BaselineRunner extends RunnerBase {
     private static basePath = "internal/cases/test262";

diff --git a/src/server/server.ts b/src/server/server.ts
@@ -1,7 +1,7 @@
 /// <reference path="node.d.ts" />
 /// <reference path="session.ts" />
 // used in fs.writeSync
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 namespace ts.server {
     const readline: NodeJS.ReadLine = require("readline");

diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -19,7 +19,7 @@
 let debugObjectHost = (<any>this);
 
 // We need to use 'null' to interface with the managed side.
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 /* tslint:disable:no-in-operator */
 
 /* @internal */

diff --git a/tslint.json b/tslint.json
@@ -38,7 +38,7 @@
         "no-internal-module": true,
         "no-trailing-whitespace": true,
         "no-inferrable-types": true,
-        "no-null": true,
+        "no-null-keyword": true,
         "no-unused-variable": true,
         "boolean-trivia": true,
         "type-operator-spacing": true,