LSP Protocol 1/2

Author: david-driscoll

src/Protocol/Client/Capabilities/CallHierarchyCapability.cs

@@ -10,7 +10,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
     /// </summary>
     [Obsolete(Constants.Proposal)]
     [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.CallHierarchy))]
-    public class CallHierarchyCapability : DynamicCapability, ConnectedCapability<ICallHierarchyHandler>,
+    public class CallHierarchyCapability : DynamicCapability, ConnectedCapability<ICallHierarchyPrepareHandler>,
                                            ConnectedCapability<ICallHierarchyIncomingHandler>, ConnectedCapability<ICallHierarchyOutgoingHandler>
     {
     }

src/Protocol/Client/Capabilities/ClientCapabilities.cs

@@ -8,17 +8,17 @@ public class ClientCapabilities : CapabilitiesBase
         /// <summary>
         /// Workspace specific client capabilities.
         /// </summary>
-        public WorkspaceClientCapabilities Workspace { get; set; }
+        public WorkspaceClientCapabilities? Workspace { get; set; }
 
         /// <summary>
         /// Text document specific client capabilities.
         /// </summary>
-        public TextDocumentClientCapabilities TextDocument { get; set; }
+        public TextDocumentClientCapabilities? TextDocument { get; set; }
 
         /// <summary>
         /// Window specific client capabilities.
         /// </summary>
-        public WindowClientCapabilities Window { get; set; }
+        public WindowClientCapabilities? Window { get; set; }
 
         /// <summary>
         /// Experimental client capabilities.

src/Protocol/Client/Capabilities/ClientCapabilitiesExtensions.cs

@@ -4,13 +4,13 @@ public static class ClientCapabilitiesExtensions
     {
         /// <summary>
         /// Best attempt to determine if the hosting client supports a specific protocol version
-        /// 
+        ///
         /// Capability are new as of 3.0, but the field existed before so it's possible
         /// it could be passed as an empty object
         /// </summary>
         /// <param name="clientCapabilities">The capabilities.</param>
         /// <returns>ClientVersion.</returns>
-        public static ClientVersion GetClientVersion(this ClientCapabilities clientCapabilities)
+        public static ClientVersion GetClientVersion(this ClientCapabilities? clientCapabilities)
         {
             if (clientCapabilities == null || clientCapabilities.TextDocument == null && clientCapabilities.Workspace == null)
                 return ClientVersion.Lsp2;

src/Protocol/Client/Capabilities/CodeActionCapability.cs

@@ -13,7 +13,7 @@ public class CodeActionCapability : DynamicCapability, ConnectedCapability<ICode
         /// Since 3.8.0
         /// </summary>
         [Optional]
-        public CodeActionLiteralSupportOptions CodeActionLiteralSupport { get; set; }
+        public CodeActionLiteralSupportOptions? CodeActionLiteralSupport { get; set; }
 
         /// <summary>
         /// Whether code action supports the `isPreferred` property.

src/Protocol/Client/Capabilities/CodeActionKindCapabilityOptions.cs

@@ -10,6 +10,6 @@ public class CodeActionKindCapabilityOptions
         /// handle values outside its set gracefully and falls back
         /// to a default value when unknown.
         /// </summary>
-        public Container<CodeActionKind> ValueSet { get; set; }
+        public Container<CodeActionKind> ValueSet { get; set; } = null!;
     }
 }

src/Protocol/Client/Capabilities/CodeActionLiteralSupportOptions.cs

@@ -6,7 +6,6 @@ public class CodeActionLiteralSupportOptions
         /// The code action kind is support with the following value
         /// set.
         /// </summary>
-
-        public CodeActionKindCapabilityOptions CodeActionKind { get; set; }
+        public CodeActionKindCapabilityOptions CodeActionKind { get; set; } = null!;
     }
 }

src/Protocol/Client/Capabilities/CompletionCapability.cs

@@ -11,13 +11,13 @@ public class CompletionCapability : DynamicCapability, ConnectedCapability<IComp
         /// capabilities.
         /// </summary>
         [Optional]
-        public CompletionItemCapabilityOptions CompletionItem { get; set; }
+        public CompletionItemCapabilityOptions? CompletionItem { get; set; }
 
         /// <summary>
         /// Specific capabilities for the `CompletionItemKind` in the `textDocument/completion` request.
         /// </summary>
         [Optional]
-        public CompletionItemKindCapabilityOptions CompletionItemKind { get; set; }
+        public CompletionItemKindCapabilityOptions? CompletionItemKind { get; set; }
 
         /// <summary>
         /// The client supports to send additional context information for a `textDocument/completion` request.

src/Protocol/Client/Capabilities/CompletionItemCapabilityOptions.cs

@@ -27,7 +27,7 @@ public class CompletionItemCapabilityOptions
         /// property. The order describes the preferred format of the client.
         /// </summary>
         [Optional]
-        public Container<MarkupKind> DocumentationFormat { get; set; }
+        public Container<MarkupKind>? DocumentationFormat { get; set; }
 
         /// <summary>
         /// Client supports the deprecated property on a completion item.
@@ -50,7 +50,7 @@ public class CompletionItemCapabilityOptions
         /// @since 3.15.0
         /// </summary>
         [Optional]
-        public Supports<CompletionItemTagSupportCapabilityOptions> TagSupport { get; set; }
+        public Supports<CompletionItemTagSupportCapabilityOptions?> TagSupport { get; set; }
 
         /// <summary>
         /// Client support insert replace edit to control different behavior if a

src/Protocol/Client/Capabilities/CompletionItemKindCapabilityOptions.cs

@@ -16,6 +16,6 @@ public class CompletionItemKindCapabilityOptions
         /// the initial version of the protocol.
         /// </summary>
         [Optional]
-        public Container<CompletionItemKind> ValueSet { get; set; }
+        public Container<CompletionItemKind>? ValueSet { get; set; }
     }
 }

src/Protocol/Client/Capabilities/CompletionItemTagSupportCapabilityOptions.cs

@@ -7,7 +7,6 @@ public class CompletionItemTagSupportCapabilityOptions
         /// <summary>
         /// The tags supported by the client.
         /// </summary>
-
-        public Container<CompletionItemTag> ValueSet { get; set; }
+        public Container<CompletionItemTag> ValueSet { get; set; } = null!;
     }
 }

src/Protocol/Client/Capabilities/ConnectedCapability.cs

@@ -1,8 +1,9 @@
 using OmniSharp.Extensions.JsonRpc;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
+    // ReSharper disable once InconsistentNaming
+    // ReSharper disable once UnusedTypeParameter
     internal interface ConnectedCapability<out T> : ICapability
         where T : IJsonRpcHandler
     {

src/Protocol/Client/Capabilities/DocumentSymbolCapability.cs

@@ -11,13 +11,13 @@ public class DocumentSymbolCapability : DynamicCapability, ConnectedCapability<I
         /// Specific capabilities for the `SymbolKind` in the `textDocument/symbol` request.
         /// </summary>
         [Optional]
-        public SymbolKindCapabilityOptions SymbolKind { get; set; }
+        public SymbolKindCapabilityOptions? SymbolKind { get; set; }
 
         /// <summary>
         /// Whether document symbol supports hierarchical `DocumentSymbol`s.
         /// </summary>
         [Optional]
-        public bool? HierarchicalDocumentSymbolSupport { get; set; }
+        public bool HierarchicalDocumentSymbolSupport { get; set; }
 
         /// <summary>
         /// The client supports tags on `SymbolInformation`.Tags are supported on
@@ -28,6 +28,6 @@ public class DocumentSymbolCapability : DynamicCapability, ConnectedCapability<I
         /// </summary>
         [Obsolete(Constants.Proposal)]
         [Optional]
-        public Supports<TagSupportCapabilityOptions> TagSupport { get; set; }
+        public TagSupportCapabilityOptions? TagSupport { get; set; }
     }
 }

src/Protocol/Client/Capabilities/HoverCapability.cs

@@ -11,6 +11,6 @@ public class HoverCapability : DynamicCapability, ConnectedCapability<IHoverHand
         /// Client supports the follow content formats for the content property. The order describes the preferred format of the client.
         /// </summary>
         [Optional]
-        public Container<MarkupKind> ContentFormat { get; set; }
+        public Container<MarkupKind>? ContentFormat { get; set; }
     }
 }

src/Protocol/Client/Capabilities/PublishDiagnosticsCapability.cs

@@ -21,7 +21,7 @@ public class PublishDiagnosticsCapability : ICapability
         /// @since 3.15.0
         /// </summary>
         [Optional]
-        public Supports<PublishDiagnosticsTagSupportCapabilityOptions> TagSupport { get; set; }
+        public Supports<PublishDiagnosticsTagSupportCapabilityOptions?> TagSupport { get; set; }
 
         /// <summary>
         /// Whether the client interprets the version property of the

src/Protocol/Client/Capabilities/PublishDiagnosticsTagSupportCapabilityOptions.cs

@@ -7,7 +7,6 @@ public class PublishDiagnosticsTagSupportCapabilityOptions
         /// <summary>
         /// The tags supported by the client.
         /// </summary>
-
-        public Container<DiagnosticTag> ValueSet { get; set; }
+        public Container<DiagnosticTag> ValueSet { get; set; } = null!;
     }
 }

src/Protocol/Client/Capabilities/SemanticTokensCapability.cs

@@ -18,21 +18,21 @@ public class SemanticTokensCapability : DynamicCapability, ConnectedCapability<I
         /// <summary>
         /// Which requests the client supports and might send to the server.
         /// </summary>
-        public SemanticTokensCapabilityRequests Requests { get; set; }
+        public SemanticTokensCapabilityRequests Requests { get; set; } = null!;
 
         /// <summary>
         /// The token types that the client supports.
         /// </summary>
-        public Container<SemanticTokenType> TokenTypes { get; set; }
+        public Container<SemanticTokenType> TokenTypes { get; set; } = null!;
 
         /// <summary>
         /// The token modifiers that the client supports.
         /// </summary>
-        public Container<SemanticTokenModifier> TokenModifiers { get; set; }
+        public Container<SemanticTokenModifier> TokenModifiers { get; set; } = null!;
 
         /// <summary>
         /// The formats the clients supports.
         /// </summary>
-        public Container<SemanticTokenFormat> Formats { get; set; }
+        public Container<SemanticTokenFormat> Formats { get; set; } = null!;
     }
 }

src/Protocol/Client/Capabilities/SemanticTokensCapabilityRequests.cs

@@ -9,13 +9,13 @@ public class SemanticTokensCapabilityRequests
         /// the server provides a corresponding handler.
         /// </summary>
         [Optional]
-        public Supports<SemanticTokensCapabilityRequestRange> Range { get; set; }
+        public Supports<SemanticTokensCapabilityRequestRange?> Range { get; set; }
 
         /// <summary>
         /// The client will send the `textDocument/semanticTokens/full` request if
         /// the server provides a corresponding handler.
         /// </summary>
         [Optional]
-        public Supports<SemanticTokensCapabilityRequestFull> Full { get; set; }
+        public Supports<SemanticTokensCapabilityRequestFull?> Full { get; set; }
     }
 }

src/Protocol/Client/Capabilities/SignatureHelpCapability.cs

@@ -10,7 +10,7 @@ public class SignatureHelpCapability : DynamicCapability, ConnectedCapability<IS
         /// specific properties.
         /// </summary>
         [Optional]
-        public SignatureInformationCapabilityOptions SignatureInformation { get; set; }
+        public SignatureInformationCapabilityOptions? SignatureInformation { get; set; }
 
         /// <summary>
         /// The client supports to send additional context information for a

src/Protocol/Client/Capabilities/SignatureInformationCapabilityOptions.cs

@@ -9,9 +9,9 @@ public class SignatureInformationCapabilityOptions
         /// Client supports the follow content formats for the content property. The order describes the preferred format of the client.
         /// </summary>
         [Optional]
-        public Container<MarkupKind> DocumentationFormat { get; set; }
+        public Container<MarkupKind>? DocumentationFormat { get; set; }
 
-        [Optional] public SignatureParameterInformationCapabilityOptions ParameterInformation { get; set; }
+        [Optional] public SignatureParameterInformationCapabilityOptions? ParameterInformation { get; set; }
 
         /// <summary>
         /// The client support the `activeParameter` property on `SignatureInformation`

src/Protocol/Client/Capabilities/SymbolKindCapabilityOptions.cs

@@ -19,6 +19,6 @@ public class SymbolKindCapabilityOptions
         /// the initial version of the protocol.
         /// </summary>
         [Optional]
-        public Container<SymbolKind> ValueSet { get; set; }
+        public Container<SymbolKind>? ValueSet { get; set; }
     }
 }

src/Protocol/Client/Capabilities/TagSupportCapabilityOptions.cs

@@ -17,6 +17,6 @@ public class TagSupportCapabilityOptions
         /// The tags supported by the client.
         /// </summary>
         [Obsolete(Constants.Proposal)]
-        public Container<SymbolTag> ValueSet { get; set; }
+        public Container<SymbolTag> ValueSet { get; set; } = null!;
     }
 }