Fix: Rename fails when declaration or usage in not-loaded files

Incorporated from [fix](https://github.com/fsharp/FsAutoComplete/pull/1053/files#diff-febb2875fef94d7a7c78c5c23943057bc820a1f6b672f7357aee2502b51806e0R1004-R1013) in ionide#1053 (see ionide#1037 (comment)) Co-authored-by: Jimmy Byrd <[email protected]>
Booksbaum · Feb 15, 2023 · 03a3cb5 · 03a3cb5
1 parent 0a5a058
commit 03a3cb5
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs b/src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs
@@ -870,9 +870,15 @@ type AdaptiveFSharpLspServer(workspaceLoader: IWorkspaceLoader, lspClient: FShar
       })
 
   let getProjectOptionsForFile (filePath: string<LocalPath>) =
-    openFilesToChangesAndProjectOptions
-    |> AMap.tryFindA filePath
-    |> AVal.map (Option.map snd >> Option.defaultValue [])
+    aval {
+      match! sourceFileToProjectOptions |> AMap.tryFind filePath with
+      | None ->
+        // openFilesToChangesAndProjectOptions contains script files that we may need to look through
+        match! openFilesToChangesAndProjectOptions |> AMap.tryFindA filePath with
+        | None -> return []
+        | Some (_, projs) -> return projs
+      | Some projs -> return projs
+    }
 
   let autoCompleteItems: cmap<DeclName, DeclarationListItem * Position * string<LocalPath> * (Position -> option<string>) * FSharp.Compiler.Syntax.ParsedInput> =
     cmap ()