Removed ConnectedCapability interface as it isn't needed any more (#465)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: david-driscoll

src/Protocol/Client/Capabilities/ConnectedCapability.cs

@@ -3,7 +3,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class DynamicCapability : IDynamicCapability
+    public abstract class DynamicCapability : IDynamicCapability
     {
         /// <summary>
         /// Whether completion supports dynamic registration.

src/Protocol/Client/Capabilities/DynamicCapability.cs

@@ -389,7 +389,7 @@ public readonly partial struct CodeActionKind
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.CodeAction))]
-        public partial class CodeActionCapability : DynamicCapability, ConnectedCapability<ICodeActionHandler>
+        public partial class CodeActionCapability : DynamicCapability
         {
             /// <summary>
             /// The client support code action literals as a valid

src/Protocol/Features/Document/CodeActionFeature.cs

@@ -125,7 +125,7 @@ public partial record CodeLensRefreshParams : IRequest
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.CodeLens))]
-        public partial class CodeLensCapability : DynamicCapability, ConnectedCapability<ICodeLensHandler>
+        public partial class CodeLensCapability : DynamicCapability
         {
         }
 

src/Protocol/Features/Document/CodeLensFeature.cs

@@ -135,7 +135,7 @@ public partial class DocumentColorRegistrationOptions : IWorkDoneProgressOptions
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.ColorProvider))]
-        public partial class ColorProviderCapability : DynamicCapability, ConnectedCapability<IDocumentColorHandler>, ConnectedCapability<IColorPresentationHandler>
+        public partial class ColorProviderCapability : DynamicCapability
         {
         }
     }

src/Protocol/Features/Document/ColorFeature.cs

@@ -424,7 +424,7 @@ public CompletionList(bool isIncomplete, params CompletionItem<T>[] items) : bas
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Completion))]
-        public partial class CompletionCapability : DynamicCapability, ConnectedCapability<ICompletionHandler>
+        public partial class CompletionCapability : DynamicCapability
         {
             /// <summary>
             /// The client supports the following `CompletionItem` specific

src/Protocol/Features/Document/CompletionFeature.cs

@@ -31,7 +31,7 @@ public partial class DeclarationRegistrationOptions : ITextDocumentRegistrationO
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Declaration))]
-        public partial class DeclarationCapability : LinkSupportCapability, ConnectedCapability<IDeclarationHandler>
+        public partial class DeclarationCapability : LinkSupportCapability
         {
         }
     }

src/Protocol/Features/Document/DeclarationFeature.cs

@@ -33,7 +33,7 @@ public partial class DefinitionRegistrationOptions : ITextDocumentRegistrationOp
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Definition))]
-        public partial class DefinitionCapability : LinkSupportCapability, ConnectedCapability<IDefinitionHandler>
+        public partial class DefinitionCapability : LinkSupportCapability
         {
         }
     }

src/Protocol/Features/Document/DefinitionFeature.cs

@@ -41,7 +41,7 @@ public partial class DocumentFormattingRegistrationOptions : ITextDocumentRegist
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Formatting))]
-        public partial class DocumentFormattingCapability : DynamicCapability, ConnectedCapability<IDocumentFormattingHandler>
+        public partial class DocumentFormattingCapability : DynamicCapability
         {
         }
     }

src/Protocol/Features/Document/DocumentFormattingFeature.cs

@@ -77,7 +77,7 @@ public partial class DocumentHighlightRegistrationOptions : ITextDocumentRegistr
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.DocumentHighlight))]
-        public partial class DocumentHighlightCapability : DynamicCapability, ConnectedCapability<IDocumentHighlightHandler>
+        public partial class DocumentHighlightCapability : DynamicCapability
         {
         }
     }

src/Protocol/Features/Document/DocumentHighlightFeature.cs

@@ -116,7 +116,7 @@ public DocumentLinkRegistrationOptionsConverter(IHandlersManager handlersManager
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.DocumentLink))]
-        public partial class DocumentLinkCapability : DynamicCapability, ConnectedCapability<IDocumentLinkHandler>
+        public partial class DocumentLinkCapability : DynamicCapability
         {
             /// <summary>
             /// Whether the client support the `tooltip` property on `DocumentLink`.

src/Protocol/Features/Document/DocumentLinkFeature.cs

@@ -66,7 +66,7 @@ public partial class DocumentOnTypeFormattingRegistrationOptions : ITextDocument
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.OnTypeFormatting))]
-        public partial class DocumentOnTypeFormattingCapability : DynamicCapability, ConnectedCapability<IDocumentOnTypeFormattingHandler>
+        public partial class DocumentOnTypeFormattingCapability : DynamicCapability
         {
         }
     }

src/Protocol/Features/Document/DocumentOnTypeFormattingFeature.cs

@@ -48,7 +48,7 @@ public partial class DocumentRangeFormattingRegistrationOptions : ITextDocumentR
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.RangeFormatting))]
-        public partial class DocumentRangeFormattingCapability : DynamicCapability, ConnectedCapability<IDocumentRangeFormattingHandler>
+        public partial class DocumentRangeFormattingCapability : DynamicCapability
         {
         }
     }

src/Protocol/Features/Document/DocumentRangeFormattingFeature.cs

@@ -154,7 +154,7 @@ public partial class DocumentSymbolRegistrationOptions : ITextDocumentRegistrati
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.DocumentSymbol))]
-        public partial class DocumentSymbolCapability : DynamicCapability, ConnectedCapability<IDocumentSymbolHandler>
+        public partial class DocumentSymbolCapability : DynamicCapability
         {
             /// <summary>
             /// Specific capabilities for the `SymbolKind` in the `textDocument/symbol` request.

src/Protocol/Features/Document/DocumentSymbolFeature.cs

@@ -119,7 +119,7 @@ public partial class FoldingRangeRegistrationOptions : ITextDocumentRegistration
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.FoldingRange))]
-        public partial class FoldingRangeCapability : DynamicCapability, ConnectedCapability<IFoldingRangeHandler>
+        public partial class FoldingRangeCapability : DynamicCapability
         {
             /// <summary>
             /// The maximum number of folding ranges that the client prefers to receive per document. The value serves as a

src/Protocol/Features/Document/FoldingRangeFeature.cs

@@ -59,7 +59,7 @@ public partial class HoverRegistrationOptions : ITextDocumentRegistrationOptions
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Hover))]
-        public partial class HoverCapability : DynamicCapability, ConnectedCapability<IHoverHandler>
+        public partial class HoverCapability : DynamicCapability
         {
             /// <summary>
             /// Client supports the follow content formats for the content property. The order describes the preferred format of the client.

src/Protocol/Features/Document/HoverFeature.cs

@@ -30,7 +30,7 @@ public partial class ImplementationRegistrationOptions : ITextDocumentRegistrati
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Implementation))]
-        public partial class ImplementationCapability : LinkSupportCapability, ConnectedCapability<IImplementationHandler>
+        public partial class ImplementationCapability : LinkSupportCapability
         {
         }
     }

src/Protocol/Features/Document/ImplementationFeature.cs

@@ -56,7 +56,7 @@ namespace Client.Capabilities
     {
         [Obsolete(Constants.Proposal)]
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.LinkedEditingRange))]
-        public partial class LinkedEditingRangeClientCapabilities : DynamicCapability, ConnectedCapability<ILinkedEditingRangeHandler> { }
+        public partial class LinkedEditingRangeClientCapabilities : DynamicCapability { }
     }
 
     namespace Document

src/Protocol/Features/Document/LinkedEditingRangeFeature.cs

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

src/Protocol/Features/Document/Proposals/CallHierarchyFeature.cs

@@ -627,9 +627,7 @@ namespace Client.Capabilities
         /// </summary>
         [Obsolete(Constants.Proposal)]
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.SemanticTokens))]
-        public partial class SemanticTokensCapability : DynamicCapability, ConnectedCapability<ISemanticTokensFullHandler>,
-                                                        ConnectedCapability<ISemanticTokensDeltaHandler>, ConnectedCapability<ISemanticTokensRangeHandler>,
-                                                        ConnectedCapability<ISemanticTokensRefreshHandler>
+        public partial class SemanticTokensCapability : DynamicCapability
         {
             /// <summary>
             /// Which requests the client supports and might send to the server.

src/Protocol/Features/Document/Proposals/SemanticTokensFeature.cs

@@ -39,7 +39,7 @@ public partial class ReferenceRegistrationOptions : ITextDocumentRegistrationOpt
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.References))]
-        public partial class ReferenceCapability : DynamicCapability, ConnectedCapability<IReferencesHandler>
+        public partial class ReferenceCapability : DynamicCapability
         {
         }
     }

src/Protocol/Features/Document/ReferencesFeature.cs

@@ -154,7 +154,7 @@ public partial class RenameRegistrationOptions : ITextDocumentRegistrationOption
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Rename))]
-        public class RenameCapability : DynamicCapability, ConnectedCapability<IRenameHandler>
+        public class RenameCapability : DynamicCapability
         {
             /// <summary>
             /// Client supports testing for validity of rename operations

src/Protocol/Features/Document/RenameFeature.cs

@@ -61,7 +61,7 @@ public partial class SelectionRangeRegistrationOptions : ITextDocumentRegistrati
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.SelectionRange))]
-        public partial class SelectionRangeCapability : DynamicCapability, ConnectedCapability<ISelectionRangeHandler>
+        public partial class SelectionRangeCapability : DynamicCapability
         {
             /// <summary>
             /// The maximum number of folding ranges that the client prefers to receive per document. The value serves as a

src/Protocol/Features/Document/SelectionRangeFeature.cs

@@ -241,7 +241,7 @@ public partial class SignatureHelpRegistrationOptions : ITextDocumentRegistratio
 
     namespace Client.Capabilities
     {
-        public partial class SignatureHelpCapability : DynamicCapability, ConnectedCapability<ISignatureHelpHandler>
+        public partial class SignatureHelpCapability : DynamicCapability
         {
             /// <summary>
             /// The client supports the following `SignatureInformation`

src/Protocol/Features/Document/SignatureHelpFeature.cs

@@ -336,13 +336,8 @@ public partial class TextDocumentWillSaveWaitUntilRegistrationOptions : ITextDoc
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.Synchronization))]
-        public class SynchronizationCapability : DynamicCapability,
-                                                 ConnectedCapability<IDidChangeTextDocumentHandler>,
-                                                 ConnectedCapability<IDidCloseTextDocumentHandler>,
-                                                 ConnectedCapability<IDidOpenTextDocumentHandler>,
-                                                 ConnectedCapability<IDidSaveTextDocumentHandler>,
-                                                 ConnectedCapability<IWillSaveTextDocumentHandler>,
-                                                 ConnectedCapability<IWillSaveWaitUntilTextDocumentHandler>
+        public class SynchronizationCapability : DynamicCapability
+
         {
             /// <summary>
             /// The client supports sending will save notifications.

src/Protocol/Features/Document/TextDocumentSyncFeature.cs

@@ -31,7 +31,7 @@ public partial class TypeDefinitionRegistrationOptions : ITextDocumentRegistrati
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(TextDocumentClientCapabilities.TypeDefinition))]
-        public partial class TypeDefinitionCapability : LinkSupportCapability, ConnectedCapability<ITypeDefinitionHandler>
+        public partial class TypeDefinitionCapability : LinkSupportCapability
         {
         }
     }

src/Protocol/Features/Document/TypeDefinitionFeature.cs

@@ -84,7 +84,7 @@ public override StaticOptions Convert(ExecuteCommandRegistrationOptions source)
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(WorkspaceClientCapabilities.ExecuteCommand))]
-        public class ExecuteCommandCapability : DynamicCapability, ConnectedCapability<IExecuteCommandHandler>
+        public class ExecuteCommandCapability : DynamicCapability
         {
         }
     }

src/Protocol/Features/Workspace/ExecuteCommandFeature.cs

@@ -80,7 +80,7 @@ public partial class WorkspaceSymbolRegistrationOptions : IWorkDoneProgressOptio
     namespace Client.Capabilities
     {
         [CapabilityKey(nameof(ClientCapabilities.TextDocument), nameof(WorkspaceClientCapabilities.Symbol))]
-        public partial class WorkspaceSymbolCapability : DynamicCapability//, ConnectedCapability<IWorkspaceSymbolsHandler>
+        public partial class WorkspaceSymbolCapability : DynamicCapability//
         {
             /// <summary>
             /// Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.

src/Protocol/Features/Workspace/WorkspaceSymbolsFeature.cs

@@ -6,6 +6,7 @@
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using OmniSharp.Extensions.LanguageServer.Protocol.Shared;
 using OmniSharp.Extensions.LanguageServer.Shared;
 
 namespace OmniSharp.Extensions.LanguageServer.Server
@@ -15,28 +16,25 @@ internal class ClientCapabilityProvider
         private readonly IHandlerCollection _collection;
         private readonly bool _supportsProgress;
 
-        public ClientCapabilityProvider(IHandlerCollection collection, bool supportsProgress)
+        public ClientCapabilityProvider(
+        IHandlerCollection collection,
+            bool supportsProgress)
         {
             _collection = collection;
             _supportsProgress = supportsProgress;
         }
 
         public bool HasStaticHandler<T>(Supports<T> capability)
-            where T : ConnectedCapability<IJsonRpcHandler>?, IDynamicCapability?
+            where T : IDynamicCapability?
         {
             // Dynamic registration will cause us to double register things if we report our capabilities statically.
             // However if the client does not tell us it's capabilities we should just assume that they do not support
             // dynamic registrations but we should report any capabilities statically
             if (capability.IsSupported && capability.Value != null && capability.Value.DynamicRegistration) return false;
-
-            var handlerTypes = typeof(T).GetTypeInfo().ImplementedInterfaces
-                                        .Where(x => x.GetTypeInfo().IsGenericType && x.GetTypeInfo().GetGenericTypeDefinition() == typeof(ConnectedCapability<>))
-                                        .Select(x => x.GetTypeInfo().GetGenericArguments()[0].GetTypeInfo());
-
-            return handlerTypes.Any(_collection.ContainsHandler);
+            return _collection.Any(z => z.HasCapability &&z.CapabilityType == typeof(T));
         }
 
-        public IOptionsGetter GetStaticOptions<T>(Supports<T> capability) where T : DynamicCapability?, ConnectedCapability<IJsonRpcHandler>?
+        public IOptionsGetter GetStaticOptions<T>(Supports<T> capability) where T : DynamicCapability
             => !HasStaticHandler(capability) ? Null : new OptionsGetter(_collection, _supportsProgress);
 
         private static readonly IOptionsGetter Null = new NullOptionsGetter();