chore(Lsp.Workspace): add workspaceDocumentDetails

razzmatazz · razzmatazz · commit cdb199224242 · 2025-10-29T15:19:21.000+02:00
diff --git a/src/CSharpLanguageServer/Handlers/CodeAction.fs b/src/CSharpLanguageServer/Handlers/CodeAction.fs
@@ -332,9 +332,7 @@ module CodeAction =
         : AsyncLspResult<TextDocumentCodeActionResult option> =
         async {
             let docForUri =
-                p.TextDocument.Uri
-                |> workspaceDocument context.Workspace AnyDocument
-                |> Option.map fst
+                p.TextDocument.Uri |> workspaceDocument context.Workspace AnyDocument
 
             match docForUri with
             | None -> return None |> LspResult.success
@@ -409,7 +407,6 @@ module CodeAction =
         let docForUri =
             resolutionData.Value.TextDocumentUri
             |> workspaceDocument context.Workspace AnyDocument
-            |> Option.map fst
 
         match docForUri with
         | None -> return raise (Exception(sprintf "no document for uri %s" resolutionData.Value.TextDocumentUri))
diff --git a/src/CSharpLanguageServer/Handlers/CodeLens.fs b/src/CSharpLanguageServer/Handlers/CodeLens.fs
@@ -91,9 +91,7 @@ module CodeLens =
 
     let handle (context: ServerRequestContext) (p: CodeLensParams) : AsyncLspResult<CodeLens[] option> = async {
         let docForUri =
-            p.TextDocument.Uri
-            |> workspaceDocument context.Workspace AnyDocument
-            |> Option.map fst
+            p.TextDocument.Uri |> workspaceDocument context.Workspace AnyDocument
 
         match docForUri with
         | None -> return None |> LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/Completion.fs b/src/CSharpLanguageServer/Handlers/Completion.fs
@@ -187,9 +187,7 @@ module Completion =
         : Async<LspResult<U2<CompletionItem array, CompletionList> option>> =
         async {
             let docForUri =
-                p.TextDocument.Uri
-                |> workspaceDocument context.Workspace AnyDocument
-                |> Option.map fst
+                p.TextDocument.Uri |> workspaceDocument context.Workspace AnyDocument
 
             match docForUri with
             | None -> return None |> LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/Diagnostic.fs b/src/CSharpLanguageServer/Handlers/Diagnostic.fs
@@ -39,9 +39,7 @@ module Diagnostic =
                   RelatedDocuments = None }
 
             let docForUri =
-                p.TextDocument.Uri
-                |> workspaceDocument context.Workspace AnyDocument
-                |> Option.map fst
+                p.TextDocument.Uri |> workspaceDocument context.Workspace AnyDocument
 
             match docForUri with
             | None -> return emptyReport |> U2.C1 |> LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/DocumentFormatting.fs b/src/CSharpLanguageServer/Handlers/DocumentFormatting.fs
@@ -30,7 +30,6 @@ module DocumentFormatting =
 
         p.TextDocument.Uri
         |> workspaceDocument context.Workspace UserDocument
-        |> Option.map fst
         |> async.Return
         |> Async.bindOption formatDocument
         |> Async.map LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/DocumentOnTypeFormatting.fs b/src/CSharpLanguageServer/Handlers/DocumentOnTypeFormatting.fs
@@ -51,9 +51,7 @@ module DocumentOnTypeFormatting =
                 None
 
         let docForUri =
-            p.TextDocument.Uri
-            |> workspaceDocument context.Workspace UserDocument
-            |> Option.map fst
+            p.TextDocument.Uri |> workspaceDocument context.Workspace UserDocument
 
         match docForUri with
         | None -> return None |> LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/DocumentRangeFormatting.fs b/src/CSharpLanguageServer/Handlers/DocumentRangeFormatting.fs
@@ -22,9 +22,7 @@ module DocumentRangeFormatting =
                 None
 
         let docForUri =
-            p.TextDocument.Uri
-            |> workspaceDocument context.Workspace UserDocument
-            |> Option.map fst
+            p.TextDocument.Uri |> workspaceDocument context.Workspace UserDocument
 
         match docForUri with
         | None -> return None |> LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/DocumentSymbol.fs b/src/CSharpLanguageServer/Handlers/DocumentSymbol.fs
@@ -294,9 +294,7 @@ module DocumentSymbol =
                 |> Option.defaultValue false
 
             let docForUri =
-                p.TextDocument.Uri
-                |> workspaceDocument context.Workspace AnyDocument
-                |> Option.map fst
+                p.TextDocument.Uri |> workspaceDocument context.Workspace AnyDocument
 
             match docForUri with
             | None -> return None |> LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/InlayHint.fs b/src/CSharpLanguageServer/Handlers/InlayHint.fs
@@ -242,9 +242,7 @@ module InlayHint =
 
     let handle (context: ServerRequestContext) (p: InlayHintParams) : AsyncLspResult<InlayHint[] option> = async {
         let docForUri =
-            p.TextDocument.Uri
-            |> workspaceDocument context.Workspace UserDocument
-            |> Option.map fst
+            p.TextDocument.Uri |> workspaceDocument context.Workspace UserDocument
 
         match docForUri with
         | None -> return None |> LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/Rename.fs b/src/CSharpLanguageServer/Handlers/Rename.fs
@@ -90,9 +90,7 @@ module Rename =
     let prepare (context: ServerRequestContext) (p: PrepareRenameParams) : AsyncLspResult<PrepareRenameResult option> = async {
 
         let docForUri =
-            p.TextDocument.Uri
-            |> workspaceDocument context.Workspace UserDocument
-            |> Option.map fst
+            p.TextDocument.Uri |> workspaceDocument context.Workspace UserDocument
 
         match docForUri with
         | None -> return None |> LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/SemanticTokens.fs b/src/CSharpLanguageServer/Handlers/SemanticTokens.fs
@@ -115,8 +115,7 @@ module SemanticTokens =
         (range: Range option)
         : AsyncLspResult<SemanticTokens option> =
         async {
-            let docMaybe =
-                uri |> workspaceDocument context.Workspace UserDocument |> Option.map fst
+            let docMaybe = uri |> workspaceDocument context.Workspace UserDocument
 
             match docMaybe with
             | None -> return None |> LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/SignatureHelp.fs b/src/CSharpLanguageServer/Handlers/SignatureHelp.fs
@@ -68,9 +68,7 @@ module SignatureHelp =
 
     let handle (context: ServerRequestContext) (p: SignatureHelpParams) : AsyncLspResult<SignatureHelp option> = async {
         let docMaybe =
-            p.TextDocument.Uri
-            |> workspaceDocument context.Workspace UserDocument
-            |> Option.map fst
+            p.TextDocument.Uri |> workspaceDocument context.Workspace UserDocument
 
         match docMaybe with
         | None -> return None |> LspResult.success
diff --git a/src/CSharpLanguageServer/Handlers/TextDocumentSync.fs b/src/CSharpLanguageServer/Handlers/TextDocumentSync.fs
@@ -48,7 +48,8 @@ module TextDocumentSync =
 
     let didOpen (context: ServerRequestContext) (openParams: DidOpenTextDocumentParams) : Async<LspResult<unit>> =
         let docAndDocTypeForUri =
-            openParams.TextDocument.Uri |> workspaceDocument context.Workspace AnyDocument
+            openParams.TextDocument.Uri
+            |> workspaceDocumentDetails context.Workspace AnyDocument
 
         match docAndDocTypeForUri with
         | Some(doc, docType) ->
@@ -88,9 +89,7 @@ module TextDocumentSync =
 
     let didChange (context: ServerRequestContext) (p: DidChangeTextDocumentParams) : Async<LspResult<unit>> = async {
         let docMaybe =
-            p.TextDocument.Uri
-            |> workspaceDocument context.Workspace UserDocument
-            |> Option.map fst
+            p.TextDocument.Uri |> workspaceDocument context.Workspace UserDocument
 
         match docMaybe with
         | None -> ()
diff --git a/src/CSharpLanguageServer/Handlers/Workspace.fs b/src/CSharpLanguageServer/Handlers/Workspace.fs
@@ -52,7 +52,7 @@ module Workspace =
 
 
     let private tryReloadDocumentOnUri logger (context: ServerRequestContext) uri = async {
-        let doc = uri |> workspaceDocument context.Workspace UserDocument |> Option.map fst
+        let doc = uri |> workspaceDocument context.Workspace UserDocument
 
         match doc with
         | Some doc ->
@@ -78,7 +78,7 @@ module Workspace =
 
 
     let private removeDocument (context: ServerRequestContext) uri =
-        let doc = uri |> workspaceDocument context.Workspace UserDocument |> Option.map fst
+        let doc = uri |> workspaceDocument context.Workspace UserDocument
 
         match doc with
         | Some existingDoc ->
diff --git a/src/CSharpLanguageServer/Lsp/Workspace.fs b/src/CSharpLanguageServer/Lsp/Workspace.fs
@@ -8,33 +8,28 @@ open Microsoft.CodeAnalysis
 open CSharpLanguageServer.Util
 open CSharpLanguageServer.Types
 
-
 type LspWorkspaceDecompiledMetadataDocument =
     { Metadata: CSharpMetadataInformation
       Document: Document }
 
-
 type LspWorkspaceFolder =
     { Uri: string
       Name: string option
       RoslynWorkspace: Workspace option
       Solution: Solution option
       DecompiledMetadata: Map<string, LspWorkspaceDecompiledMetadataDocument> }
 
-
 type LspWorkspaceDocumentType =
     | UserDocument // user Document from solution, on disk
     | DecompiledDocument // Document decompiled from metadata, readonly
     | AnyDocument
 
-
 let workspaceFolderWithDecompiledMetadataAdded uri md folder =
     let newDecompiledMd = Map.add uri md folder.DecompiledMetadata
 
     { folder with
         DecompiledMetadata = newDecompiledMd }
 
-
 type LspWorkspace =
     { Folders: LspWorkspaceFolder list }
 
@@ -71,8 +66,7 @@ type LspWorkspace =
     member this.WithSolution(solution: Solution option) =
         this.WithSingletonFolderUpdated(fun f -> { f with Solution = solution })
 
-
-let workspaceDocument (workspace: LspWorkspace) docType (u: string) =
+let workspaceDocumentDetails (workspace: LspWorkspace) docType (u: string) =
     let uri = Uri(u.Replace("%3A", ":", true, null))
 
     match workspace.Solution with
@@ -98,3 +92,6 @@ let workspaceDocument (workspace: LspWorkspace) docType (u: string) =
         | DecompiledDocument -> matchingDecompiledDocumentMaybe
         | AnyDocument -> matchingUserDocumentMaybe |> Option.orElse matchingDecompiledDocumentMaybe
     | None -> None
+
+let workspaceDocument workspace docType u =
+    workspaceDocumentDetails workspace docType u |> Option.map fst
diff --git a/src/CSharpLanguageServer/State/ServerRequestContext.fs b/src/CSharpLanguageServer/State/ServerRequestContext.fs
@@ -129,8 +129,7 @@ type ServerRequestContext(requestId: int, state: ServerState, emitServerEvent) =
         }
 
     member this.FindSymbol' (uri: DocumentUri) (pos: Position) : Async<(ISymbol * Project * Document option) option> = async {
-        let docForUri =
-            uri |> workspaceDocument this.Workspace AnyDocument |> Option.map fst
+        let docForUri = uri |> workspaceDocument this.Workspace AnyDocument
 
         match docForUri with
         | None -> return None
diff --git a/src/CSharpLanguageServer/State/ServerState.fs b/src/CSharpLanguageServer/State/ServerState.fs
@@ -238,7 +238,6 @@ let processDumpAndResetRequestStats (logger: ILogger) state =
         RequestStats = Map.empty
         LastStatsDumpTime = DateTime.Now }
 
-
 let processServerEvent (logger: ILogger) state postSelf msg : Async<ServerState> = async {
     match msg with
     | SettingsChange newSettings ->
@@ -257,7 +256,7 @@ let processServerEvent (logger: ILogger) state postSelf msg : Async<ServerState>
         return state
 
     | GetDocumentOfTypeForUri(docType, uri, replyChannel) ->
-        let docForUri = uri |> workspaceDocument state.Workspace docType |> Option.map fst
+        let docForUri = uri |> workspaceDocument state.Workspace docType
 
         replyChannel.Reply(docForUri)
 
@@ -446,9 +445,9 @@ let processServerEvent (logger: ILogger) state postSelf msg : Async<ServerState>
                     { state with
                         PushDiagnosticsDocumentBacklog = newBacklog }
 
-                let docAndTypeForUri = docUri |> workspaceDocument state.Workspace AnyDocument
+                let docForUri = docUri |> workspaceDocument state.Workspace AnyDocument
 
-                match docAndTypeForUri with
+                match docForUri with
                 | None ->
                     // could not find document for this enqueued uri
                     logger.LogDebug(
@@ -458,7 +457,7 @@ let processServerEvent (logger: ILogger) state postSelf msg : Async<ServerState>
 
                     return newState
 
-                | Some(doc, _docType) ->
+                | Some doc ->
                     let resolveDocumentDiagnostics () : Task = task {
                         let! semanticModelMaybe = doc.GetSemanticModelAsync()
 
