consolidate to use new TryGetSymbolUses

ionide · Jul 1, 2023 · 7fc82db · 7fc82db
1 parent caca858
commit 7fc82db
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 157 deletions.
diff --git a/src/FsAutoComplete.Core/Commands.fs b/src/FsAutoComplete.Core/Commands.fs
@@ -943,38 +943,6 @@ module Commands =
   ///     * When exact ranges are required
   ///       -> for "Rename"
   let symbolUseWorkspace
-    (getDeclarationLocation: FSharpSymbolUse * NamedText -> Async<SymbolDeclarationLocation option>)
-    (findReferencesForSymbolInFile: (string<LocalPath> * FSharpProjectOptions * FSharpSymbol) -> Async<Range seq>)
-    (tryGetFileSource: string<LocalPath> -> Async<ResultOrString<NamedText>>)
-    (tryGetProjectOptionsForFsproj: string<LocalPath> -> Async<FSharpProjectOptions option>)
-    (getAllProjectOptions: unit -> Async<FSharpProjectOptions seq>)
-    (includeDeclarations: bool)
-    (includeBackticks: bool)
-    (errorOnFailureToFixRange: bool)
-    pos
-    lineStr
-    (text: NamedText)
-    (tyRes: ParseAndCheckResults)
-    : Async<Result<(FSharpSymbol * IDictionary<string<LocalPath>, Range[]>), string>> =
-    asyncResult {
-      let! symbolUse = tyRes.TryGetSymbolUse pos lineStr |> Result.ofOption (fun _ -> "No symbol")
-
-      return!
-        symbolUseWorkspaceAux
-          getDeclarationLocation
-          findReferencesForSymbolInFile
-          tryGetFileSource
-          tryGetProjectOptionsForFsproj
-          getAllProjectOptions
-          includeDeclarations
-          includeBackticks
-          errorOnFailureToFixRange
-          text
-          tyRes
-          symbolUse
-    }
-
-  let symbolUseWorkspace2
     (getDeclarationLocation: FSharpSymbolUse * NamedText -> Async<SymbolDeclarationLocation option>)
     (findReferencesForSymbolInFile: (string<LocalPath> * FSharpProjectOptions * FSharpSymbol) -> Async<Range seq>)
     (tryGetFileSource: string<LocalPath> -> Async<ResultOrString<NamedText>>)
@@ -2291,61 +2259,6 @@ type Commands(checker: FSharpCompilerServiceChecker, state: State, hasAnalyzers:
           tyRes
     }
 
-  member x.SymbolUseWorkspace2
-    (
-      pos,
-      lineStr,
-      text: NamedText,
-      tyRes: ParseAndCheckResults,
-      includeDeclarations: bool,
-      includeBackticks: bool,
-      errorOnFailureToFixRange: bool
-    ) =
-    asyncResult {
-      let findReferencesForSymbolInFile (file: string<LocalPath>, project, symbol) =
-        if File.Exists(UMX.untag file) then
-          // `FSharpChecker.FindBackgroundReferencesInFile` only works with existing files
-          checker.FindReferencesForSymbolInFile(UMX.untag file, project, symbol)
-        else
-          // untitled script files
-          async {
-            match state.TryGetFileCheckerOptionsWithLines(file) with
-            | Error _ -> return [||]
-            | Ok(opts, source) ->
-              match checker.TryGetRecentCheckResultsForFile(file, opts, source) with
-              | None -> return [||]
-              | Some tyRes ->
-                let! ct = Async.CancellationToken
-                let usages = tyRes.GetCheckResults.GetUsesOfSymbolInFile(symbol, ct)
-                return usages |> Seq.map (fun u -> u.Range)
-          }
-
-      let tryGetFileSource symbolFile =
-        state.TryGetFileSource symbolFile |> Async.singleton
-
-      let tryGetProjectOptionsForFsproj (fsprojPath: string<LocalPath>) =
-        state.ProjectController.GetProjectOptionsForFsproj(UMX.untag fsprojPath)
-        |> Async.singleton
-
-      let getAllProjectOptions () =
-        state.ProjectController.ProjectOptions |> Seq.map snd |> Async.singleton
-
-      return!
-        Commands.symbolUseWorkspace2
-          x.GetDeclarationLocation
-          findReferencesForSymbolInFile
-          tryGetFileSource
-          tryGetProjectOptionsForFsproj
-          getAllProjectOptions
-          includeDeclarations
-          includeBackticks
-          errorOnFailureToFixRange
-          pos
-          lineStr
-          text
-          tyRes
-    }
-
   member x.RenameSymbolRange(pos: Position, tyRes: ParseAndCheckResults, lineStr: LineStr, text: NamedText) =
     Commands.renameSymbolRange x.GetDeclarationLocation false pos lineStr text tyRes
 
@@ -2355,7 +2268,7 @@ type Commands(checker: FSharpCompilerServiceChecker, state: State, hasAnalyzers:
       // safety check: rename valid?
       let! _ = x.RenameSymbolRange(pos, tyRes, lineStr, text)
 
-      let! (_, usages) = x.SymbolUseWorkspace(pos, lineStr, text, tyRes, true, true, true)
+      let! usages = x.SymbolUseWorkspace(pos, lineStr, text, tyRes, true, true, true)
       return usages
     }
 

diff --git a/src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs b/src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs
@@ -1542,49 +1542,6 @@ type AdaptiveFSharpLspServer(workspaceLoader: IWorkspaceLoader, lspClient: FShar
       text
       tyRes
 
-  let symbolUseWorkspace2
-    (includeDeclarations: bool)
-    (includeBackticks: bool)
-    (errorOnFailureToFixRange: bool)
-    pos
-    lineStr
-    text
-    tyRes
-    =
-    let findReferencesForSymbolInFile (file: string<LocalPath>, project, symbol) =
-      async {
-        let checker = checker |> AVal.force
-
-        if File.Exists(UMX.untag file) then
-          // `FSharpChecker.FindBackgroundReferencesInFile` only works with existing files
-          return! checker.FindReferencesForSymbolInFile(UMX.untag file, project, symbol)
-        else
-          // untitled script files
-          match! forceGetTypeCheckResultsStale file with
-          | Error _ -> return [||]
-          | Ok tyRes ->
-            let! ct = Async.CancellationToken
-            let usages = tyRes.GetCheckResults.GetUsesOfSymbolInFile(symbol, ct)
-            return usages |> Seq.map (fun u -> u.Range)
-      }
-
-    let tryGetProjectOptionsForFsproj (file: string<LocalPath>) =
-      forceGetProjectOptions file |> Async.map Option.ofResult
-
-    Commands.symbolUseWorkspace2
-      getDeclarationLocation
-      findReferencesForSymbolInFile
-      forceFindSourceText
-      tryGetProjectOptionsForFsproj
-      (getAllProjectOptions >> Async.map Array.toSeq)
-      includeDeclarations
-      includeBackticks
-      errorOnFailureToFixRange
-      pos
-      lineStr
-      text
-      tyRes
-
   let codefixes =
     let getFileLines = forceFindSourceText
 
@@ -1709,7 +1666,7 @@ type AdaptiveFSharpLspServer(workspaceLoader: IWorkspaceLoader, lspClient: FShar
          GenerateXmlDocumentation.fix tryGetParseResultsForFile
          Run.ifEnabled
            (fun _ -> config.AddPrivateAccessModifier)
-           (AddPrivateAccessModifier.fix tryGetParseResultsForFile symbolUseWorkspace2)
+           (AddPrivateAccessModifier.fix tryGetParseResultsForFile symbolUseWorkspace)
          UseTripleQuotedInterpolation.fix tryGetParseResultsForFile getRangeText
          RenameParamToMatchSignature.fix tryGetParseResultsForFile |])
 
@@ -2753,7 +2710,7 @@ type AdaptiveFSharpLspServer(workspaceLoader: IWorkspaceLoader, lspClient: FShar
             Commands.renameSymbolRange getDeclarationLocation false pos lineStr namedText.Lines tyRes
             |> AsyncResult.mapError (fun msg -> JsonRpc.Error.Create(JsonRpc.ErrorCodes.invalidParams, msg))
 
-          let! (_, ranges) =
+          let! ranges =
             symbolUseWorkspace true true true pos lineStr namedText.Lines tyRes
             |> AsyncResult.mapError (fun msg -> JsonRpc.Error.Create(JsonRpc.ErrorCodes.invalidParams, msg))
 
@@ -2874,7 +2831,7 @@ type AdaptiveFSharpLspServer(workspaceLoader: IWorkspaceLoader, lspClient: FShar
           let! lineStr = tryGetLineStr pos namedText.Lines |> Result.ofStringErr
           and! tyRes = forceGetTypeCheckResults filePath |> AsyncResult.ofStringErr
 
-          let! (_, usages) =
+          let! usages =
             symbolUseWorkspace true true false pos lineStr namedText.Lines tyRes
             |> AsyncResult.mapError (JsonRpc.Error.InternalErrorMessage)
 
@@ -3408,7 +3365,7 @@ type AdaptiveFSharpLspServer(workspaceLoader: IWorkspaceLoader, lspClient: FShar
                                 Arguments = None } }
                   )
 
-              | Ok(_, uses) ->
+              | Ok uses ->
                 let allUses = uses.Values |> Array.concat
 
                 let cmd =

diff --git a/src/FsAutoComplete/LspServers/FsAutoComplete.Lsp.fs b/src/FsAutoComplete/LspServers/FsAutoComplete.Lsp.fs
@@ -1164,25 +1164,6 @@ type FSharpLspServer(state: State, lspClient: FSharpLspClient) =
             errorOnFailureToFixRange
           )
 
-        let symbolUseWorkspace2
-          (includeDeclarations: bool)
-          (includeBackticks: bool)
-          (errorOnFailureToFixRange: bool)
-          pos
-          lineStr
-          text
-          tyRes
-          =
-          commands.SymbolUseWorkspace2(
-            pos,
-            lineStr,
-            text,
-            tyRes,
-            includeDeclarations,
-            includeBackticks,
-            errorOnFailureToFixRange
-          )
-
         codefixes <-
           [| Run.ifEnabled (fun _ -> config.UnusedOpensAnalyzer) (RemoveUnusedOpens.fix getFileLines)
              Run.ifEnabled
@@ -1243,7 +1224,7 @@ type FSharpLspServer(state: State, lspClient: FSharpLspClient) =
              GenerateXmlDocumentation.fix tryGetParseResultsForFile
              Run.ifEnabled
                (fun _ -> config.AddPrivateAccessModifier)
-               (AddPrivateAccessModifier.fix tryGetParseResultsForFile symbolUseWorkspace2)
+               (AddPrivateAccessModifier.fix tryGetParseResultsForFile symbolUseWorkspace)
              UseTripleQuotedInterpolation.fix tryGetParseResultsForFile getRangeText
              RenameParamToMatchSignature.fix tryGetParseResultsForFile |]
 
@@ -1758,7 +1739,7 @@ type FSharpLspServer(state: State, lspClient: FSharpLspClient) =
       p
       |> x.positionHandler (fun p pos tyRes lineStr lines ->
         asyncResult {
-          let! (_, usages) =
+          let! usages =
             commands.SymbolUseWorkspace(pos, lineStr, lines, tyRes, true, true, false)
             |> AsyncResult.mapError (JsonRpc.Error.InternalErrorMessage)
 
@@ -2130,7 +2111,7 @@ type FSharpLspServer(state: State, lspClient: FSharpLspClient) =
                                 Arguments = None } }
                   )
 
-              | Ok(_, uses) ->
+              | Ok uses ->
                 let allUses = uses.Values |> Array.concat
 
                 let cmd =