Skip to content

Commit 7c918fb

Browse files
sheetalkamattypescript-bot
andauthoredSep 8, 2022
Baseline host state when baselining tsserver tests (#50678)
* Some more formatting to have baselines similar to what we have in tsserver.log * Some refactor * Baselines * Baseline host details on each request * More formatting per tsserver log * More baselining of host state * Update Baselines and/or Applied Lint Fixes * Use utc time in logger for baselines Co-authored-by: TypeScript Bot <typescriptbot@microsoft.com>
1 parent 2f1ba45 commit 7c918fb

File tree

419 files changed

+336503
-43072
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+336503
-43072
lines changed
 

‎src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ namespace ts.projectSystem {
7676
};
7777

7878
const host = createServerHost([root, imported]);
79-
const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
79+
const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs(host) });
8080
projectService.setCompilerOptionsForInferredProjects({ module: ModuleKind.AMD, noLib: true });
8181
projectService.openClientFile(root.path);
8282
const project = projectService.inferredProjects[0];
@@ -134,7 +134,7 @@ namespace ts.projectSystem {
134134
};
135135

136136
const host = createServerHost([root]);
137-
const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
137+
const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs(host) });
138138
projectService.setCompilerOptionsForInferredProjects({ module: ModuleKind.AMD, noLib: true });
139139
const logCacheAndClear = createLoggerTrackingHostCalls(host);
140140
projectService.openClientFile(root.path);
@@ -146,7 +146,7 @@ namespace ts.projectSystem {
146146
logCacheAndClear(projectService.logger);
147147

148148
host.writeFile(imported.path, imported.content);
149-
host.runQueuedTimeoutCallbacks();
149+
projectService.runQueuedTimeoutCallbacks();
150150
logSemanticDiagnostics(projectService, project, root);
151151
logCacheAndClear(projectService.logger);
152152
baselineTsserverLogs("cachingFileSystemInformation", "loads missing files from disk", projectService);
@@ -195,7 +195,7 @@ namespace ts.projectSystem {
195195
};
196196
const projectFiles = [clientFile, anotherModuleFile, moduleFile, tsconfigFile];
197197
const host = createServerHost(projectFiles);
198-
const session = createSession(host, { logger: createLoggerWithInMemoryLogs() });
198+
const session = createSession(host, { logger: createLoggerWithInMemoryLogs(host) });
199199
openFilesForSession([clientFile], session);
200200
const logCacheAndClear = createLoggerTrackingHostCalls(host);
201201

@@ -273,14 +273,14 @@ namespace ts.projectSystem {
273273
};
274274
const projectFiles = [file1, file2, es2016LibFile, tsconfigFile];
275275
const host = createServerHost(projectFiles, { useCaseSensitiveFileNames });
276-
const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
276+
const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs(host) });
277277
projectService.openClientFile(file1.path);
278278

279279
const logCacheAndClear = createLoggerTrackingHostCalls(host);
280280

281281
// Create file cookie.ts
282282
host.writeFile(file3.path, file3.content);
283-
host.runQueuedTimeoutCallbacks();
283+
projectService.runQueuedTimeoutCallbacks();
284284
logCacheAndClear(projectService.logger);
285285

286286
projectService.openClientFile(file3.path);
@@ -383,7 +383,7 @@ namespace ts.projectSystem {
383383
`
384384
});
385385
const host = createServerHost([app, libFile, tsconfigJson, packageJson]);
386-
const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
386+
const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs(host) });
387387
projectService.setHostConfiguration({ preferences: { includePackageJsonAutoImports: "off" } });
388388
projectService.openClientFile(app.path);
389389

@@ -479,15 +479,15 @@ namespace ts.projectSystem {
479479
if (npmInstallComplete || timeoutDuringPartialInstallation) {
480480
if (timeoutQueueLengthWhenRunningTimeouts) {
481481
// Expected project update
482-
host.checkTimeoutQueueLengthAndRun(timeoutQueueLengthWhenRunningTimeouts + 1); // Scheduled invalidation of resolutions
483-
host.runQueuedTimeoutCallbacks(); // Actual update
482+
projectService.checkTimeoutQueueLengthAndRun(timeoutQueueLengthWhenRunningTimeouts + 1); // Scheduled invalidation of resolutions
483+
projectService.runQueuedTimeoutCallbacks(); // Actual update
484484
}
485485
else {
486-
host.checkTimeoutQueueLengthAndRun(timeoutQueueLengthWhenRunningTimeouts);
486+
projectService.checkTimeoutQueueLengthAndRun(timeoutQueueLengthWhenRunningTimeouts);
487487
}
488488
}
489489
else {
490-
host.checkTimeoutQueueLength(3);
490+
projectService.checkTimeoutQueueLength(3);
491491
}
492492
}
493493
}

‎src/testRunner/unittests/tsserver/configFileSearch.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ namespace ts.projectSystem {
3838
content: "{}"
3939
};
4040
const host = createServerHost([f1, libFile, configFile, configFile2]);
41-
const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
41+
const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs(host) });
4242
service.openClientFile(f1.path, /*fileContent*/ undefined, /*scriptKind*/ undefined, projectDir);
4343

4444
// Delete config file - should create inferred project and not configured project
4545
host.deleteFile(configFile.path);
46-
host.runQueuedTimeoutCallbacks();
46+
service.runQueuedTimeoutCallbacks();
4747
checkNumberOfProjects(service, { inferredProjects: 1 });
4848
baselineTsserverLogs("configFileSearch", "should use projectRootPath when searching for inferred project again", service);
4949
});
@@ -67,13 +67,13 @@ namespace ts.projectSystem {
6767
const service = createProjectService(host, {
6868
useSingleInferredProject: true,
6969
useInferredProjectPerProjectRoot: true,
70-
logger: createLoggerWithInMemoryLogs(),
70+
logger: createLoggerWithInMemoryLogs(host),
7171
});
7272
service.openClientFile(f1.path, /*fileContent*/ undefined, /*scriptKind*/ undefined, projectDir);
7373

7474
// Delete config file - should create inferred project with project root path set
7575
host.deleteFile(configFile.path);
76-
host.runQueuedTimeoutCallbacks();
76+
service.runQueuedTimeoutCallbacks();
7777
baselineTsserverLogs("configFileSearch", "should use projectRootPath when searching for inferred project again 2", service);
7878
});
7979

@@ -89,7 +89,7 @@ namespace ts.projectSystem {
8989
};
9090
function openClientFile(files: File[]) {
9191
const host = createServerHost(files);
92-
const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
92+
const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs(host) });
9393
projectService.openClientFile(file.path, /*fileContent*/ undefined, /*scriptKind*/ undefined, "/a/b/projects/proj");
9494
return { host, projectService };
9595
}
@@ -98,10 +98,10 @@ namespace ts.projectSystem {
9898
const { host, projectService } = openClientFile([file, libFile, tsconfig]);
9999

100100
host.deleteFile(tsconfig.path);
101-
host.runQueuedTimeoutCallbacks();
101+
projectService.runQueuedTimeoutCallbacks();
102102

103103
host.writeFile(tsconfig.path, tsconfig.content);
104-
host.runQueuedTimeoutCallbacks();
104+
projectService.runQueuedTimeoutCallbacks();
105105

106106
baselineTsserverLogs("configFileSearch", "tsconfig for the file exists", projectService);
107107
});
@@ -110,10 +110,10 @@ namespace ts.projectSystem {
110110
const { host, projectService } = openClientFile([file, libFile]);
111111

112112
host.writeFile(tsconfig.path, tsconfig.content);
113-
host.runQueuedTimeoutCallbacks();
113+
projectService.runQueuedTimeoutCallbacks();
114114

115115
host.deleteFile(tsconfig.path);
116-
host.runQueuedTimeoutCallbacks();
116+
projectService.runQueuedTimeoutCallbacks();
117117

118118
baselineTsserverLogs("configFileSearch", "tsconfig for the file does not exist", projectService);
119119
});
@@ -124,7 +124,7 @@ namespace ts.projectSystem {
124124
it(scenario, () => {
125125
const path = `/root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js`;
126126
const host = createServerHost([libFile, { path, content: "const x = 10" }], { useCaseSensitiveFileNames: true });
127-
const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
127+
const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs(host) });
128128
service.openClientFile(path, /*fileContent*/ undefined, /*scriptKind*/ undefined, projectRootPath);
129129
baselineTsserverLogs("configFileSearch", scenario, service);
130130
});

0 commit comments

Comments
 (0)
Please sign in to comment.