fix: Find sln/csproj from rootUri/rootPath

Signed-off-by: Adam Tao <[email protected]>
tcx4c70 · Aug 24, 2023 · 8bc48b9 · 8bc48b9
1 parent fa38981
commit 8bc48b9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/CSharpLanguageServer/RoslynHelpers.fs b/src/CSharpLanguageServer/RoslynHelpers.fs
@@ -1028,16 +1028,15 @@ let findAndLoadSolutionOnDir (logMessage: AsyncLogFn) dir = async {
         return solution
 }
 
-let loadSolutionOnSolutionPathOrCwd (logMessage: AsyncLogFn) solutionPathMaybe =
+let loadSolutionOnSolutionPathOrDir (logMessage: AsyncLogFn) solutionPathMaybe rootPath =
     match solutionPathMaybe with
     | Some solutionPath -> async {
         return! tryLoadSolutionOnPath logMessage solutionPath
       }
 
     | None -> async {
-        let cwd = Directory.GetCurrentDirectory()
-        do! logMessage (sprintf "attempting to find and load solution based on cwd (\"%s\").." cwd)
-        return! findAndLoadSolutionOnDir logMessage cwd
+        do! logMessage (sprintf "attempting to find and load solution based on root path (\"%s\").." rootPath)
+        return! findAndLoadSolutionOnDir logMessage rootPath
       }
 
 let getRoslynCodeActions (logMessage: AsyncLogFn) (doc: Document) (textSpan: TextSpan)

diff --git a/src/CSharpLanguageServer/Server.fs b/src/CSharpLanguageServer/Server.fs
@@ -199,6 +199,13 @@ let setupServerHandlers settings (lspClient: LspClient) =
 
       scope.Emit(ClientCapabilityChange p.Capabilities)
 
+      let rootPath =
+          p.RootUri
+          |> Option.map (fun uri -> Uri.UnescapeDataString(Uri(uri.Replace("%3a", ":", true, null)).LocalPath))
+          |> Option.orElse p.RootPath
+          |> Option.defaultValue (Directory.GetCurrentDirectory())
+      scope.Emit(RootPathChange rootPath)
+
       // setup timer so actors get period ticks
       setupTimer ()
 

diff --git a/src/CSharpLanguageServer/State.fs b/src/CSharpLanguageServer/State.fs
@@ -1,6 +1,7 @@
 module CSharpLanguageServer.State
 
 open System
+open System.IO
 open System.Threading
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.FindSymbols
@@ -41,6 +42,7 @@ type ServerRequest = {
 }
 and ServerState = {
     Settings: ServerSettings
+    RootPath: string
     ClientCapabilities: ClientCapabilities option
     Solution: Solution option
     OpenDocVersions: Map<string, int>
@@ -82,6 +84,7 @@ let pullNextRequestMaybe requestQueue =
         (Some nextRequest, queueRemainder)
 
 let emptyServerState = { Settings = emptySettings
+                         RootPath = Directory.GetCurrentDirectory()
                          ClientCapabilities = None
                          Solution = None
                          OpenDocVersions = Map.empty
@@ -98,6 +101,7 @@ type ServerDocumentType =
 
 type ServerStateEvent =
     | SettingsChange of ServerSettings
+    | RootPathChange of string
     | ClientCapabilityChange of ClientCapabilities option
     | SolutionChange of Solution
     | DecompiledMetadataAdd of string * DecompiledMetadataDocument
@@ -214,6 +218,9 @@ let processServerEvent (logMessage: AsyncLogFn) state postMsg msg: Async<ServerS
 
                     newState
 
+    | RootPathChange rootPath ->
+        return { state with RootPath = rootPath }
+
     | ClientCapabilityChange cc ->
         return { state with ClientCapabilities = cc }
 
@@ -251,7 +258,7 @@ let processServerEvent (logMessage: AsyncLogFn) state postMsg msg: Async<ServerS
 
         match solutionReloadTime < DateTime.Now with
         | true ->
-            let! newSolution = loadSolutionOnSolutionPathOrCwd logMessage state.Settings.SolutionPath
+            let! newSolution = loadSolutionOnSolutionPathOrDir logMessage state.Settings.SolutionPath state.RootPath
 
             return { state with Solution = newSolution
                                 SolutionReloadPending = None }