chore(Lsp.Workspace): add workspaceDocumentVersion, drop ServerRequestContext.GetDocumentVersion()

Author: razzmatazz

src/CSharpLanguageServer/Handlers/CodeAction.fs

@@ -380,7 +380,7 @@ module CodeAction =
                             let! maybeLspCa =
                                 roslynCodeActionToResolvedLspCodeAction
                                     doc.Project.Solution
-                                    context.GetDocumentVersion
+                                    (Uri.unescape >> workspaceDocumentVersion context.Workspace)
                                     doc
                                     ct
                                     ca
@@ -422,7 +422,11 @@ module CodeAction =
                 roslynCodeActions |> Seq.tryFind (fun ca -> ca.Title = p.Title)
 
             let toResolvedLspCodeAction =
-                roslynCodeActionToResolvedLspCodeAction doc.Project.Solution context.GetDocumentVersion doc ct
+                roslynCodeActionToResolvedLspCodeAction
+                    doc.Project.Solution
+                    (Uri.unescape >> workspaceDocumentVersion context.Workspace)
+                    doc
+                    ct
 
             let! lspCodeAction =
                 match selectedCodeAction with

src/CSharpLanguageServer/Handlers/Rename.fs

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

src/CSharpLanguageServer/Lsp/Workspace.fs

@@ -98,3 +98,6 @@ let workspaceDocumentDetails (workspace: LspWorkspace) docType (u: string) =
 
 let workspaceDocument workspace docType u =
     workspaceDocumentDetails workspace docType u |> Option.map fst
+
+let workspaceDocumentVersion workspace uri =
+    uri |> workspace.OpenDocs.TryFind |> Option.map _.Version

src/CSharpLanguageServer/State/ServerRequestContext.fs

@@ -12,14 +12,11 @@ open CSharpLanguageServer.Roslyn.Conversions
 open CSharpLanguageServer.Lsp.Workspace
 open CSharpLanguageServer.Util
 open CSharpLanguageServer.Logging
-open CSharpLanguageServer.Lsp.Workspace
 
 
 type ServerRequestContext(requestId: int, state: ServerState, emitServerEvent) =
     let mutable solutionMaybe = state.Workspace.Solution
 
-    let logger = Logging.getLoggerByName "ServerRequestContext"
-
     member _.RequestId = requestId
     member _.State = state
     member _.Workspace = state.Workspace
@@ -281,6 +278,3 @@ type ServerRequestContext(requestId: int, state: ServerState, emitServerEvent) =
 
             return refs |> Seq.collect locationsFromReferencedSym
     }
-
-    member this.GetDocumentVersion(uri: DocumentUri) : int option =
-        Uri.unescape uri |> this.Workspace.OpenDocs.TryFind |> Option.map _.Version