Skip to content

Add fast path exits if we are retaining all configured projects #59689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Add fast path exits if we are retaining all configured projects #59689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions src/server/editorServices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4456,7 +4456,7 @@ export class ProjectService {
toRetainConfiguredProjects: Set<ConfiguredProject> | undefined,
openFilesWithRetainedConfiguredProject: Set<Path> | undefined,
externalProjectsRetainingConfiguredProjects: Set<string> | undefined,
) {
): Set<ConfiguredProject> {
const toRemoveConfiguredProjects = new Set(this.configuredProjects.values());
const markOriginalProjectsAsUsed = (project: Project) => {
if (project.originalConfiguredProjects && (isConfiguredProject(project) || !project.isOrphan())) {
Expand All @@ -4469,6 +4469,8 @@ export class ProjectService {
}
};
toRetainConfiguredProjects?.forEach(retainConfiguredProject);
// Everything needs to be retained, fast path to skip all the work
if (!toRemoveConfiguredProjects.size) return toRemoveConfiguredProjects;

// Do not remove configured projects that are used as original projects of other
this.inferredProjects.forEach(markOriginalProjectsAsUsed);
Expand All @@ -4479,7 +4481,10 @@ export class ProjectService {
projects.forEach(retainConfiguredProject);
}
});
this.openFiles.forEach((_projectRootPath, path) => {
// Everything needs to be retained, fast path to skip all the work
if (!toRemoveConfiguredProjects.size) return toRemoveConfiguredProjects;

forEachEntry(this.openFiles, (_projectRootPath, path) => {
if (openFilesWithRetainedConfiguredProject?.has(path)) return;
const info = this.getScriptInfoForPath(path)!;
// Part of external project
Expand All @@ -4491,15 +4496,21 @@ export class ProjectService {
);
if (result?.defaultProject) {
result?.seenProjects.forEach(retainConfiguredProject);
// Everything needs to be retained, fast path to skip all the work
if (!toRemoveConfiguredProjects.size) return toRemoveConfiguredProjects;
}
});

// Everything needs to be retained, fast path to skip all the work
if (!toRemoveConfiguredProjects.size) return toRemoveConfiguredProjects;

// Retain all the configured projects that have pending updates
// or the ones that is referencing retained project (or to be retained)
this.configuredProjects.forEach(project => {
forEachEntry(this.configuredProjects, project => {
if (toRemoveConfiguredProjects.has(project)) {
if (isPendingUpdate(project) || forEachReferencedProject(project, isRetained)) {
retainConfiguredProject(project);
if (!toRemoveConfiguredProjects.size) return toRemoveConfiguredProjects;
}
}
});
Expand Down