chore(Lsp.Workspace): make project arg non-optional for workspaceFolderSymbolLocations

Author: razzmatazz

src/CSharpLanguageServer/Handlers/CallHierarchy.fs

@@ -29,8 +29,8 @@ module CallHierarchy =
         : AsyncLspResult<CallHierarchyItem[] option> =
         async {
             match! workspaceDocumentSymbol context.Workspace AnyDocument p.TextDocument.Uri p.Position with
-            | Some wf, Some(symbol, _, _) when isCallableSymbol symbol ->
-                let! locations, updatedWf = workspaceFolderSymbolLocations symbol None wf
+            | Some wf, Some(symbol, project, _) when isCallableSymbol symbol ->
+                let! locations, updatedWf = workspaceFolderSymbolLocations symbol project wf
 
                 context.Emit(WorkspaceFolderChange updatedWf)
 

src/CSharpLanguageServer/Handlers/Definition.fs

@@ -18,7 +18,7 @@ module Definition =
         async {
             match! workspaceDocumentSymbol context.Workspace AnyDocument p.TextDocument.Uri p.Position with
             | Some wf, Some(symbol, project, _) ->
-                let! locations, updatedWf = workspaceFolderSymbolLocations symbol (Some project) wf
+                let! locations, updatedWf = workspaceFolderSymbolLocations symbol project wf
 
                 context.Emit(WorkspaceFolderChange updatedWf)
 

src/CSharpLanguageServer/Handlers/Implementation.fs

@@ -15,7 +15,7 @@ module Implementation =
     let provider (_cc: ClientCapabilities) : U3<bool, ImplementationOptions, ImplementationRegistrationOptions> option =
         Some(U3.C1 true)
 
-    let findImplLocationsOfSymbol wf (sym: ISymbol) = async {
+    let findImplLocationsOfSymbol wf project (sym: ISymbol) = async {
         let! ct = Async.CancellationToken
 
         let! impls =
@@ -27,7 +27,7 @@ module Implementation =
         let locations = System.Collections.Generic.List<Location>()
 
         for i in impls do
-            let! implLocations, wf = workspaceFolderSymbolLocations i None updatedWf
+            let! implLocations, wf = workspaceFolderSymbolLocations i project updatedWf
 
             locations.AddRange(implLocations)
             updatedWf <- wf
@@ -43,8 +43,8 @@ module Implementation =
             let! wf, symInfo = workspaceDocumentSymbol context.Workspace AnyDocument p.TextDocument.Uri p.Position
 
             match wf, symInfo with
-            | Some wf, Some(sym, _, _) ->
-                let! impls, updatedWf = findImplLocationsOfSymbol wf sym
+            | Some wf, Some(sym, project, _) ->
+                let! impls, updatedWf = findImplLocationsOfSymbol wf project sym
                 context.Emit(WorkspaceFolderChange updatedWf)
 
                 return impls |> Declaration.C2 |> U2.C1 |> Some |> LspResult.success

src/CSharpLanguageServer/Handlers/TypeDefinition.fs

@@ -34,7 +34,7 @@ module TypeDefinition =
                     match typeSymbol with
                     | None -> async.Return([], wf)
                     | Some symbol -> async {
-                        let! aggregatedLspLocations, updatedWf = workspaceFolderSymbolLocations symbol (Some project) wf
+                        let! aggregatedLspLocations, updatedWf = workspaceFolderSymbolLocations symbol project wf
 
                         context.Emit(WorkspaceFolderChange updatedWf)
                         return (aggregatedLspLocations, updatedWf)

src/CSharpLanguageServer/Handlers/TypeHierarchy.fs

@@ -28,7 +28,7 @@ module TypeHierarchy =
         async {
             match! workspaceDocumentSymbol context.Workspace AnyDocument p.TextDocument.Uri p.Position with
             | Some wf, Some(symbol, project, _) when isTypeSymbol symbol ->
-                let! symLocations, updatedWf = workspaceFolderSymbolLocations symbol (Some project) wf
+                let! symLocations, updatedWf = workspaceFolderSymbolLocations symbol project wf
 
                 context.Emit(WorkspaceFolderChange updatedWf)
 
@@ -64,7 +64,7 @@ module TypeHierarchy =
                 let mutable updatedWf = wf
 
                 for typeSym in supertypes do
-                    let! locations, wf = workspaceFolderSymbolLocations typeSym (Some project) updatedWf
+                    let! locations, wf = workspaceFolderSymbolLocations typeSym project updatedWf
 
                     let typeSymItems =
                         locations |> Seq.map (TypeHierarchyItem.fromSymbolAndLocation typeSym)
@@ -120,7 +120,7 @@ module TypeHierarchy =
                 let mutable updatedWf = wf
 
                 for typeSym in subtypes do
-                    let! locations, wf = workspaceFolderSymbolLocations typeSym (Some project) updatedWf
+                    let! locations, wf = workspaceFolderSymbolLocations typeSym project updatedWf
 
                     let typeSymItems =
                         locations |> Seq.map (TypeHierarchyItem.fromSymbolAndLocation typeSym)

src/CSharpLanguageServer/Lsp/Workspace.fs

@@ -41,18 +41,19 @@ type LspWorkspaceDocumentType =
     | AnyDocument
 
 let workspaceFolderResolveSymbolLocation
-    (project: Microsoft.CodeAnalysis.Project option)
-    sym
+    (project: Microsoft.CodeAnalysis.Project)
+    (symbol: Microsoft.CodeAnalysis.ISymbol)
     (l: Microsoft.CodeAnalysis.Location)
     (folder: LspWorkspaceFolder)
     =
     async {
-        match l.IsInMetadata, l.IsInSource, project with
-        | true, _, Some project ->
+        match l.IsInMetadata, l.IsInSource with
+        | true, _ ->
             let! ct = Async.CancellationToken
             let! compilation = project.GetCompilationAsync(ct) |> Async.AwaitTask
 
-            let fullName = sym |> symbolGetContainingTypeOrThis |> symbolGetFullReflectionName
+            let fullName =
+                symbol |> symbolGetContainingTypeOrThis |> symbolGetFullReflectionName
 
             let containingAssemblyName =
                 l.MetadataModule |> nonNull "l.MetadataModule" |> _.ContainingAssembly.Name
@@ -85,7 +86,7 @@ let workspaceFolderResolveSymbolLocation
             // figure out location on the document (approx implementation)
             let! syntaxTree = mdDocument.GetSyntaxTreeAsync(ct) |> Async.AwaitTask
 
-            let collector = DocumentSymbolCollectorForMatchingSymbolName(uri, sym)
+            let collector = DocumentSymbolCollectorForMatchingSymbolName(uri, symbol)
             let! root = syntaxTree.GetRootAsync(ct) |> Async.AwaitTask
             collector.Visit(root)
 
@@ -100,20 +101,20 @@ let workspaceFolderResolveSymbolLocation
                 | [] -> [ fallbackLocationInMetadata ], folder
                 | ls -> ls, folder
 
-        | false, true, _ ->
+        | false, true ->
             return
                 match (Location.fromRoslynLocation l) with
                 | Some loc -> [ loc ], folder
                 | None -> [], folder
 
-        | _, _, _ -> return [], folder
+        | _, _ -> return [], folder
     }
 
 /// The process of retrieving locations may update LspWorkspaceFolder itself,
 /// thus return value is a pair of symbol location list * LspWorkspaceFolder
 let workspaceFolderSymbolLocations
     (symbol: Microsoft.CodeAnalysis.ISymbol)
-    (project: Microsoft.CodeAnalysis.Project option)
+    (project: Microsoft.CodeAnalysis.Project)
     folder
     =
     async {