Declarations only required ParseResults (#1150)

ionide · Jul 28, 2023 · 72103b5 · 72103b5
1 parent f97f9de
commit 72103b5
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs b/src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs
@@ -1453,16 +1453,14 @@ type AdaptiveFSharpLspServer
     |> AsyncAVal.forceAsync
 
 
-  let openFilesToCheckedDeclarations =
-    openFilesToCheckedFilesResults
-    |> AMap.map (fun k v ->
-      v
-      |> AsyncAVal.mapOption (fun c _ -> c.GetParseResults.GetNavigationItems().Declarations))
+  let openFilesToDeclarations =
+    openFilesToParsedResults
+    |> AMap.map (fun k v -> v |> AsyncAVal.mapOption (fun p _ -> p.GetNavigationItems().Declarations))
 
-  let getAllDeclarations () =
+  let getAllOpenDeclarations () =
     async {
       let! results =
-        openFilesToCheckedDeclarations
+        openFilesToDeclarations
         |> AMap.force
         |> HashMap.toArray
         |> Array.map (fun (k, v) ->
@@ -1477,7 +1475,7 @@ type AdaptiveFSharpLspServer
     }
 
   let getDeclarations filename =
-    openFilesToCheckedDeclarations |> AMapAsync.tryFindAndFlatten filename
+    openFilesToDeclarations |> AMapAsync.tryFindAndFlatten filename
 
   let getFilePathAndPosition (p: ITextDocumentPositionParams) =
     let filePath = p.GetFilePath() |> Utils.normalizePath
@@ -3198,7 +3196,7 @@ type AdaptiveFSharpLspServer
 
           let glyphToSymbolKind = glyphToSymbolKind |> AVal.force
 
-          let! decls = getAllDeclarations ()
+          let! decls = getAllOpenDeclarations ()
 
           let res =
             decls