Provide SourceGeneratedFileInfo for workspace symbols requests

src/OmniSharp.Abstractions/Models/v1/SymbolLocation.cs

@@ -1,7 +1,11 @@
-namespace OmniSharp.Models
+using OmniSharp.Models.v1.SourceGeneratedFile;
+
+namespace OmniSharp.Models
 {
     public class SymbolLocation : QuickFix
     {
         public string Kind { get; set; }
+        public string ContainingSymbolName { get; set; }
+        public SourceGeneratedFileInfo GeneratedFileInfo { get; set; }
     }
-}
+}

src/OmniSharp.LanguageServerProtocol/Handlers/OmniSharpWorkspaceSymbolsHandler.cs

@@ -60,6 +60,7 @@ public override async Task<Container<SymbolInformation>> Handle(
                     {
                         Name = x.Text,
                         Kind = Helpers.ToSymbolKind(x.Kind),
+                        ContainerName = x.ContainingSymbolName,
                         Location = new OmniSharp.Extensions.LanguageServer.Protocol.Models.Location
                         {
                             Uri = Helpers.ToUri(x.FileName),

src/OmniSharp.Roslyn.CSharp/Services/Navigation/GoToDefinitionHelpers.cs

@@ -3,8 +3,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.FindSymbols;
 using OmniSharp.Extensions;
-using OmniSharp.Models.v1.SourceGeneratedFile;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -44,21 +42,5 @@ internal static class GoToDefinitionHelpers
 
             return null;
         }
-
-        internal static SourceGeneratedFileInfo? GetSourceGeneratedFileInfo(OmniSharpWorkspace workspace, Location location)
-        {
-            Debug.Assert(location.IsInSource);
-            var document = workspace.CurrentSolution.GetDocument(location.SourceTree);
-            if (document is not SourceGeneratedDocument)
-            {
-                return null;
-            }
-
-            return new SourceGeneratedFileInfo
-            {
-                ProjectGuid = document.Project.Id.Id,
-                DocumentGuid = document.Id.Id
-            };
-        }
     }
 }

src/OmniSharp.Roslyn.CSharp/Services/Navigation/GotoDefinitionService.cs

@@ -51,7 +51,7 @@ public async Task<GotoDefinitionResponse> Handle(GotoDefinitionRequest request)
                     FileName = lineSpan.Path,
                     Line = lineSpan.StartLinePosition.Line,
                     Column = lineSpan.StartLinePosition.Character,
-                    SourceGeneratedInfo = GoToDefinitionHelpers.GetSourceGeneratedFileInfo(_workspace, location)
+                    SourceGeneratedInfo = SolutionExtensions.GetSourceGeneratedFileInfo(document.Project.Solution, location)
                 };
             }
             else if (location.IsInMetadata && request.WantMetadata)

src/OmniSharp.Roslyn.CSharp/Services/Navigation/GotoDefinitionServiceV2.cs

@@ -65,7 +65,7 @@ public async Task<GotoDefinitionResponse> Handle(GotoDefinitionRequest request)
                         }
                         else
                         {
-                            sourceGeneratedFileInfo = GoToDefinitionHelpers.GetSourceGeneratedFileInfo(_workspace, location);
+                            sourceGeneratedFileInfo = SolutionExtensions.GetSourceGeneratedFileInfo(document.Project.Solution, location);
                         }
 
                         return new Definition

src/OmniSharp.Roslyn.CSharp/Services/Navigation/GotoTypeDefinitionService.cs

@@ -53,7 +53,7 @@ public async Task<GotoTypeDefinitionResponse> Handle(GotoTypeDefinitionRequest r
                         .Select(location => new TypeDefinition
                         {
                             Location = location.GetMappedLineSpan().GetLocationFromFileLinePositionSpan(),
-                            SourceGeneratedFileInfo = GoToDefinitionHelpers.GetSourceGeneratedFileInfo(_workspace, location)
+                            SourceGeneratedFileInfo = SolutionExtensions.GetSourceGeneratedFileInfo(document.Project.Solution, location)
                         })
                         .ToList()
                 };

src/OmniSharp.Roslyn/Extensions/SolutionExtensions.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.FindSymbols;
 using OmniSharp.Models;
+using OmniSharp.Models.v1.SourceGeneratedFile;
+
+#nullable enable
 
 namespace OmniSharp.Extensions
 {
@@ -67,7 +71,7 @@ private static QuickFix ConvertSymbol(Solution solution, ISymbol symbol, Locatio
             var lineSpan = location.GetLineSpan();
             var path = lineSpan.Path;
             var projects = solution.GetDocumentIdsWithFilePath(path)
-                                    .Select(documentId => solution.GetProject(documentId.ProjectId).Name)
+                                    .Select(documentId => solution.GetProject(documentId.ProjectId)!.Name)
                                     .ToArray();
 
             var format = SymbolDisplayFormat.MinimallyQualifiedFormat;
@@ -86,7 +90,25 @@ private static QuickFix ConvertSymbol(Solution solution, ISymbol symbol, Locatio
                 Column = lineSpan.StartLinePosition.Character,
                 EndLine = lineSpan.EndLinePosition.Line,
                 EndColumn = lineSpan.EndLinePosition.Character,
-                Projects = projects
+                Projects = projects,
+                ContainingSymbolName = symbol.ContainingSymbol?.Name ?? "",
+                GeneratedFileInfo = GetSourceGeneratedFileInfo(solution, location),
+            };
+        }
+
+        internal static SourceGeneratedFileInfo? GetSourceGeneratedFileInfo(Solution solution, Location location)
+        {
+            Debug.Assert(location.IsInSource);
+            var document = solution.GetDocument(location.SourceTree);
+            if (document is not SourceGeneratedDocument)
+            {
+                return null;
+            }
+
+            return new SourceGeneratedFileInfo
+            {
+                ProjectGuid = document.Project.Id.Id,
+                DocumentGuid = document.Id.Id
             };
         }
     }