chore(ServerRequestContext): drop ServerRequestContext.FindSymbol

Author: razzmatazz

src/CSharpLanguageServer/Handlers/CallHierarchy.fs

@@ -29,7 +29,7 @@ module CallHierarchy =
         : AsyncLspResult<CallHierarchyItem[] option> =
         async {
             match! context.FindSymbol p.TextDocument.Uri p.Position with
-            | Some(wf), Some(symbol) when isCallableSymbol symbol ->
+            | Some(wf), Some(symbol, _, _) when isCallableSymbol symbol ->
                 let! itemList = CallHierarchyItem.fromSymbol context.ResolveSymbolLocations symbol
                 return itemList |> List.toArray |> Some |> LspResult.success
             | _ -> return None |> LspResult.success
@@ -55,7 +55,7 @@ module CallHierarchy =
                       FromRanges = fromRanges })
 
             match! context.FindSymbol p.Item.Uri p.Item.Range.Start with
-            | Some(wf), Some(symbol) ->
+            | Some(wf), Some(symbol, _, _) ->
                 let! callers =
                     SymbolFinder.FindCallersAsync(symbol, wf.Solution.Value, cancellationToken = ct)
                     |> Async.AwaitTask

src/CSharpLanguageServer/Handlers/CodeLens.fs

@@ -132,7 +132,7 @@ module CodeLens =
             |> Option.defaultValue CodeLensData.Default
 
         match! context.FindSymbol lensData.DocumentUri lensData.Position with
-        | Some wf, Some symbol ->
+        | Some wf, Some(symbol, _, _) ->
             let! refs =
                 SymbolFinder.FindReferencesAsync(symbol, wf.Solution.Value, cancellationToken = ct)
                 |> Async.AwaitTask

src/CSharpLanguageServer/Handlers/Definition.fs

@@ -16,7 +16,7 @@ module Definition =
         (p: DefinitionParams)
         : Async<LspResult<U2<Definition, DefinitionLink array> option>> =
         async {
-            match! context.FindSymbol' p.TextDocument.Uri p.Position with
+            match! context.FindSymbol p.TextDocument.Uri p.Position with
             | Some wf, Some(symbol, project, _) ->
                 let! locations, updatedWf = workspaceFolderSymbolLocations symbol (Some project) wf
 

src/CSharpLanguageServer/Handlers/DocumentHighlight.fs

@@ -56,7 +56,7 @@ module DocumentHighlight =
                           Kind = Some DocumentHighlightKind.Read })
             }
 
-            match! context.FindSymbol' p.TextDocument.Uri p.Position with
+            match! context.FindSymbol p.TextDocument.Uri p.Position with
             | Some wf, Some(symbol, _, Some doc) ->
                 if shouldHighlight symbol then
                     let! highlights = getHighlights symbol doc

src/CSharpLanguageServer/Handlers/Hover.fs

@@ -24,9 +24,9 @@ module Hover =
         hover |> Some
 
     let handle (context: ServerRequestContext) (p: HoverParams) : AsyncLspResult<Hover option> = async {
-        let! wf, sym = context.FindSymbol p.TextDocument.Uri p.Position
+        let! wf, symInfo = context.FindSymbol p.TextDocument.Uri p.Position
 
-        match sym with
-        | Some sym -> return makeHoverForSymbol sym |> LspResult.success
+        match symInfo with
+        | Some(sym, _, _) -> return makeHoverForSymbol sym |> LspResult.success
         | None -> return None |> LspResult.success
     }

src/CSharpLanguageServer/Handlers/Implementation.fs

@@ -34,10 +34,10 @@ module Implementation =
                 return locations |> Array.collect List.toArray |> Declaration.C2 |> U2.C1 |> Some
             }
 
-            let! wf, sym = context.FindSymbol p.TextDocument.Uri p.Position
+            let! wf, symInfo = context.FindSymbol p.TextDocument.Uri p.Position
 
-            match wf, sym with
-            | Some wf, Some sym ->
+            match wf, symInfo with
+            | Some wf, Some(sym, _, _) ->
                 let! impls = findImplementationsOfSymbol wf.Solution.Value sym
                 return impls |> LspResult.success
 

src/CSharpLanguageServer/Handlers/References.fs

@@ -17,7 +17,7 @@ module References =
         let! ct = Async.CancellationToken
 
         match! context.FindSymbol p.TextDocument.Uri p.Position with
-        | Some wf, Some symbol ->
+        | Some wf, Some(symbol, _, _) ->
             let! refs =
                 SymbolFinder.FindReferencesAsync(symbol, wf.Solution.Value, cancellationToken = ct)
                 |> Async.AwaitTask

src/CSharpLanguageServer/Handlers/Rename.fs

@@ -148,7 +148,7 @@ module Rename =
     }
 
     let handle (context: ServerRequestContext) (p: RenameParams) : AsyncLspResult<WorkspaceEdit option> = async {
-        match! context.FindSymbol' p.TextDocument.Uri p.Position with
+        match! context.FindSymbol p.TextDocument.Uri p.Position with
         | Some wf, Some(symbol, project, _) ->
             let! ct = Async.CancellationToken
             let originalSolution = project.Solution

src/CSharpLanguageServer/Handlers/TypeDefinition.fs

@@ -20,7 +20,7 @@ module TypeDefinition =
         : Async<LspResult<U2<Definition, DefinitionLink array> option>> =
 
         async {
-            match! context.FindSymbol' p.TextDocument.Uri p.Position with
+            match! context.FindSymbol p.TextDocument.Uri p.Position with
             | Some wf, Some(symbol, project, _) ->
                 let typeSymbol =
                     match symbol with

src/CSharpLanguageServer/Handlers/TypeHierarchy.fs

@@ -25,7 +25,7 @@ module TypeHierarchy =
         : AsyncLspResult<TypeHierarchyItem[] option> =
         async {
             match! context.FindSymbol p.TextDocument.Uri p.Position with
-            | Some wf, Some symbol when isTypeSymbol symbol ->
+            | Some wf, Some(symbol, _, _) when isTypeSymbol symbol ->
                 let! itemList = TypeHierarchyItem.fromSymbol context.ResolveSymbolLocations symbol
                 return itemList |> List.toArray |> Some |> LspResult.success
 
@@ -38,7 +38,7 @@ module TypeHierarchy =
         : AsyncLspResult<TypeHierarchyItem[] option> =
         async {
             match! context.FindSymbol p.Item.Uri p.Item.Range.Start with
-            | Some wf, Some symbol when isTypeSymbol symbol ->
+            | Some wf, Some(symbol, _, _) when isTypeSymbol symbol ->
                 let typeSymbol = symbol :?> INamedTypeSymbol
 
                 let baseType =
@@ -68,7 +68,7 @@ module TypeHierarchy =
             let! ct = Async.CancellationToken
 
             match! context.FindSymbol p.Item.Uri p.Item.Range.Start with
-            | Some wf, Some symbol when isTypeSymbol symbol ->
+            | Some wf, Some(symbol, _, _) when isTypeSymbol symbol ->
                 let typeSymbol = symbol :?> INamedTypeSymbol
                 // We only want immediately derived classes/interfaces/implementations here (we only need
                 // subclasses not subclasses' subclasses)