Removed key, not needed, and use the text registration options

Author: david-driscoll

sample/SampleServer/Program.cs

@@ -65,8 +65,6 @@ public TextDocumentHandler(ILanguageServer router)
             OpenClose = true
         };
 
-        public string Key => (string)_documentSelector;
-
         public Task Handle(DidChangeTextDocumentParams notification)
         {
             _router.LogMessage(new LogMessageParams()

src/JsonRpc/IJsonRpcHandler.cs

@@ -3,8 +3,5 @@
     /// <summary>
     /// A simple marker interface to use for storing handlings (which will be cast out later)
     /// </summary>
-    public interface IJsonRpcHandler
-    {
-        string Key { get; }
-    }
+    public interface IJsonRpcHandler { }
 }

src/JsonRpc/IRequestRouter.cs

@@ -8,7 +8,5 @@ public interface IRequestRouter
     {
         void RouteNotification(Notification notification);
         Task<ErrorResponse> RouteRequest(Request request);
-
-        IDisposable Add(IJsonRpcHandler handler);
     }
-}
+}

src/Lsp/Abstractions/IRegistration.cs

@@ -1,7 +1,7 @@
 namespace OmniSharp.Extensions.LanguageServer.Abstractions
 {
-    public interface IRegistration<TOptions>
+    public interface IRegistration<out TOptions>
     {
         TOptions GetRegistrationOptions();
     }
-}
+}

src/Lsp/HandlerCollection.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Abstractions;
+using OmniSharp.Extensions.LanguageServer.Models;
 
 namespace OmniSharp.Extensions.LanguageServer
 {
@@ -46,8 +47,16 @@ public IDisposable Add(IEnumerable<IJsonRpcHandler> handlers)
                         @params = @interface.GetTypeInfo().GetGenericArguments()[0];
                     }
 
+                    var key = "default";
+                    if (handler is IRegistration<TextDocumentRegistrationOptions> textDocumentRegistration)
+                    {
+                        var options = textDocumentRegistration.GetRegistrationOptions();
+                        key = options.DocumentSelector;
+                    }
+
                     var h = new HandlerDescriptor(
                         LspHelper.GetMethodName(implementedInterface),
+                        key,
                         handler,
                         @interface,
                         @params,

src/Lsp/HandlerDescriptor.cs

@@ -11,11 +11,12 @@ class HandlerDescriptor : ILspHandlerDescriptor, IDisposable
     {
         private readonly Action _disposeAction;
 
-        public HandlerDescriptor(string method, IJsonRpcHandler handler, Type handlerType, Type @params, Type registrationType, Type capabilityType, Action disposeAction)
+        public HandlerDescriptor(string method, string key, IJsonRpcHandler handler, Type handlerType, Type @params, Type registrationType, Type capabilityType, Action disposeAction)
         {
             _disposeAction = disposeAction;
             Handler = handler;
             Method = method;
+            Key = key;
             HandlerType = handlerType;
             Params = @params;
             RegistrationType = registrationType;
@@ -70,6 +71,7 @@ public void SetCapability(object instance)
         }
 
         public string Method { get; }
+        public string Key { get; }
         public Type Params { get; }
 
         public bool IsDynamicCapability => typeof(DynamicCapability).GetTypeInfo().IsAssignableFrom(CapabilityType);
@@ -94,15 +96,14 @@ public override bool Equals(object obj)
         {
             if (obj is HandlerDescriptor handler)
             {
-                return handler.HandlerType == HandlerType && handler.Handler.Key == Handler.Key;
+                return handler.HandlerType == HandlerType && handler.Key == Key;
             }
             return false;
         }
 
         public override int GetHashCode()
         {
-            if (string.IsNullOrWhiteSpace(Handler.Key)) return HandlerType.GetHashCode();
-            return Tuple.Create(HandlerType, Handler.Key).GetHashCode();
+            return Tuple.Create(HandlerType, Key).GetHashCode();
         }
     }
 }

src/Lsp/Handlers/CancelRequestHandler.cs

@@ -13,8 +13,6 @@ internal CancelRequestHandler(LspRequestRouter requestRouter)
             _requestRouter = requestRouter;
         }
 
-        public string Key => nameof(ICancelRequestHandler);
-
         public Task Handle(CancelParams notification)
         {
             _requestRouter.CancelRequest(notification.Id);

src/Lsp/Handlers/ExitHandler.cs

@@ -12,8 +12,6 @@ public ExitHandler(ShutdownHandler shutdownHandler)
             _shutdownHandler = shutdownHandler;
         }
 
-        public string Key => nameof(IExitHandler);
-
         public Task Handle()
         {
             Exit?.Invoke(_shutdownHandler.ShutdownRequested ? 0 : 1);

src/Lsp/Handlers/ShutdownHandler.cs

@@ -6,8 +6,6 @@ namespace OmniSharp.Extensions.LanguageServer.Handlers
 {
     public class ShutdownHandler : IShutdownHandler, IAwaitableTermination
     {
-        public string Key => nameof(IShutdownHandler);
-
         public Task Handle()
         {
             ShutdownRequested = true;

src/Lsp/LanguageServer.cs

@@ -38,12 +38,7 @@ public LanguageServer(Stream input, Stream output)
         {
         }
 
-        internal LanguageServer(
-            Stream input,
-            IOutputHandler output,
-            LspReciever reciever,
-            IRequestProcessIdentifier requestProcessIdentifier
-        )
+        internal LanguageServer(Stream input, IOutputHandler output, LspReciever reciever, IRequestProcessIdentifier requestProcessIdentifier)
         {
             _reciever = reciever;
             _requestRouter = new LspRequestRouter(_collection);
@@ -53,18 +48,13 @@ IRequestProcessIdentifier requestProcessIdentifier
             _exitHandler = new ExitHandler(_shutdownHandler);
 
             _disposable.Add(
-                AddHandler(this),
-                AddHandler(_shutdownHandler),
-                AddHandler(_exitHandler),
-                AddHandler(new CancelRequestHandler(_requestRouter))
+                AddHandlers(this, _shutdownHandler, _exitHandler, new CancelRequestHandler(_requestRouter))
             );
         }
 
         public InitializeParams Client { get; private set; }
         public InitializeResult Server { get; private set; }
 
-        public string Key => nameof(ILanguageServer);
-
         public IDisposable AddHandler(IJsonRpcHandler handler)
         {
             return AddHandler(handler);
@@ -91,7 +81,10 @@ public IDisposable AddHandlers(IEnumerable<IJsonRpcHandler> handlers)
                         .Where(x => x != null))
                     .ToArray();
 
-                    Task.Run(() => this.UnregisterCapability(new UnregistrationParams() { Unregisterations = foundItems }));
+                    Task.Run(() => this.UnregisterCapability(new UnregistrationParams()
+                    {
+                        Unregisterations = foundItems
+                    }));
                 }));
         }