Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
11 changes: 7 additions & 4 deletions src/harness/harnessIO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,24 +233,27 @@ export namespace Compiler {
export const es2015DefaultLibFileName = "lib.es2015.d.ts";

// Cache of lib files from "built/local"
export let libFileNameSourceFileMap: Map<string, ts.SourceFile> | undefined;
export let libFileNameSourceFileMap: Map<string, { file: ts.SourceFile; stringified: string; }> | undefined;

export function getDefaultLibrarySourceFile(fileName: string = defaultLibFileName): ts.SourceFile | undefined {
if (!isDefaultLibraryFile(fileName)) {
return undefined;
}

if (!libFileNameSourceFileMap) {
const file = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.es5.d.ts")!, /*languageVersion*/ ts.ScriptTarget.Latest);
libFileNameSourceFileMap = new Map(Object.entries({
[defaultLibFileName]: createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.es5.d.ts")!, /*languageVersion*/ ts.ScriptTarget.Latest),
[defaultLibFileName]: { file, stringified: JSON.stringify(file.text) },
}));
}

let sourceFile = libFileNameSourceFileMap.get(fileName);
if (!sourceFile) {
libFileNameSourceFileMap.set(fileName, sourceFile = createSourceFileAndAssertInvariants(fileName, IO.readFile(libFolder + fileName)!, ts.ScriptTarget.Latest));
const file = createSourceFileAndAssertInvariants(fileName, IO.readFile(libFolder + fileName)!, ts.ScriptTarget.Latest)
sourceFile = { file, stringified: JSON.stringify(file.text) };
libFileNameSourceFileMap.set(fileName, sourceFile);
}
return sourceFile;
return sourceFile.file;
}

export function getDefaultLibFileName(options: ts.CompilerOptions): string {
Expand Down
4 changes: 2 additions & 2 deletions src/harness/tsserverLogger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ function sanitizeHarnessLSException(s: string) {

export function sanitizeLibFileText(s: string): string {
Compiler.libFileNameSourceFileMap?.forEach((lib, fileName) => {
s = replaceAll(s, JSON.stringify(lib.text), `${fileName}-Text`);
s = replaceAll(s, lib.text, `${fileName}-Text`);
s = replaceAll(s, lib.stringified, `${fileName}-Text`);
s = replaceAll(s, lib.file.text, `${fileName}-Text`);
Comment on lines +147 to +148
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This stringify accounted for a large amount of runtime as more files are being loaded in the tests; moving it fixes the test perf issue.

});
return s;
}
Expand Down
Loading