microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-24 04:30:53 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

If there are no open files, do not schedule ensureProjectForOpenFiles (#41537)

Browse Source
This commit is contained in:
Sheetal Nandi 2020-11-18 16:10:11 -08:00 committed by GitHub
parent 9bbbe5c0c7
commit 2cc67ec0a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/editorServices.ts
View File

@ -930,6 +930,7 @@ namespace ts.server {
/*@internal*/
delayEnsureProjectForOpenFiles() {
if (!this.openFiles.size) return;
this.pendingEnsureProjectForOpenFiles = true;
this.throttledOperations.schedule(ensureProjectForOpenFileSchedule, /*delay*/ 2500, () => {
if (this.pendingProjectUpdates.size !== 0) {

1
src/testRunner/unittests/tsserver/externalProjects.ts
View File

@ -529,7 +529,6 @@ namespace ts.projectSystem {
[configFile.path]);
host.deleteFile(configFile.path);
host.checkTimeoutQueueLengthAndRun(1);
knownProjects = projectService.synchronizeProjectList(map(knownProjects, proj => proj.info!)); // TODO: GH#18217 GH#20039
checkNumberOfProjects(projectService, { configuredProjects: 0, externalProjects: 0, inferredProjects: 0 });

10
src/testRunner/unittests/tsserver/inferredProjects.ts
View File

@ -450,5 +450,15 @@ namespace ts.projectSystem {
};
assert.deepEqual(inferredProject.getTypeAcquisition(), expected, "typeAcquisition should be inferred for inferred projects");
});
it("Setting compiler options for inferred projects when there are no open files should not schedule any refresh", () => {
const host = createServerHost([commonFile1, libFile]);
const projectService = createProjectService(host);
projectService.setCompilerOptionsForInferredProjects({
allowJs: true,
target: ScriptTarget.ES2015
});
host.checkTimeoutQueueLength(0);
});
});
}

2
src/testRunner/unittests/tsserver/projects.ts
View File

@ -419,7 +419,7 @@ namespace ts.projectSystem {
unresolvedImports: response.unresolvedImports,
});
host.checkTimeoutQueueLengthAndRun(2);
host.checkTimeoutQueueLengthAndRun(1);
assert.isUndefined(request);
});

8
src/testRunner/unittests/tsserver/typingsInstaller.ts
View File

@ -435,7 +435,7 @@ namespace ts.projectSystem {
installer.installAll(/*expectedCount*/ 1);
checkNumberOfProjects(projectService, { externalProjects: 1 });
host.checkTimeoutQueueLengthAndRun(2);
host.checkTimeoutQueueLengthAndRun(1);
checkNumberOfProjects(projectService, { externalProjects: 1 });
checkProjectActualFiles(p, [file2Jsx.path, file3dts.path, lodashDts.path, reactDts.path]);
});
@ -642,7 +642,7 @@ namespace ts.projectSystem {
installer.installAll(/*expectedCount*/ 1);
checkNumberOfProjects(projectService, { externalProjects: 1 });
host.checkTimeoutQueueLengthAndRun(2);
host.checkTimeoutQueueLengthAndRun(1);
checkNumberOfProjects(projectService, { externalProjects: 1 });
// Commander: Existed as a JS file
// JQuery: Specified in 'include'
@ -726,7 +726,7 @@ namespace ts.projectSystem {
for (const f of typingFiles) {
assert.isTrue(host.fileExists(f.path), `expected file ${f.path} to exist`);
}
host.checkTimeoutQueueLengthAndRun(2);
host.checkTimeoutQueueLengthAndRun(1);
checkNumberOfProjects(projectService, { externalProjects: 1 });
checkProjectActualFiles(p, [file3.path, commander.path, express.path, jquery.path, moment.path, lodash.path]);
});
@ -829,7 +829,7 @@ namespace ts.projectSystem {
assert.equal(installer.pendingRunRequests.length, 0, "expected no throttled requests");
installer.executePendingCommands();
host.checkTimeoutQueueLengthAndRun(3); // for 2 projects and 1 refreshing inferred project
host.checkTimeoutQueueLengthAndRun(2); // for 2 projects
checkProjectActualFiles(p1, [file3.path, commander.path, jquery.path, lodash.path, cordova.path]);
checkProjectActualFiles(p2, [file3.path, grunt.path, gulp.path]);
});