Skip to content

Commit 00bfc06

Browse files
committed
remove unused arguments for getCompiler
1 parent 13a6487 commit 00bfc06

3 files changed

Lines changed: 6 additions & 26 deletions

File tree

src/harness/compilerRunner.ts

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const enum CompilerTestType {
1010
}
1111

1212
class CompilerBaselineRunner extends RunnerBase {
13-
private basePath = 'tests/cases';
13+
protected basePath = 'tests/cases';
1414
private errors: boolean;
1515
private emit: boolean;
1616
private decl: boolean;
@@ -113,10 +113,7 @@ class CompilerBaselineRunner extends RunnerBase {
113113
for (var i = 0; i < tcSettings.length; ++i) {
114114
// noImplicitAny is passed to getCompiler, but target is just passed in the settings blob to setCompilerSettings
115115
if (!createNewInstance && (tcSettings[i].flag == "noimplicitany" || tcSettings[i].flag === 'target')) {
116-
harnessCompiler = Harness.Compiler.getCompiler({
117-
useExistingInstance: false,
118-
optionsForFreshInstance: { useMinimalDefaultLib: true, noImplicitAny: tcSettings[i].flag === "noimplicitany" }
119-
});
116+
harnessCompiler = Harness.Compiler.getCompiler();
120117
harnessCompiler.setCompilerSettings(tcSettings);
121118
createNewInstance = true;
122119
}
@@ -125,10 +122,7 @@ class CompilerBaselineRunner extends RunnerBase {
125122

126123
afterEach(() => {
127124
if (createNewInstance) {
128-
harnessCompiler = Harness.Compiler.getCompiler({
129-
useExistingInstance: false,
130-
optionsForFreshInstance: { useMinimalDefaultLib: true, noImplicitAny: false }
131-
});
125+
harnessCompiler = Harness.Compiler.getCompiler();
132126
createNewInstance = false;
133127
}
134128
});
@@ -312,10 +306,7 @@ class CompilerBaselineRunner extends RunnerBase {
312306

313307
public initializeTests() {
314308
describe("Setup compiler for compiler baselines", () => {
315-
var harnessCompiler = Harness.Compiler.getCompiler({
316-
useExistingInstance: false,
317-
optionsForFreshInstance: { useMinimalDefaultLib: true, noImplicitAny: false }
318-
});
309+
var harnessCompiler = Harness.Compiler.getCompiler();
319310
this.parseOptions();
320311
});
321312

@@ -332,10 +323,7 @@ class CompilerBaselineRunner extends RunnerBase {
332323
}
333324

334325
describe("Cleanup after compiler baselines", () => {
335-
var harnessCompiler = Harness.Compiler.getCompiler({
336-
useExistingInstance: false,
337-
optionsForFreshInstance: { useMinimalDefaultLib: true, noImplicitAny: false }
338-
});
326+
var harnessCompiler = Harness.Compiler.getCompiler();
339327
});
340328
}
341329

src/harness/fourslashRunner.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ class FourslashRunner extends RunnerBase {
1515
}
1616

1717
describe("fourslash tests", () => {
18-
before(() => {
19-
Harness.Compiler.getCompiler({ useExistingInstance: false });
20-
});
21-
2218
this.tests.forEach((fn: string) => {
2319
fn = ts.normalizeSlashes(fn);
2420
var justName = fn.replace(/^.*[\\\/]/, '');
@@ -33,10 +29,6 @@ class FourslashRunner extends RunnerBase {
3329
});
3430
}
3531
});
36-
37-
after(() => {
38-
Harness.Compiler.getCompiler({ useExistingInstance: false });
39-
});
4032
});
4133

4234
describe('Generate Tao XML', () => {

src/harness/harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ module Harness {
10291029
/** Returns the singleton harness compiler instance for generating and running tests.
10301030
If required a fresh compiler instance will be created, otherwise the existing singleton will be re-used.
10311031
*/
1032-
export function getCompiler(opts?: { useExistingInstance: boolean; optionsForFreshInstance?: { useMinimalDefaultLib: boolean; noImplicitAny: boolean; } }) {
1032+
export function getCompiler() {
10331033
return harnessCompiler = harnessCompiler || new HarnessCompiler();
10341034
}
10351035

0 commit comments

Comments
 (0)