chore(Lsp.Workspace): add LspWorkspace.OpenDocs (move from ServerState.OpenDocs)

Author: razzmatazz

src/CSharpLanguageServer/Handlers/Rename.fs

@@ -164,9 +164,10 @@ module Rename =
                 )
                 |> Async.AwaitTask
 
-            let! docTextEdit =
-                lspDocChangesFromSolutionDiff ct originalSolution updatedSolution (fun uri ->
-                    context.State.OpenDocs.TryFind uri |> Option.map _.Version)
+            let documentVersionForUri =
+                context.Workspace.OpenDocs.TryFind >> Option.map _.Version
+
+            let! docTextEdit = lspDocChangesFromSolutionDiff ct originalSolution updatedSolution documentVersionForUri
 
             return
                 WorkspaceEdit.Create(docTextEdit, context.ClientCapabilities)

src/CSharpLanguageServer/Lsp/Workspace.fs

@@ -19,6 +19,13 @@ type LspWorkspaceFolder =
       Solution: Solution option
       DecompiledMetadata: Map<string, LspWorkspaceDecompiledMetadataDocument> }
 
+    static member Empty =
+        { Uri = Directory.GetCurrentDirectory() |> Uri.fromPath
+          Name = None
+          RoslynWorkspace = None
+          Solution = None
+          DecompiledMetadata = Map.empty }
+
 type LspWorkspaceDocumentType =
     | UserDocument // user Document from solution, on disk
     | DecompiledDocument // Document decompiled from metadata, readonly
@@ -30,10 +37,13 @@ let workspaceFolderWithDecompiledMetadataAdded uri md folder =
     { folder with
         DecompiledMetadata = newDecompiledMd }
 
+type LspWorkspaceOpenDocInfo = { Version: int; Touched: DateTime }
+
 type LspWorkspace =
-    { Folders: LspWorkspaceFolder list }
+    { Folders: LspWorkspaceFolder list
+      OpenDocs: Map<string, LspWorkspaceOpenDocInfo> }
 
-    static member Empty = { Folders = [] }
+    static member Empty = { Folders = []; OpenDocs = Map.empty }
 
     member this.SingletonFolder = this.Folders |> Seq.exactlyOne
 
@@ -42,17 +52,10 @@ type LspWorkspace =
     member this.Solution = this.Folders |> Seq.tryExactlyOne |> Option.bind _.Solution
 
     member this.WithSingletonFolderUpdated(update: LspWorkspaceFolder -> LspWorkspaceFolder) =
-        let emptyFolder =
-            { Uri = Directory.GetCurrentDirectory() |> Uri.fromPath
-              Name = None
-              RoslynWorkspace = None
-              Solution = None
-              DecompiledMetadata = Map.empty }
-
         let updatedFolders =
             this.Folders
             |> Seq.tryExactlyOne
-            |> Option.defaultValue emptyFolder
+            |> Option.defaultValue LspWorkspaceFolder.Empty
             |> update
             |> List.singleton
 

src/CSharpLanguageServer/State/ServerRequestContext.fs

@@ -283,4 +283,4 @@ type ServerRequestContext(requestId: int, state: ServerState, emitServerEvent) =
     }
 
     member this.GetDocumentVersion(uri: DocumentUri) : int option =
-        Uri.unescape uri |> this.State.OpenDocs.TryFind |> Option.map _.Version
+        Uri.unescape uri |> this.Workspace.OpenDocs.TryFind |> Option.map _.Version

src/CSharpLanguageServer/State/ServerState.fs

@@ -22,8 +22,6 @@ type ServerRequestMode =
     | ReadOnly
     | ReadWrite
 
-type ServerOpenDocInfo = { Version: int; Touched: DateTime }
-
 type RequestMetrics =
     { Count: int
       TotalDuration: TimeSpan
@@ -53,7 +51,6 @@ and ServerState =
       LspClient: ILspClient option
       ClientCapabilities: ClientCapabilities
       Workspace: LspWorkspace
-      OpenDocs: Map<string, ServerOpenDocInfo>
       LastRequestId: int
       PendingRequests: ServerRequest list
       RunningRequests: Map<int, ServerRequest>
@@ -68,7 +65,6 @@ and ServerState =
           LspClient = None
           ClientCapabilities = emptyClientCapabilities
           Workspace = LspWorkspace.Empty
-          OpenDocs = Map.empty
           LastRequestId = 0
           PendingRequests = []
           RunningRequests = Map.empty
@@ -348,32 +344,35 @@ let processServerEvent (logger: ILogger) state postSelf msg : Async<ServerState>
         postSelf PushDiagnosticsDocumentBacklogUpdate
 
         let openDocInfo = { Version = ver; Touched = timestamp }
-        let newOpenDocs = state.OpenDocs |> Map.add uri openDocInfo
-        return { state with OpenDocs = newOpenDocs }
+        let newOpenDocs = state.Workspace.OpenDocs |> Map.add uri openDocInfo
+
+        return
+            { state with
+                Workspace.OpenDocs = newOpenDocs }
 
     | DocumentClosed uri ->
         postSelf PushDiagnosticsDocumentBacklogUpdate
 
-        let newOpenDocVersions = state.OpenDocs |> Map.remove uri
+        let newOpenDocVersions = state.Workspace.OpenDocs |> Map.remove uri
 
         return
             { state with
-                OpenDocs = newOpenDocVersions }
+                Workspace.OpenDocs = newOpenDocVersions }
 
     | DocumentTouched(uri, timestamp) ->
         postSelf PushDiagnosticsDocumentBacklogUpdate
 
-        let openDocInfo = state.OpenDocs |> Map.tryFind uri
+        let openDocInfo = state.Workspace.OpenDocs |> Map.tryFind uri
 
         match openDocInfo with
         | None -> return state
         | Some openDocInfo ->
             let updatedOpenDocInfo = { openDocInfo with Touched = timestamp }
-            let newOpenDocVersions = state.OpenDocs |> Map.add uri updatedOpenDocInfo
+            let newOpenDocVersions = state.Workspace.OpenDocs |> Map.add uri updatedOpenDocInfo
 
             return
                 { state with
-                    OpenDocs = newOpenDocVersions }
+                    Workspace.OpenDocs = newOpenDocVersions }
 
     | WorkspaceReloadRequested reloadNoLaterThanIn ->
         // we need to wait a bit before starting this so we
@@ -398,7 +397,7 @@ let processServerEvent (logger: ILogger) state postSelf msg : Async<ServerState>
         // which will consider documents by their last modification date
         // for processing first
         let newBacklog =
-            state.OpenDocs
+            state.Workspace.OpenDocs
             |> Seq.sortByDescending (fun kv -> kv.Value.Touched)
             |> Seq.map (fun kv -> kv.Key)
             |> List.ofSeq