codebase?

Author: razzmatazz

src/CSharpLanguageServer/CSharpLanguageServer.fsproj

@@ -30,10 +30,11 @@
     <Compile Include="Roslyn/Document.fs" />
     <Compile Include="Roslyn/Symbol.fs" />
     <Compile Include="DocumentationUtil.fs" />
-    <Compile Include="Diagnostics.fs" />
     <Compile Include="Lsp/Client.fs" />
+    <Compile Include="State/Codebase.fs" />
     <Compile Include="State/ServerState.fs" />
     <Compile Include="State/ServerRequestContext.fs" />
+    <Compile Include="Diagnostics.fs" />
     <Compile Include="Handlers/CSharpMetadata.fs" />
     <Compile Include="Handlers/CallHierarchy.fs" />
     <Compile Include="Handlers/CodeAction.fs" />

src/CSharpLanguageServer/Diagnostics.fs

@@ -9,6 +9,7 @@ open Ionide.LanguageServerProtocol.JsonRpc
 open CSharpLanguageServer.Types
 open CSharpLanguageServer.Logging
 open CSharpLanguageServer.Roslyn.Solution
+open CSharpLanguageServer.Roslyn.Codebase
 
 module Diagnostics =
     let private logger = Logging.getLoggerByName "Diagnostics"
@@ -64,7 +65,7 @@ module Diagnostics =
 
         let lspClient = new LspClientStub()
         let cwd = string (Directory.GetCurrentDirectory())
-        let! _sln = solutionLoadSolutionWithPathOrOnCwd lspClient None cwd
+        let! codebase = Codebase.solutionLoadSolutionWithPathOrOnCwd lspClient None cwd
 
         logger.LogDebug("diagnose: done")
 

src/CSharpLanguageServer/Roslyn/Solution.fs

@@ -376,27 +376,6 @@ let solutionFindAndLoadOnDir (lspClient: ILspClient) dir = async {
 }
 
 
-let solutionLoadSolutionWithPathOrOnCwd (lspClient: ILspClient) (solutionPathMaybe: string option) (cwd: string) =
-    match solutionPathMaybe with
-    | Some solutionPath -> async {
-        let rootedSolutionPath =
-            match Path.IsPathRooted solutionPath with
-            | true -> solutionPath
-            | false -> Path.Combine(cwd, solutionPath)
-
-        return! solutionTryLoadOnPath lspClient rootedSolutionPath
-      }
-
-    | None -> async {
-        let logMessage: LogMessageParams =
-            { Type = MessageType.Info
-              Message = sprintf "csharp-ls: attempting to find and load solution based on cwd (\"%s\").." cwd }
-
-        do! lspClient.WindowLogMessage logMessage
-        return! solutionFindAndLoadOnDir lspClient cwd
-      }
-
-
 let solutionGetRazorDocumentForUri
     (solution: Solution)
     (uri: string)

src/CSharpLanguageServer/State/Codebase.fs

@@ -0,0 +1,63 @@
+namespace CSharpLanguageServer.State
+
+open System
+open System.IO
+open System.Threading
+open System.Collections.Generic
+open System.Text.RegularExpressions
+
+open Ionide.LanguageServerProtocol
+open Ionide.LanguageServerProtocol.Types
+open Microsoft.Build.Construction
+open Microsoft.Build.Exceptions
+open Microsoft.Build.Locator
+open Microsoft.CodeAnalysis
+open Microsoft.CodeAnalysis.MSBuild
+open Microsoft.CodeAnalysis.Text
+open Microsoft.Extensions.Logging
+
+open CSharpLanguageServer
+open CSharpLanguageServer.Lsp
+open CSharpLanguageServer.Logging
+open CSharpLanguageServer.Util
+open CSharpLanguageServer.Roslyn.Conversions
+open CSharpLanguageServer.Roslyn.WorkspaceServices
+open CSharpLanguageServer.Roslyn.Solution
+open CSharpLanguageServer.Types
+
+
+type DecompiledMetadataDocument =
+    { Metadata: CSharpMetadataInformation
+      Document: Document }
+
+
+/// Codebase wraps roslyn Solution and encapsulates extra metadata
+/// that goes along
+type Codebase =
+    { Solution: Solution
+      DecompiledMetadata: Map<string, DecompiledMetadataDocument> }
+
+    static member LoadWithPathOrOnCwd(lspClient: ILspClient, solutionPathMaybe: string option, cwd: string) = async {
+        let! solution = async {
+            match solutionPathMaybe with
+            | Some solutionPath ->
+                let rootedSolutionPath =
+                    match Path.IsPathRooted solutionPath with
+                    | true -> solutionPath
+                    | false -> Path.Combine(cwd, solutionPath)
+
+                return! solutionTryLoadOnPath lspClient rootedSolutionPath
+
+            | None ->
+                let logMessage: LogMessageParams =
+                    { Type = MessageType.Info
+                      Message = sprintf "csharp-ls: attempting to find and load solution based on cwd (\"%s\").." cwd }
+
+                do! lspClient.WindowLogMessage logMessage
+                return! solutionFindAndLoadOnDir lspClient cwd
+        }
+
+        return
+            { Solution = solution
+              DecompiledMetadata = Map.empty }
+    }

src/CSharpLanguageServer/State/ServerState.fs

@@ -14,13 +14,10 @@ open CSharpLanguageServer.Logging
 open CSharpLanguageServer.Roslyn.Conversions
 open CSharpLanguageServer.Roslyn.Solution
 open CSharpLanguageServer.Roslyn.Symbol
+open CSharpLanguageServer.State.Codebase
 open CSharpLanguageServer.Types
 open CSharpLanguageServer.Util
 
-type DecompiledMetadataDocument =
-    { Metadata: CSharpMetadataInformation
-      Document: Document }
-
 type ServerRequestMode =
     | ReadOnly
     | ReadWrite
@@ -56,9 +53,8 @@ and ServerState =
       RootPath: string
       LspClient: ILspClient option
       ClientCapabilities: ClientCapabilities
-      Solution: Solution option
+      Codebase: Codebase option
       OpenDocs: Map<string, ServerOpenDocInfo>
-      DecompiledMetadata: Map<string, DecompiledMetadataDocument>
       LastRequestId: int
       PendingRequests: ServerRequest list
       RunningRequests: Map<int, ServerRequest>
@@ -73,9 +69,8 @@ and ServerState =
           RootPath = Directory.GetCurrentDirectory()
           LspClient = None
           ClientCapabilities = emptyClientCapabilities
-          Solution = None
+          Codebase = None
           OpenDocs = Map.empty
-          DecompiledMetadata = Map.empty
           LastRequestId = 0
           PendingRequests = []
           RunningRequests = Map.empty