Skip to content

Commit 3fe379c

Browse files
committed
lint harness, disablow control flow analysis because buggy
1 parent cbe2f3d commit 3fe379c

14 files changed

Lines changed: 510 additions & 445 deletions

src/compiler/emitter.ts

Lines changed: 290 additions & 289 deletions
Large diffs are not rendered by default.

src/harness/compilerRunner.ts

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

56
const enum CompilerTestType {
67
Conformance,
@@ -32,7 +33,8 @@ class CompilerBaselineRunner extends RunnerBase {
3233
}
3334
else if (testType === CompilerTestType.Test262) {
3435
this.testSuiteName = "test262";
35-
} else {
36+
}
37+
else {
3638
this.testSuiteName = "compiler"; // default to this for historical reasons
3739
}
3840
this.basePath += "/" + this.testSuiteName;
@@ -82,7 +84,8 @@ class CompilerBaselineRunner extends RunnerBase {
8284
otherFiles.push({ unitName: rootDir + unit.name, content: unit.content });
8385
}
8486
});
85-
} else {
87+
}
88+
else {
8689
toBeCompiled = units.map(unit => {
8790
return { unitName: rootDir + unit.name, content: unit.content };
8891
});
@@ -193,7 +196,8 @@ class CompilerBaselineRunner extends RunnerBase {
193196

194197
if (jsCode.length > 0) {
195198
return tsCode + "\r\n\r\n" + jsCode;
196-
} else {
199+
}
200+
else {
197201
return null;
198202
}
199203
});

src/harness/fourslash.ts

Lines changed: 90 additions & 53 deletions
Large diffs are not rendered by default.

src/harness/fourslashRunner.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
///<reference path="fourslash.ts" />
22
///<reference path="harness.ts"/>
33
///<reference path="runnerbase.ts" />
4+
/* tslint:disable:no-null */
45

56
const enum FourSlashTestType {
67
Native,
@@ -25,8 +26,8 @@ class FourSlashRunner extends RunnerBase {
2526
this.testSuiteName = "fourslash-shims";
2627
break;
2728
case FourSlashTestType.ShimsWithPreprocess:
28-
this.basePath = 'tests/cases/fourslash/shims-pp';
29-
this.testSuiteName = 'fourslash-shims-pp';
29+
this.basePath = "tests/cases/fourslash/shims-pp";
30+
this.testSuiteName = "fourslash-shims-pp";
3031
break;
3132
case FourSlashTestType.Server:
3233
this.basePath = "tests/cases/fourslash/server";
@@ -87,7 +88,8 @@ class FourSlashRunner extends RunnerBase {
8788
FourSlash.xmlData.forEach(xml => {
8889
if (xml.invalidReason !== null) {
8990
lines.push("<!-- Skipped " + xml.originalName + ", reason: " + xml.invalidReason + " -->");
90-
} else {
91+
}
92+
else {
9193
lines.push(" <Scenario Name=\"" + xml.originalName + "\">");
9294
xml.actions.forEach(action => {
9395
lines.push(" " + action);

0 commit comments

Comments
 (0)