Extract solution functions to CSharpLanguageServer.Roslyn.Solution

Author: razzmatazz

src/CSharpLanguageServer/CSharpLanguageServer.fsproj

@@ -28,6 +28,7 @@
     <Compile Include="FormatUtil.fs" />
     <Compile Include="ProgressReporter.fs" />
     <Compile Include="Roslyn/WorkspaceServices.fs" />
+    <Compile Include="Roslyn/Solution.fs" />
     <Compile Include="RoslynHelpers.fs" />
     <Compile Include="DocumentationUtil.fs" />
     <Compile Include="Diagnostics.fs" />

src/CSharpLanguageServer/Diagnostics.fs

@@ -8,7 +8,7 @@ open Ionide.LanguageServerProtocol.JsonRpc
 
 open CSharpLanguageServer.Types
 open CSharpLanguageServer.Logging
-open CSharpLanguageServer.RoslynHelpers
+open CSharpLanguageServer.Roslyn.Solution
 
 module Diagnostics =
     let private logger = Logging.getLoggerByName "Diagnostics"
@@ -58,13 +58,13 @@ module Diagnostics =
     let diagnose (settings: ServerSettings) : Async<int> = async {
         logger.LogDebug("diagnose: settings={settings}", settings)
 
-        initializeMSBuild logger
+        initializeMSBuild ()
 
         logger.LogDebug("diagnose: loading solution..")
 
         let lspClient = new LspClientStub()
         let cwd = string (Directory.GetCurrentDirectory())
-        let! _sln = loadSolutionOnSolutionPathOrDir lspClient logger None cwd
+        let! _sln = solutionLoadSolutionWithPathOrOnCwd lspClient None cwd
 
         logger.LogDebug("diagnose: done")
 

src/CSharpLanguageServer/Handlers/Initialization.fs

@@ -14,7 +14,8 @@ open CSharpLanguageServer.State
 open CSharpLanguageServer.State.ServerState
 open CSharpLanguageServer.Types
 open CSharpLanguageServer.Logging
-open CSharpLanguageServer.RoslynHelpers
+open CSharpLanguageServer.Roslyn.Solution
+
 
 [<RequireQualifiedAccess>]
 module Initialization =
@@ -53,7 +54,7 @@ module Initialization =
                         serverName
                 )
 
-            initializeMSBuild logger
+            initializeMSBuild ()
 
             logger.LogDebug("handleInitialize: p.Capabilities={caps}", serialize p.Capabilities)
             context.Emit(ClientCapabilityChange p.Capabilities)

src/CSharpLanguageServer/Handlers/TextDocumentSync.fs

@@ -11,6 +11,7 @@ open CSharpLanguageServer.Conversions
 open CSharpLanguageServer.State
 open CSharpLanguageServer.State.ServerState
 open CSharpLanguageServer.RoslynHelpers
+open CSharpLanguageServer.Roslyn.Solution
 open CSharpLanguageServer.Logging
 
 [<RequireQualifiedAccess>]
@@ -66,7 +67,7 @@ module TextDocumentSync =
             match docFilePathMaybe with
             | Some docFilePath -> async {
                 // ok, this document is not in solution, register a new document
-                let! newDocMaybe = tryAddDocument logger docFilePath openParams.TextDocument.Text context.Solution
+                let! newDocMaybe = solutionTryAddDocument docFilePath openParams.TextDocument.Text context.Solution
 
                 match newDocMaybe with
                 | Some newDoc ->
@@ -130,7 +131,7 @@ module TextDocumentSync =
 
         | None -> async {
             let docFilePath = Util.parseFileUri saveParams.TextDocument.Uri
-            let! newDocMaybe = tryAddDocument logger docFilePath saveParams.Text.Value context.Solution
+            let! newDocMaybe = solutionTryAddDocument docFilePath saveParams.Text.Value context.Solution
 
             match newDocMaybe with
             | Some newDoc ->

src/CSharpLanguageServer/Handlers/Workspace.fs

@@ -12,6 +12,7 @@ open CSharpLanguageServer
 open CSharpLanguageServer.State
 open CSharpLanguageServer.State.ServerState
 open CSharpLanguageServer.RoslynHelpers
+open CSharpLanguageServer.Roslyn.Solution
 open CSharpLanguageServer.Logging
 open CSharpLanguageServer.Types
 
@@ -61,7 +62,7 @@ module Workspace =
             | Some docFilePath ->
                 // ok, this document is not on solution, register a new one
                 let fileText = docFilePath |> File.ReadAllText
-                let! newDocMaybe = tryAddDocument logger docFilePath fileText context.Solution
+                let! newDocMaybe = solutionTryAddDocument docFilePath fileText context.Solution
 
                 match newDocMaybe with
                 | Some newDoc -> context.Emit(SolutionChange newDoc.Project.Solution)