Workspace symbols to load more projects

Author: sheetalkamat

internal/lsp/server.go

@@ -1146,11 +1146,10 @@ func (s *Server) handleDocumentOnTypeFormat(ctx context.Context, ls *ls.Language
 }
 
 func (s *Server) handleWorkspaceSymbol(ctx context.Context, params *lsproto.WorkspaceSymbolParams, reqMsg *lsproto.RequestMessage) (lsproto.WorkspaceSymbolResponse, error) {
-	snapshot, release := s.session.Snapshot()
-	defer release()
+	snapshot := s.session.GetSnapshotLoadingProjectTree(ctx, nil)
 	defer s.recover(reqMsg)
+
 	programs := core.Map(snapshot.ProjectCollection.Projects(), (*project.Project).GetProgram)
-	// !!! sheetal: additional projects that can be loaded but were delayed
 	return ls.ProvideWorkspaceSymbols(ctx, programs, snapshot.Converters(), params.Query)
 }
 

internal/project/projectcollectionbuilder.go

@@ -442,6 +442,9 @@ func (b *ProjectCollectionBuilder) DidRequestProjectTrees(projectsReferenced map
 				// If this project has potential project reference for any of the project we are loading ancestor tree for
 				// load this project first
 				if project := entry.Value(); project != nil && project.forEachPotentialProjectReference(func(p tspath.Path) bool {
+					if projectsReferenced == nil {
+						return true
+					}
 					_, isReferenced := projectsReferenced[p]
 					return isReferenced
 				}) {
@@ -491,11 +494,11 @@ func (b *ProjectCollectionBuilder) ensureProjectTree(
 	}
 	for _, childConfig := range children {
 		wg.Queue(func() {
-			if !program.ForEachResolvedProjectReferenceInChildConfig(
+			if projectsReferenced != nil && !program.ForEachResolvedProjectReferenceInChildConfig(
 				childConfig,
 				func(referencePath tspath.Path, config *tsoptions.ParsedCommandLine, _ *tsoptions.ParsedCommandLine, _ int) bool {
-					_, ok := projectsReferenced[referencePath]
-					return ok
+					_, isReferenced := projectsReferenced[referencePath]
+					return isReferenced
 				}) {
 				return
 			}

internal/project/session.go

@@ -487,21 +487,29 @@ func (s *Session) projectContainsFile(project *Project, uri lsproto.DocumentUri)
 	return project.containsFile(path)
 }
 
-func (s *Session) ForEachProjectLocationLoadingProjectTree(
+func (s *Session) GetSnapshotLoadingProjectTree(
 	ctx context.Context,
+	// If null, all project trees need to be loaded, otherwise only those that are referenced
 	requestedProjectTrees map[tspath.Path]struct{},
-	defaultDefinition *ls.NonLocalDefinition,
-	canIterateProject func(project *Project) bool,
-	handleLocation func(*Project, lsproto.DocumentUri, lsproto.Position),
-) error {
+) *Snapshot {
 	snapshot := s.getSnapshot(
 		ctx,
-		snapshotChangeRequest{requestedProjectTrees: requestedProjectTrees},
+		snapshotChangeRequest{requestedProjectTrees: &projectTreeRequest{requestedProjectTrees}},
 		func(snapshot *Snapshot, updatedSnapshot bool) UpdateReason {
 			return core.IfElse(!updatedSnapshot, UpdateReasonRequestedLoadProjectTree, UpdateReasonUnknown)
 		},
 	)
-	for _, project := range snapshot.ProjectCollection.Projects() {
+	return snapshot
+}
+
+func (s *Session) ForEachProjectLocationLoadingProjectTree(
+	ctx context.Context,
+	requestedProjectTrees map[tspath.Path]struct{},
+	defaultDefinition *ls.NonLocalDefinition,
+	canIterateProject func(project *Project) bool,
+	handleLocation func(*Project, lsproto.DocumentUri, lsproto.Position),
+) error {
+	for _, project := range s.GetSnapshotLoadingProjectTree(ctx, requestedProjectTrees).ProjectCollection.Projects() {
 		if ctx.Err() != nil {
 			return ctx.Err()
 		}

internal/project/snapshot.go

@@ -136,6 +136,11 @@ type APISnapshotRequest struct {
 	UpdateProjects *collections.Set[tspath.Path]
 }
 
+type projectTreeRequest struct {
+	// If null, all project trees need to be loaded, otherwise only those that are referenced
+	referencedProjects map[tspath.Path]struct{}
+}
+
 type snapshotChangeRequest struct {
 	// requestedURIs are URIs that were requested by the client.
 	// The new snapshot should ensure projects for these URIs have loaded programs.
@@ -150,7 +155,7 @@ type snapshotChangeRequest struct {
 	// Update and ensure project trees that reference the projects
 	// This is used to compute the solution and project tree so that
 	// we can find references across all the projects in the solution irrespective of which project is open
-	requestedProjectTrees map[tspath.Path]struct{}
+	requestedProjectTrees *projectTreeRequest
 }
 
 type SnapshotChange struct {
@@ -213,8 +218,8 @@ func (s *Snapshot) Clone(ctx context.Context, change SnapshotChange, overlays ma
 			if len(change.ensureDefaultProjectForURIs) != 0 {
 				details += fmt.Sprintf(" ensureDefaultProjectForURIs: %v", change.ensureDefaultProjectForURIs)
 			}
-			if len(change.requestedProjectTrees) != 0 {
-				details += fmt.Sprintf(" requestedProjectTrees: %v", maps.Keys(change.requestedProjectTrees))
+			if change.requestedProjectTrees != nil {
+				details += fmt.Sprintf(" requestedProjectTrees: %v", maps.Keys(change.requestedProjectTrees.referencedProjects))
 			}
 			return details
 		}
@@ -299,8 +304,8 @@ func (s *Snapshot) Clone(ctx context.Context, change SnapshotChange, overlays ma
 		projectCollectionBuilder.DidRequestEnsureDefaultProject(uri, logger.Fork("DidRequestFile"))
 	}
 
-	if len(change.requestedProjectTrees) != 0 {
-		projectCollectionBuilder.DidRequestProjectTrees(change.requestedProjectTrees, logger.Fork("DidRequestProjectTrees"))
+	if change.requestedProjectTrees != nil {
+		projectCollectionBuilder.DidRequestProjectTrees(change.requestedProjectTrees.referencedProjects, logger.Fork("DidRequestProjectTrees"))
 	}
 
 	projectCollection, configFileRegistry := projectCollectionBuilder.Finalize(logger)

testdata/baselines/reference/lspservertests/declarationMaps/workspace-symbols.js

@@ -107,6 +107,30 @@ Config File Names::
     "query": "fn"
   }
 }
+Projects::
+  [/home/src/projects/project/a/tsconfig.json] *new*
+    /home/src/projects/project/a/a.ts  
+  [/home/src/projects/project/b/tsconfig.json] *new*
+    /home/src/projects/project/b/b.ts  
+    /home/src/projects/project/b/c.ts  
+  [/home/src/projects/project/user/tsconfig.json] 
+    /home/src/projects/project/a/a.ts        
+    /home/src/projects/project/b/b.ts        
+    /home/src/projects/project/user/user.ts  
+Config::
+  [/home/src/projects/project/a/tsconfig.json] *modified*
+    RetainingProjects: *modified*
+      /home/src/projects/project/a/tsconfig.json     *new*
+      /home/src/projects/project/user/tsconfig.json  
+  [/home/src/projects/project/b/tsconfig.json] *modified*
+    RetainingProjects: *modified*
+      /home/src/projects/project/b/tsconfig.json     *new*
+      /home/src/projects/project/user/tsconfig.json  
+  [/home/src/projects/project/user/tsconfig.json] 
+    RetainingProjects:
+      /home/src/projects/project/user/tsconfig.json  
+    RetainingOpenFiles:
+      /home/src/projects/project/user/user.ts  
 // === /home/src/projects/project/a/a.ts ===
 // export function [|{| name: fnA, kind: function |}fnA|]() {}
 // export interface IfaceA {}
@@ -115,6 +139,9 @@ Config File Names::
 // === /home/src/projects/project/b/b.ts ===
 // export function [|{| name: fnB, kind: function |}fnB|]() {}
 
+// === /home/src/projects/project/b/c.ts ===
+// export function [|{| name: fnC, kind: function |}fnC|]() {}
+
 // === /home/src/projects/project/user/user.ts ===
 // import * as a from "../a/a";
 // import * as b from "../b/b";
@@ -145,6 +172,11 @@ Open Files::
   }
 }
 Projects::
+  [/home/src/projects/project/a/tsconfig.json] *deleted*
+    /home/src/projects/project/a/a.ts  
+  [/home/src/projects/project/b/tsconfig.json] *deleted*
+    /home/src/projects/project/b/b.ts  
+    /home/src/projects/project/b/c.ts  
   [/home/src/projects/project/dummy/tsconfig.json] *new*
     /home/src/projects/project/dummy/dummy.ts  
   [/home/src/projects/project/user/tsconfig.json] *deleted*