Fix recover

Author: sheetalkamat

internal/ls/crossproject.go

@@ -38,7 +38,7 @@ type CrossProjectOrchestrator interface {
 	GetLanguageServiceForProjectWithFile(ctx context.Context, project Project, uri lsproto.DocumentUri) *LanguageService
 	GetProjectsForFile(ctx context.Context, uri lsproto.DocumentUri) ([]Project, error)
 	GetProjectsLoadingProjectTree(ctx context.Context, requestedProjectTrees *collections.Set[tspath.Path]) iter.Seq[Project]
-	Recover()
+	RecoverWith(r any)
 }
 
 func handleCrossProject[Req lsproto.HasTextDocumentPosition, Resp any](
@@ -81,7 +81,11 @@ func handleCrossProject[Req lsproto.HasTextDocumentPosition, Resp any](
 			if ctx.Err() != nil {
 				return
 			}
-			defer orchestrator.Recover()
+			defer func() {
+				if r := recover(); r != nil {
+					orchestrator.RecoverWith(r)
+				}
+			}()
 			// Process the item
 			ls := item.ls
 			if ls == nil {

internal/lsp/server.go

@@ -695,19 +695,23 @@ func (c *crossProjectOrchestrator) GetProjectsLoadingProjectTree(ctx context.Con
 	}
 }
 
-func (c *crossProjectOrchestrator) Recover() {
-	c.server.recover(c.req)
+func (c *crossProjectOrchestrator) RecoverWith(r any) {
+	c.server.recoverWith(c.req, r)
+}
+
+func (s *Server) recoverWith(req *lsproto.RequestMessage, r any) {
+	stack := debug.Stack()
+	s.Log("panic handling request", req.Method, r, string(stack))
+	if req.ID != nil {
+		s.sendError(req.ID, fmt.Errorf("%w: panic handling request %s: %v", lsproto.ErrorCodeInternalError, req.Method, r))
+	} else {
+		s.Log("unhandled panic in notification", req.Method, r)
+	}
 }
 
 func (s *Server) recover(req *lsproto.RequestMessage) {
 	if r := recover(); r != nil {
-		stack := debug.Stack()
-		s.Log("panic handling request", req.Method, r, string(stack))
-		if req.ID != nil {
-			s.sendError(req.ID, fmt.Errorf("%w: panic handling request %s: %v", lsproto.ErrorCodeInternalError, req.Method, r))
-		} else {
-			s.Log("unhandled panic in notification", req.Method, r)
-		}
+		s.recoverWith(req, r)
 	}
 }