Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Jakefile.js
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,6 @@ task("update-sublime", ["local", serverFile], function() {
var tslintRuleDir = "scripts/tslint";
var tslintRules = ([
"nextLineRule",
"noNullRule",
"preferConstRule",
"booleanTriviaRule",
"typeOperatorSpacingRule",
Expand Down
20 changes: 0 additions & 20 deletions scripts/tslint/noNullRule.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/harness/compilerRunner.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/harness/fourslash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/harness/fourslashRunner.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/harness/harness.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion src/harness/loggedIO.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/harness/projectsRunner.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/harness/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/harness/rwcRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/harness/test262Runner.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/server/server.ts
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/services/shims.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down