Drop showMessage, use ILspClient.WindowShowMessage directly

Author: razzmatazz

src/CSharpLanguageServer/RoslynHelpers.fs

@@ -350,7 +350,6 @@ type CSharpLspHostServices () =
 let tryLoadSolutionOnPath
         (lspClient: ILspClient)
         (logger: ILog)
-        (showMessage: string -> Async<unit>)
         solutionPath =
     let progress = ProgressReporter(lspClient)
 
@@ -423,7 +422,6 @@ let tryLoadSolutionFromProjectFiles
 let findAndLoadSolutionOnDir
         (lspClient: ILspClient)
         (logger: ILog)
-        (showMessage: string -> Async<unit>)
         dir =
     async {
         let fileNotOnNodeModules (filename: string) =
@@ -436,6 +434,12 @@ let findAndLoadSolutionOnDir
             |> Seq.filter fileNotOnNodeModules
             |> Seq.toList
 
+        let showMessage m =
+            lspClient.WindowShowMessage({
+                Type = MessageType.Info
+                Message = sprintf "csharp-ls: %s" m
+            })
+
         do! showMessage (sprintf "%d solution(s) found: [%s]" solutionFiles.Length (String.Join(", ", solutionFiles)) )
 
         let singleSolutionFound =
@@ -464,23 +468,27 @@ let findAndLoadSolutionOnDir
             return! tryLoadSolutionFromProjectFiles lspClient logger showMessage projFiles
 
         | Some solutionPath ->
-            return! tryLoadSolutionOnPath lspClient logger showMessage solutionPath
+            return! tryLoadSolutionOnPath lspClient logger solutionPath
     }
 
 let loadSolutionOnSolutionPathOrDir
         (lspClient: ILspClient)
         (logger: ILog)
-        (showMessage: string -> Async<unit>)
         solutionPathMaybe
         rootPath =
     match solutionPathMaybe with
     | Some solutionPath -> async {
-        return! tryLoadSolutionOnPath lspClient logger showMessage solutionPath
+        return! tryLoadSolutionOnPath lspClient logger solutionPath
       }
 
     | None -> async {
-        do! showMessage (sprintf "attempting to find and load solution based on root path (\"%s\").." rootPath)
-        return! findAndLoadSolutionOnDir lspClient logger showMessage rootPath
+        let logMessage: ShowMessageParams = {
+            Type = MessageType.Info
+            Message = sprintf "csharp-ls: attempting to find and load solution based on root path (\"%s\").." rootPath
+        }
+
+        do! lspClient.WindowShowMessage(logMessage)
+        return! findAndLoadSolutionOnDir lspClient logger rootPath
       }
 
 let getContainingTypeOrThis (symbol: ISymbol): INamedTypeSymbol =

src/CSharpLanguageServer/State/ServerState.fs

@@ -134,13 +134,6 @@ let getDocumentForUriOfType state docType (u: string) =
     | None -> None
 
 let processServerEvent (logger: ILog) state postMsg msg : Async<ServerState> = async {
-    let showMessage m =
-        match state.LspClient with
-        | Some lspClient -> lspClient.WindowShowMessage(
-            { Type = MessageType.Info
-              Message = sprintf "csharp-ls: %s" m })
-        | None -> async.Return ()
-
     match msg with
     | SettingsChange newSettings ->
         let newState: ServerState = { state with Settings = newSettings }
@@ -272,7 +265,6 @@ let processServerEvent (logger: ILog) state postMsg msg : Async<ServerState> = a
                 loadSolutionOnSolutionPathOrDir
                     state.LspClient.Value
                     logger
-                    showMessage
                     state.Settings.SolutionPath
                     state.RootPath