microsoft · sheetalkamat · Apr 17, 2024 · Apr 17, 2024
diff --git a/src/harness/projectServiceStateLogger.ts b/src/harness/projectServiceStateLogger.ts
@@ -104,6 +104,8 @@ export function patchServiceForStateBaseline(service: ProjectService) {
     function baselineProjects(currentMappers: Set<DocumentPositionMapper>) {
         const autoImportProviderProjects = [] as AutoImportProviderProject[];
         const auxiliaryProjects = [] as AuxiliaryProject[];
+        const orphanConfiguredProjects = service.getOrphanConfiguredProjects(/*toRetainConfiguredProjects*/ undefined);
+        const noOpenRef = (project: Project) => isConfiguredProject(project) && (project.isClosed() || orphanConfiguredProjects.has(project));
         return baselineState(
             [service.externalProjects, service.configuredProjects, service.inferredProjects, autoImportProviderProjects, auxiliaryProjects],
             projects,
@@ -118,7 +120,7 @@ export function patchServiceForStateBaseline(service: ProjectService) {
                 projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "dirty", project.dirty, projectDiff, projectPropertyLogs);
                 projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "isClosed", project.isClosed(), projectDiff, projectPropertyLogs);
                 projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "isOrphan", !isBackgroundProject(project) && project.isOrphan(), projectDiff, projectPropertyLogs);
-                projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "noOpenRef", isConfiguredProject(project) && !project.hasOpenRef(), projectDiff, projectPropertyLogs);
+                projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "noOpenRef", noOpenRef(project), projectDiff, projectPropertyLogs);
                 projectDiff = printProperty(PrintPropertyWhen.TruthyOrChangedOrNew, data, "deferredClose", isConfiguredProject(project) && project.deferredClose, projectDiff, projectPropertyLogs);
                 projectDiff = printMapPropertyValue(
                     PrintPropertyWhen.Changed,
@@ -149,7 +151,7 @@ export function patchServiceForStateBaseline(service: ProjectService) {
                 dirty: project.dirty,
                 isClosed: project.isClosed(),
                 isOrphan: !isBackgroundProject(project) && project.isOrphan(),
-                noOpenRef: isConfiguredProject(project) && !project.hasOpenRef(),
+                noOpenRef: noOpenRef(project),
                 deferredClose: isConfiguredProject(project) && project.deferredClose,
                 autoImportProviderHost: project.autoImportProviderHost,
                 noDtsResolutionProject: project.noDtsResolutionProject,

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -4114,7 +4114,14 @@ export class ProjectService {
     }
 
     private removeOrphanConfiguredProjects(toRetainConfiguredProjects: readonly ConfiguredProject[] | ConfiguredProject | undefined) {
-        const toRemoveConfiguredProjects = new Map(this.configuredProjects);
+        const orphanConfiguredProjects = this.getOrphanConfiguredProjects(toRetainConfiguredProjects);
+        // Remove all the non marked projects
+        orphanConfiguredProjects.forEach(project => this.removeProject(project));
+    }
+
+    /** @internal */
+    getOrphanConfiguredProjects(toRetainConfiguredProjects: readonly ConfiguredProject[] | ConfiguredProject | undefined) {
+        const toRemoveConfiguredProjects = new Set(this.configuredProjects.values());
         const markOriginalProjectsAsUsed = (project: Project) => {
             if (project.originalConfiguredProjects && (isConfiguredProject(project) || !project.isOrphan())) {
                 project.originalConfiguredProjects.forEach(
@@ -4138,7 +4145,7 @@ export class ProjectService {
         this.inferredProjects.forEach(markOriginalProjectsAsUsed);
         this.externalProjects.forEach(markOriginalProjectsAsUsed);
         this.configuredProjects.forEach(project => {
-            if (!toRemoveConfiguredProjects.has(project.canonicalConfigFilePath)) return;
+            if (!toRemoveConfiguredProjects.has(project)) return;
             // If project has open ref (there are more than zero references from external project/open file), keep it alive as well as any project it references
             if (project.hasOpenRef()) {
                 retainConfiguredProject(project);
@@ -4149,15 +4156,14 @@ export class ProjectService {
             }
         });
 
-        // Remove all the non marked projects
-        toRemoveConfiguredProjects.forEach(project => this.removeProject(project));
+        return toRemoveConfiguredProjects;
 
         function isRetained(project: ConfiguredProject) {
-            return !toRemoveConfiguredProjects.has(project.canonicalConfigFilePath) || project.hasOpenRef();
+            return !toRemoveConfiguredProjects.has(project) || project.hasOpenRef();
         }
 
         function retainConfiguredProject(project: ConfiguredProject) {
-            if (toRemoveConfiguredProjects.delete(project.canonicalConfigFilePath)) {
+            if (toRemoveConfiguredProjects.delete(project)) {
                 // Keep original projects used
                 markOriginalProjectsAsUsed(project);
                 // Keep all the references alive

diff --git a/...er/Does-not-create-auto-import-providers-upon-opening-projects-for-find-all-references.js b/...er/Does-not-create-auto-import-providers-upon-opening-projects-for-find-all-references.js
@@ -265,7 +265,6 @@ Projects::
     projectStateVersion: 1
     projectProgramVersion: 0
     dirty: true
-    noOpenRef: true
 
 ScriptInfos::
 /node_modules/@angular/forms/forms.d.ts *new*
@@ -700,7 +699,6 @@ Projects::
 /packages/a/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
     originalConfiguredProjects: 3
         /packages/b/tsconfig.json
         /tsconfig.json
@@ -713,7 +711,6 @@ Projects::
     projectStateVersion: 1
     projectProgramVersion: 1 *changed*
     dirty: false *changed*
-    noOpenRef: true
     originalConfiguredProjects: 3 *changed*
         /packages/b/tsconfig.json *new*
         /tsconfig.json *new*

diff --git a/tests/baselines/reference/tsserver/declarationFileMaps/findAllReferences.js b/tests/baselines/reference/tsserver/declarationFileMaps/findAllReferences.js
@@ -971,7 +971,6 @@ Projects::
 /a/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
@@ -1059,10 +1058,10 @@ FsWatchesRecursive::
   {}
 
 Projects::
-/a/tsconfig.json (Configured)
+/a/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: true *changed*
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 2 *changed*
     projectProgramVersion: 1

diff --git a/...erence/tsserver/declarationFileMaps/findAllReferencesFull-definition-is-in-mapped-file.js b/...erence/tsserver/declarationFileMaps/findAllReferencesFull-definition-is-in-mapped-file.js
@@ -516,10 +516,10 @@ FsWatchesRecursive::
   {}
 
 Projects::
-/a/tsconfig.json (Configured)
+/a/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: false *changed*
 /b/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
@@ -639,7 +639,6 @@ Projects::
 /a/tsconfig.json (Configured)
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 /b/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1

diff --git a/tests/baselines/reference/tsserver/declarationFileMaps/findAllReferencesFull.js b/tests/baselines/reference/tsserver/declarationFileMaps/findAllReferencesFull.js
@@ -1005,7 +1005,6 @@ Projects::
 /a/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
@@ -1093,10 +1092,10 @@ FsWatchesRecursive::
   {}
 
 Projects::
-/a/tsconfig.json (Configured)
+/a/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: true *changed*
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 2 *changed*
     projectProgramVersion: 1

diff --git a/.../reference/tsserver/declarationFileMaps/getDefinitionAndBoundSpan-with-file-navigation.js b/.../reference/tsserver/declarationFileMaps/getDefinitionAndBoundSpan-with-file-navigation.js
@@ -907,11 +907,11 @@ FsWatchesRecursive::
   {}
 
 Projects::
-/b/tsconfig.json (Configured)
+/b/tsconfig.json (Configured) *changed*
     projectStateVersion: 2
     projectProgramVersion: 1
     dirty: true
-    noOpenRef: true
+    noOpenRef: false *changed*
 /user/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
@@ -1035,11 +1035,11 @@ FsWatchesRecursive::
   {}
 
 Projects::
-/b/tsconfig.json (Configured)
+/b/tsconfig.json (Configured) *changed*
     projectStateVersion: 2
     projectProgramVersion: 1
     dirty: true
-    noOpenRef: true
+    noOpenRef: true *changed*
 /user/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
@@ -1212,15 +1212,15 @@ Projects::
 /a/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
-/b/tsconfig.json (Configured)
+/b/tsconfig.json (Configured) *changed*
     projectStateVersion: 2
     projectProgramVersion: 1
     dirty: true
-    noOpenRef: true
-/user/tsconfig.json (Configured)
+    noOpenRef: false *changed*
+/user/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: false *changed*
 
 ScriptInfos::
 /a/a.ts (Open) *changed*
@@ -1294,15 +1294,15 @@ Projects::
     projectStateVersion: 1
     projectProgramVersion: 1
     noOpenRef: true *changed*
-/b/tsconfig.json (Configured)
+/b/tsconfig.json (Configured) *changed*
     projectStateVersion: 2
     projectProgramVersion: 1
     dirty: true
-    noOpenRef: true
-/user/tsconfig.json (Configured)
+    noOpenRef: true *changed*
+/user/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: true *changed*
 
 ScriptInfos::
 /a/a.ts *changed*

diff --git a/...erence/tsserver/declarationFileMaps/navigateToAll-file-is-not-specified-but-project-is.js b/...erence/tsserver/declarationFileMaps/navigateToAll-file-is-not-specified-but-project-is.js
@@ -882,10 +882,10 @@ FsWatchesRecursive::
   {}
 
 Projects::
-/b/tsconfig.json (Configured)
+/b/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: false *changed*
 /user/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1

diff --git a/...rence/tsserver/declarationFileMaps/navigateToAll-neither-file-not-project-is-specified.js b/...rence/tsserver/declarationFileMaps/navigateToAll-neither-file-not-project-is-specified.js
@@ -882,10 +882,10 @@ FsWatchesRecursive::
   {}
 
 Projects::
-/b/tsconfig.json (Configured)
+/b/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: false *changed*
 /user/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1

diff --git a/tests/baselines/reference/tsserver/declarationFileMaps/renameLocations.js b/tests/baselines/reference/tsserver/declarationFileMaps/renameLocations.js
@@ -985,7 +985,6 @@ Projects::
 /a/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
@@ -1073,10 +1072,10 @@ FsWatchesRecursive::
   {}
 
 Projects::
-/a/tsconfig.json (Configured)
+/a/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: true *changed*
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 2 *changed*
     projectProgramVersion: 1

diff --git a/tests/baselines/reference/tsserver/declarationFileMaps/renameLocationsFull.js b/tests/baselines/reference/tsserver/declarationFileMaps/renameLocationsFull.js
@@ -946,7 +946,6 @@ Projects::
 /a/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
@@ -1034,10 +1033,10 @@ FsWatchesRecursive::
   {}
 
 Projects::
-/a/tsconfig.json (Configured)
+/a/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: true *changed*
 /dev/null/inferredProject1* (Inferred) *changed*
     projectStateVersion: 2 *changed*
     projectProgramVersion: 1

diff --git a/...ation-project-disableSourceOfProjectReferenceRedirect-when-using-default-event-handler.js b/...ation-project-disableSourceOfProjectReferenceRedirect-when-using-default-event-handler.js
@@ -478,7 +478,6 @@ Projects::
 /user/username/projects/a/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 /user/username/projects/b/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1

diff --git a/...inal-location-project-disableSourceOfProjectReferenceRedirect-when-using-event-handler.js b/...inal-location-project-disableSourceOfProjectReferenceRedirect-when-using-event-handler.js
@@ -472,7 +472,6 @@ Projects::
 /user/username/projects/a/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 /user/username/projects/b/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1

diff --git a/...ents/projectLoading/opening-original-location-project-when-using-default-event-handler.js b/...ents/projectLoading/opening-original-location-project-when-using-default-event-handler.js
@@ -465,7 +465,6 @@ Projects::
 /user/username/projects/a/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 /user/username/projects/b/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1

diff --git a/...erver/events/projectLoading/opening-original-location-project-when-using-event-handler.js b/...erver/events/projectLoading/opening-original-location-project-when-using-event-handler.js
@@ -459,7 +459,6 @@ Projects::
 /user/username/projects/a/tsconfig.json (Configured) *new*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 /user/username/projects/b/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1

diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_baseUrl_toDist.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_baseUrl_toDist.js
@@ -343,10 +343,10 @@ watchedDirectoriesRecursive::
   {}
 
 Projects::
-/common/tsconfig.json (Configured)
+/common/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: false *changed*
 /dev/null/inferredProject1* (Inferred)
     projectStateVersion: 1
     projectProgramVersion: 1

diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_stripSrc.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_stripSrc.js
@@ -500,10 +500,10 @@ Projects::
     projectStateVersion: 1
     projectProgramVersion: 1
     noOpenRef: false *changed*
-/packages/dep/tsconfig.json (Configured)
+/packages/dep/tsconfig.json (Configured) *changed*
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
+    noOpenRef: false *changed*
 
 ScriptInfos::
 /lib.d.ts
@@ -716,7 +716,6 @@ Projects::
 /packages/dep/tsconfig.json (Configured)
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 
 ScriptInfos::
 /lib.d.ts
@@ -926,7 +925,6 @@ Projects::
 /packages/dep/tsconfig.json (Configured)
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 
 ScriptInfos::
 /lib.d.ts
@@ -1139,7 +1137,6 @@ Projects::
 /packages/dep/tsconfig.json (Configured)
     projectStateVersion: 1
     projectProgramVersion: 1
-    noOpenRef: true
 
 ScriptInfos::
 /lib.d.ts