Skip to content

Commit 8862f33

Browse files
committed
Cleanup
1 parent 726b508 commit 8862f33

File tree

2 files changed

+17
-21
lines changed

2 files changed

+17
-21
lines changed

src/compiler/parser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10628,7 +10628,7 @@ export function processPragmasIntoFields(context: PragmaContext, reportDiagnosti
1062810628
const { types, lib, path, ["resolution-mode"]: res, preserve: _preserve } = arg.arguments;
1062910629
const preserve = _preserve === "true" ? true : undefined;
1063010630
if (arg.arguments["no-default-lib"] === "true") {
10631-
// Ignore.
10631+
// This has been removed; parse but ignore it.
1063210632
}
1063310633
else if (types) {
1063410634
const parsed = parseResolutionMode(res, types.pos, types.end, reportDiagnostic);

src/harness/fourslashImpl.ts

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -423,27 +423,23 @@ export class TestState {
423423
this.addMatchedInputFile(importedFilePath, exts);
424424
});
425425

426-
// Check if no-default-lib flag is false and if so add default library
427-
// TODO(jakebailey): fix no-default-lib
428-
if (!resolvedResult.isLibFile) {
429-
this.languageServiceAdapterHost.addScript(
430-
libName(Harness.Compiler.defaultLibFileName),
431-
Harness.Compiler.getDefaultLibrarySourceFile()!.text,
432-
/*isRootFile*/ false,
433-
);
426+
this.languageServiceAdapterHost.addScript(
427+
libName(Harness.Compiler.defaultLibFileName),
428+
Harness.Compiler.getDefaultLibrarySourceFile()!.text,
429+
/*isRootFile*/ false,
430+
);
434431

435-
compilationOptions.lib?.forEach(fileName => {
436-
const libFile = Harness.Compiler.getDefaultLibrarySourceFile(fileName);
437-
ts.Debug.assertIsDefined(libFile, `Could not find lib file '${fileName}'`);
438-
if (libFile) {
439-
this.languageServiceAdapterHost.addScript(
440-
libName(fileName),
441-
libFile.text,
442-
/*isRootFile*/ false,
443-
);
444-
}
445-
});
446-
}
432+
compilationOptions.lib?.forEach(fileName => {
433+
const libFile = Harness.Compiler.getDefaultLibrarySourceFile(fileName);
434+
ts.Debug.assertIsDefined(libFile, `Could not find lib file '${fileName}'`);
435+
if (libFile) {
436+
this.languageServiceAdapterHost.addScript(
437+
libName(fileName),
438+
libFile.text,
439+
/*isRootFile*/ false,
440+
);
441+
}
442+
});
447443
}
448444
else {
449445
// resolveReference file-option is not specified then do not resolve any files and include all inputFiles

0 commit comments

Comments
 (0)