feat: introduce emptyClientCapabilities and us it to reduce ClientCap…

…abilities option to ClientCapabilities throughout the codebase
razzmatazz · Jul 2, 2024 · 684dcc4 · 684dcc4
1 parent a3eacee
commit 684dcc4
Show file tree

Hide file tree

Showing 36 changed files with 136 additions and 163 deletions.
diff --git a/src/CSharpLanguageServer/Handlers/CallHierarchy.fs b/src/CSharpLanguageServer/Handlers/CallHierarchy.fs
@@ -25,19 +25,18 @@ module CallHierarchy =
                   Microsoft.CodeAnalysis.SymbolKind.Event
                   Microsoft.CodeAnalysis.SymbolKind.Property ]
 
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.CallHierarchy)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : U3<bool, CallHierarchyOptions, CallHierarchyRegistrationOptions> option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> None
         | false -> Some (U3.C1 true)
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->

diff --git a/src/CSharpLanguageServer/Handlers/CodeAction.fs b/src/CSharpLanguageServer/Handlers/CodeAction.fs
@@ -284,21 +284,19 @@ module CodeAction =
             }
     }
 
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.CodeAction)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
-    let private literalSupport (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private literalSupport (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.CodeAction)
         |> Option.bind (fun x -> x.CodeActionLiteralSupport)
 
     let provider (clientCapabilities: ClientCapabilities) : U2<bool, CodeActionOptions> option =
-        match dynamicRegistration (Some clientCapabilities), literalSupport (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities, literalSupport clientCapabilities with
         | true, _ -> None
         | false, _ ->
             // TODO: Server can only return CodeActionOptions if literalSupport is not None
@@ -308,7 +306,7 @@ module CodeAction =
             |> U2.C2
             |> Some
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->
@@ -335,8 +333,7 @@ module CodeAction =
             let! roslynCodeActions = getRoslynCodeActions doc textSpan ct
 
             let clientSupportsCodeActionEditResolveWithEditAndData =
-                context.ClientCapabilities
-                |> Option.bind (fun x -> x.TextDocument)
+                context.ClientCapabilities.TextDocument
                 |> Option.bind (fun x -> x.CodeAction)
                 |> Option.bind (fun x -> x.ResolveSupport)
                 |> Option.map (fun resolveSupport -> resolveSupport.Properties |> Array.contains "edit")

diff --git a/src/CSharpLanguageServer/Handlers/CodeLens.fs b/src/CSharpLanguageServer/Handlers/CodeLens.fs
@@ -95,20 +95,19 @@ module CodeLens =
             { DocumentUri = ""
               Position = { Line = 0u; Character = 0u } }
 
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.CodeLens)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : CodeLensOptions option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> None
         | false -> Some { ResolveProvider = Some true
                           WorkDoneProgress = None }
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->

diff --git a/src/CSharpLanguageServer/Handlers/Color.fs b/src/CSharpLanguageServer/Handlers/Color.fs
@@ -6,9 +6,9 @@ open CSharpLanguageServer.State
 
 [<RequireQualifiedAccess>]
 module Color =
-    let provider (clientCapabilities: ClientCapabilities option)  = None
+    let provider (clientCapabilities: ClientCapabilities)  = None
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option = None
+    let registration (clientCapabilities: ClientCapabilities) : Registration option = None
 
     let handle (context: ServerRequestContext) (p: DocumentColorParams) : AsyncLspResult<ColorInformation[]> =
         LspResult.notImplemented<ColorInformation[]> |> async.Return

diff --git a/src/CSharpLanguageServer/Handlers/Completion.fs b/src/CSharpLanguageServer/Handlers/Completion.fs
@@ -64,15 +64,14 @@ module Completion =
         member __.ShouldTriggerCompletion(sourceText, position, completionTrigger) =
             service.ShouldTriggerCompletion(sourceText, position, completionTrigger)
 
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.Completion)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : CompletionOptions option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> None
         | false ->
             Some { ResolveProvider = None
@@ -81,7 +80,7 @@ module Completion =
                    WorkDoneProgress = None
                    CompletionItem = None }
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->

diff --git a/src/CSharpLanguageServer/Handlers/Declaration.fs b/src/CSharpLanguageServer/Handlers/Declaration.fs
@@ -6,9 +6,9 @@ open CSharpLanguageServer.State
 
 [<RequireQualifiedAccess>]
 module Declaration =
-    let provider (_cc: ClientCapabilities option) : bool option = None
+    let provider (_cc: ClientCapabilities) : bool option = None
 
-    let registration (_cc: ClientCapabilities option) : Registration option = None
+    let registration (_cc: ClientCapabilities) : Registration option = None
 
     let handle (_context: ServerRequestContext) (_p: TextDocumentPositionParams) : AsyncLspResult<Declaration option> =
         LspResult.notImplemented<Declaration option> |> async.Return
diff --git a/src/CSharpLanguageServer/Handlers/Definition.fs b/src/CSharpLanguageServer/Handlers/Definition.fs
@@ -11,19 +11,18 @@ open CSharpLanguageServer.Types
 
 [<RequireQualifiedAccess>]
 module Definition =
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.Definition)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : U2<bool, DefinitionOptions> option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> None
         | false -> Some (U2.C1 true)
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->

diff --git a/src/CSharpLanguageServer/Handlers/Diagnostic.fs b/src/CSharpLanguageServer/Handlers/Diagnostic.fs
@@ -8,7 +8,7 @@ open CSharpLanguageServer.State
 module Diagnostic =
     let provider (clientCapabilities: ClientCapabilities) = None
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option = None
+    let registration (clientCapabilities: ClientCapabilities) : Registration option = None
 
     let handle (context: ServerRequestContext) (def: DocumentDiagnosticParams) : AsyncLspResult<DocumentDiagnosticReport> =
         LspResult.notImplemented<DocumentDiagnosticReport> |> async.Return
diff --git a/src/CSharpLanguageServer/Handlers/DocumentFormatting.fs b/src/CSharpLanguageServer/Handlers/DocumentFormatting.fs
@@ -13,19 +13,18 @@ open CSharpLanguageServer.Types
 
 [<RequireQualifiedAccess>]
 module DocumentFormatting =
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.Formatting)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : U2<bool, DocumentFormattingOptions> option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> None
         | false -> Some (U2.C1 true)
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->

diff --git a/src/CSharpLanguageServer/Handlers/DocumentHighlight.fs b/src/CSharpLanguageServer/Handlers/DocumentHighlight.fs
@@ -15,19 +15,18 @@ open CSharpLanguageServer.Conversions
 
 [<RequireQualifiedAccess>]
 module DocumentHighlight =
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.DocumentHighlight)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : U2<bool, DocumentHighlightOptions> option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> None
         | false -> Some (U2.C1 true)
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option = 
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->

diff --git a/src/CSharpLanguageServer/Handlers/DocumentLink.fs b/src/CSharpLanguageServer/Handlers/DocumentLink.fs
@@ -6,9 +6,9 @@ open CSharpLanguageServer.State
 
 [<RequireQualifiedAccess>]
 module DocumentLink =
-    let provider (clientCapabilities: ClientCapabilities option) : DocumentLinkOptions option = None
+    let provider (clientCapabilities: ClientCapabilities) : DocumentLinkOptions option = None
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option = None
+    let registration (clientCapabilities: ClientCapabilities) : Registration option = None
 
     let handle (context: ServerRequestContext) (p: DocumentLinkParams) : AsyncLspResult<DocumentLink[] option> =
         LspResult.notImplemented<DocumentLink[] option> |> async.Return

diff --git a/src/CSharpLanguageServer/Handlers/DocumentOnTypeFormatting.fs b/src/CSharpLanguageServer/Handlers/DocumentOnTypeFormatting.fs
@@ -15,22 +15,21 @@ open CSharpLanguageServer.Conversions
 
 [<RequireQualifiedAccess>]
 module DocumentOnTypeFormatting =
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.OnTypeFormatting)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : DocumentOnTypeFormattingOptions option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> None
         | false ->
             Some
                 { FirstTriggerCharacter = ";"
                   MoreTriggerCharacter = Some([| "}"; ")" |]) }
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->

diff --git a/src/CSharpLanguageServer/Handlers/DocumentRangeFormatting.fs b/src/CSharpLanguageServer/Handlers/DocumentRangeFormatting.fs
@@ -15,19 +15,18 @@ open CSharpLanguageServer.Types
 
 [<RequireQualifiedAccess>]
 module DocumentRangeFormatting =
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.RangeFormatting)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : U2<bool, DocumentRangeFormattingOptions> option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> None
         | false -> Some (U2.C1 true)
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->

diff --git a/src/CSharpLanguageServer/Handlers/DocumentSymbol.fs b/src/CSharpLanguageServer/Handlers/DocumentSymbol.fs
@@ -282,19 +282,18 @@ module DocumentSymbol =
             base.VisitEventDeclaration(node)
             pop node
 
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.DocumentSymbol)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : U2<bool, DocumentSymbolOptions> option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> None
         | false -> true |> U2.C1 |> Some
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->
@@ -312,8 +311,7 @@ module DocumentSymbol =
                (p: DocumentSymbolParams)
             : AsyncLspResult<U2<SymbolInformation[], DocumentSymbol[]> option> = async {
         let canEmitDocSymbolHierarchy =
-            context.ClientCapabilities
-            |> Option.bind (fun cc -> cc.TextDocument)
+            context.ClientCapabilities.TextDocument
             |> Option.bind (fun cc -> cc.DocumentSymbol)
             |> Option.bind (fun cc -> cc.HierarchicalDocumentSymbolSupport)
             |> Option.defaultValue false

diff --git a/src/CSharpLanguageServer/Handlers/ExecuteCommand.fs b/src/CSharpLanguageServer/Handlers/ExecuteCommand.fs
@@ -7,9 +7,9 @@ open CSharpLanguageServer.State
 
 [<RequireQualifiedAccess>]
 module ExecuteCommand =
-    let provider (_clientCapabilities: ClientCapabilities) : ExecuteCommandOptions option = None
+    let provider (_cc: ClientCapabilities) : ExecuteCommandOptions option = None
 
-    let registration (_clientCapabilities: ClientCapabilities option) : Registration option = None
+    let registration (_cc: ClientCapabilities) : Registration option = None
 
     let handle (_context: ServerRequestContext) (_p: ExecuteCommandParams) : AsyncLspResult<LSPAny> =
         notImplemented<LSPAny> |> async.Return
diff --git a/src/CSharpLanguageServer/Handlers/FoldingRange.fs b/src/CSharpLanguageServer/Handlers/FoldingRange.fs
@@ -7,9 +7,9 @@ open CSharpLanguageServer.State
 
 [<RequireQualifiedAccess>]
 module FoldingRange =
-    let provider (clientCapabilities: ClientCapabilities option) : bool option = None
+    let provider (_c: ClientCapabilities) : bool option = None
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option = None
+    let registration (_c: ClientCapabilities) : Registration option = None
 
-    let handle (context: ServerRequestContext) (p: FoldingRangeParams) : AsyncLspResult<FoldingRange list option> =
+    let handle (_c: ServerRequestContext) (_p: FoldingRangeParams) : AsyncLspResult<FoldingRange list option> =
         notImplemented<FoldingRange list option> |> async.Return
diff --git a/src/CSharpLanguageServer/Handlers/Hover.fs b/src/CSharpLanguageServer/Handlers/Hover.fs
@@ -12,19 +12,18 @@ open CSharpLanguageServer.State
 
 [<RequireQualifiedAccess>]
 module Hover =
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.Hover)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : U2<bool, HoverOptions> option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> Some (U2.C1 false)
         | false -> Some (U2.C1 true)
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->

diff --git a/src/CSharpLanguageServer/Handlers/Implementation.fs b/src/CSharpLanguageServer/Handlers/Implementation.fs
@@ -12,19 +12,18 @@ open CSharpLanguageServer.State
 
 [<RequireQualifiedAccess>]
 module Implementation =
-    let private dynamicRegistration (clientCapabilities: ClientCapabilities option) =
-        clientCapabilities
-        |> Option.bind (fun x -> x.TextDocument)
+    let private dynamicRegistration (clientCapabilities: ClientCapabilities) =
+        clientCapabilities.TextDocument
         |> Option.bind (fun x -> x.Implementation)
         |> Option.bind (fun x -> x.DynamicRegistration)
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : U3<bool,ImplementationOptions,ImplementationRegistrationOptions> option =
-        match dynamicRegistration (Some clientCapabilities) with
+        match dynamicRegistration clientCapabilities with
         | true -> None
         | false -> Some (U3.C1 true)
 
-    let registration (clientCapabilities: ClientCapabilities option) : Registration option =
+    let registration (clientCapabilities: ClientCapabilities) : Registration option =
         match dynamicRegistration clientCapabilities with
         | false -> None
         | true ->