Skip to content

Commit 5b0b09c

Browse files
Merge pull request #8056 from weswigham/remove-custom-no-null-rule
Remove custom no-null rule, use tslint builtin no null rule
2 parents 109e0e2 + 37a0e8f commit 5b0b09c

File tree

14 files changed

+12
-33
lines changed

14 files changed

+12
-33
lines changed

Jakefile.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,6 @@ task("update-sublime", ["local", serverFile], function() {
903903
var tslintRuleDir = "scripts/tslint";
904904
var tslintRules = ([
905905
"nextLineRule",
906-
"noNullRule",
907906
"preferConstRule",
908907
"booleanTriviaRule",
909908
"typeOperatorSpacingRule",

scripts/tslint/noNullRule.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/harness/compilerRunner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// <reference path="harness.ts" />
22
/// <reference path="runnerbase.ts" />
33
/// <reference path="typeWriter.ts" />
4-
/* tslint:disable:no-null */
4+
/* tslint:disable:no-null-keyword */
55

66
const enum CompilerTestType {
77
Conformance,

src/harness/fourslash.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// <reference path="harnessLanguageService.ts" />
1919
/// <reference path="harness.ts" />
2020
/// <reference path="fourslashRunner.ts" />
21-
/* tslint:disable:no-null */
21+
/* tslint:disable:no-null-keyword */
2222

2323
namespace FourSlash {
2424
ts.disableIncrementalParsing = false;

src/harness/fourslashRunner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
///<reference path="fourslash.ts" />
22
///<reference path="harness.ts"/>
33
///<reference path="runnerbase.ts" />
4-
/* tslint:disable:no-null */
4+
/* tslint:disable:no-null-keyword */
55

66
const enum FourSlashTestType {
77
Native,

src/harness/harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/// <reference path="external\chai.d.ts"/>
2424
/// <reference path="sourceMapRecorder.ts"/>
2525
/// <reference path="runnerbase.ts"/>
26-
/* tslint:disable:no-null */
26+
/* tslint:disable:no-null-keyword */
2727

2828
// Block scoped definitions work poorly for global variables, temporarily enable var
2929
/* tslint:disable:no-var-keyword */

src/harness/loggedIO.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// <reference path="..\..\src\compiler\sys.ts" />
22
/// <reference path="..\..\src\harness\harness.ts" />
33
/// <reference path="..\..\src\harness\runnerbase.ts" />
4-
/* tslint:disable:no-null */
4+
/* tslint:disable:no-null-keyword */
55

66
interface FileInformation {
77
contents: string;

src/harness/projectsRunner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
///<reference path="harness.ts" />
22
///<reference path="runnerbase.ts" />
3-
/* tslint:disable:no-null */
3+
/* tslint:disable:no-null-keyword */
44

55
// Test case is json of below type in tests/cases/project/
66
interface ProjectRunnerTestCase {

src/harness/runner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/// <reference path="rwcRunner.ts" />
2121
/// <reference path="harness.ts" />
2222

23-
/* tslint:disable:no-null */
23+
/* tslint:disable:no-null-keyword */
2424

2525
let runners: RunnerBase[] = [];
2626
let iterations = 1;

src/harness/rwcRunner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/// <reference path="runnerbase.ts" />
33
/// <reference path="loggedIO.ts" />
44
/// <reference path="..\compiler\commandLineParser.ts"/>
5-
/* tslint:disable:no-null */
5+
/* tslint:disable:no-null-keyword */
66

77
namespace RWC {
88
function runWithIOLog(ioLog: IOLog, fn: (oldIO: Harness.IO) => void) {

0 commit comments

Comments
 (0)