Skip to content

Commit aa5a86b

Browse files
committed
chore(Lsp.Workspace): add workspaceDocumentVersion, drop ServerRequestContext.GetDocumentVersion()
1 parent c0fb4aa commit aa5a86b

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

src/CSharpLanguageServer/Handlers/CodeAction.fs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ module CodeAction =
380380
let! maybeLspCa =
381381
roslynCodeActionToResolvedLspCodeAction
382382
doc.Project.Solution
383-
context.GetDocumentVersion
383+
(Uri.unescape >> workspaceDocumentVersion context.Workspace)
384384
doc
385385
ct
386386
ca
@@ -422,7 +422,11 @@ module CodeAction =
422422
roslynCodeActions |> Seq.tryFind (fun ca -> ca.Title = p.Title)
423423

424424
let toResolvedLspCodeAction =
425-
roslynCodeActionToResolvedLspCodeAction doc.Project.Solution context.GetDocumentVersion doc ct
425+
roslynCodeActionToResolvedLspCodeAction
426+
doc.Project.Solution
427+
(Uri.unescape >> workspaceDocumentVersion context.Workspace)
428+
doc
429+
ct
426430

427431
let! lspCodeAction =
428432
match selectedCodeAction with

src/CSharpLanguageServer/Handlers/Rename.fs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,13 @@ module Rename =
164164
)
165165
|> Async.AwaitTask
166166

167-
let documentVersionForUri =
168-
context.Workspace.OpenDocs.TryFind >> Option.map _.Version
169167

170-
let! docTextEdit = lspDocChangesFromSolutionDiff ct originalSolution updatedSolution documentVersionForUri
168+
let! docTextEdit =
169+
lspDocChangesFromSolutionDiff
170+
ct
171+
originalSolution
172+
updatedSolution
173+
(workspaceDocumentVersion context.Workspace)
171174

172175
return
173176
WorkspaceEdit.Create(docTextEdit, context.ClientCapabilities)

src/CSharpLanguageServer/Lsp/Workspace.fs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,6 @@ let workspaceDocumentDetails (workspace: LspWorkspace) docType (u: string) =
9898

9999
let workspaceDocument workspace docType u =
100100
workspaceDocumentDetails workspace docType u |> Option.map fst
101+
102+
let workspaceDocumentVersion workspace uri =
103+
uri |> workspace.OpenDocs.TryFind |> Option.map _.Version

src/CSharpLanguageServer/State/ServerRequestContext.fs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,3 @@ type ServerRequestContext(requestId: int, state: ServerState, emitServerEvent) =
281281

282282
return refs |> Seq.collect locationsFromReferencedSym
283283
}
284-
285-
member this.GetDocumentVersion(uri: DocumentUri) : int option =
286-
Uri.unescape uri |> this.Workspace.OpenDocs.TryFind |> Option.map _.Version

0 commit comments

Comments
 (0)