readd setting of capabilities

Author: david-driscoll

src/Server/HandlerCollection.cs

@@ -135,7 +135,8 @@ private HandlerDescriptor GetDescriptor(string method, Type handlerType, IJsonRp
 
                 if (_supportedCapabilities.AllowsDynamicRegistration(capabilityType))
                 {
-                    registration = new Registration() {
+                    registration = new Registration()
+                    {
                         Id = Guid.NewGuid().ToString(),
                         Method = method,
                         RegisterOptions = registrationOptions
@@ -162,7 +163,7 @@ private HandlerDescriptor GetDescriptor(string method, Type handlerType, IJsonRp
 
             if (string.IsNullOrWhiteSpace(key)) key = "default";
 
-            return new HandlerDescriptor(
+            var descriptor = new HandlerDescriptor(
                 method,
                 key,
                 handler,
@@ -171,10 +172,15 @@ private HandlerDescriptor GetDescriptor(string method, Type handlerType, IJsonRp
                 registrationType,
                 registration,
                 capabilityType,
-                () => {
-                    _handlers.RemoveWhere(descriptor => descriptor.Handler == handler);
-                    _textDocumentIdentifiers.RemoveWhere(descriptor => descriptor.Handler == handler);
+                () =>
+                {
+                    _handlers.RemoveWhere(d => d.Handler == handler);
+                    _textDocumentIdentifiers.RemoveWhere(d => d.Handler == handler);
                 });
+
+            LspHandlerDescriptorHelpers.InitializeHandler(descriptor, _supportedCapabilities, handler);
+
+            return descriptor;
         }
 
         private Type UnwrapGenericType(Type genericType, Type type)

src/Server/ISupportedCapabilities.cs

@@ -1,4 +1,5 @@
 using System;
+using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Server.Abstractions;
 
 namespace OmniSharp.Extensions.LanguageServer.Server
@@ -7,5 +8,7 @@ public interface ISupportedCapabilities
     {
         bool AllowsDynamicRegistration(ILspHandlerDescriptor descriptor);
         bool AllowsDynamicRegistration(Type capabilityType);
+        void SetCapability(ILspHandlerDescriptor descriptor, IJsonRpcHandler handler);
     }
+
 }

src/Server/LspHandlerDescriptorHelpers.cs

@@ -10,7 +10,7 @@ namespace OmniSharp.Extensions.LanguageServer.Server
 {
     static class LspHandlerDescriptorHelpers
     {
-        public static IJsonRpcHandler InitializeHandler(ILspHandlerDescriptor descriptor, SupportedCapabilities supportedCapabilities, IJsonRpcHandler handler)
+        public static IJsonRpcHandler InitializeHandler(ILspHandlerDescriptor descriptor, ISupportedCapabilities supportedCapabilities, IJsonRpcHandler handler)
         {
             supportedCapabilities.SetCapability(descriptor, handler);
             return handler;

test/Lsp.Tests/ClientCapabilityProviderFixture.cs

@@ -1,5 +1,6 @@
 using System;
 using NSubstitute;
+using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
@@ -18,7 +19,7 @@ public ClientCapabilityProviderFixture()
             var handler = Substitute.For<IExecuteCommandHandler>();
             handler.GetRegistrationOptions().Returns(new ExecuteCommandRegistrationOptions());
 
-            var handlerCollection = new HandlerCollection(SupportedCapabilitiesFixture.AlwaysTrue) { handler };
+            var handlerCollection = new OmniSharp.Extensions.LanguageServer.Server.HandlerCollection(SupportedCapabilitiesFixture.AlwaysTrue) { handler };
             var capabilityProvider = new ClientCapabilityProvider(handlerCollection);
 
             Provider = capabilityProvider;
@@ -40,13 +41,20 @@ class AlwaysTrueSupportedCapabilities : ISupportedCapabilities
 
             public bool AllowsDynamicRegistration(Type capabilityType) => true;
 
+            public void SetCapability(ILspHandlerDescriptor descriptor, IJsonRpcHandler handler)
+            {
+            }
         }
 
         class AlwaysFalseSupportedCapabilities : ISupportedCapabilities
         {
             public bool AllowsDynamicRegistration(ILspHandlerDescriptor descriptor) => false;
 
             public bool AllowsDynamicRegistration(Type capabilityType) => false;
+
+            public void SetCapability(ILspHandlerDescriptor descriptor, IJsonRpcHandler handler)
+            {
+            }
         }
     }
 }