Updated to support mutliple handlers for a given handler type (which allows for mutliple files

Author: david-driscoll

src/Lsp/HandlerCollection.cs

@@ -32,6 +32,7 @@ public IDisposable Add(IJsonRpcHandler handler)
                 .Where(x => !string.IsNullOrWhiteSpace(LspHelper.GetMethodName(x))))
             {
                 var @interface = GetHandlerInterface(implementedInterface);
+                if (@interface == null) continue;
                 var registration = UnwrapGenericType(typeof(IRegistration<>), implementedInterface);
                 var capability = UnwrapGenericType(typeof(ICapability<>), implementedInterface);
 
@@ -50,12 +51,9 @@ public IDisposable Add(IJsonRpcHandler handler)
                     capability,
                     () => _handlers.RemoveWhere(instance => instance.Handler == handler));
 
-                handlers.Add(h);
+                _handlers.Add(h);
             }
 
-            foreach (var a in handlers)
-                _handlers.Add(a);
-
             return new ImutableDisposable(handlers);
         }
 
@@ -96,4 +94,4 @@ private Type UnwrapGenericType(Type genericType, Type type)
                 ?.GetGenericArguments()[0];
         }
     }
-}
+}

src/Lsp/HandlerDescriptor.cs

@@ -10,6 +10,7 @@ namespace OmniSharp.Extensions.LanguageServer
     class HandlerDescriptor : ILspHandlerDescriptor, IDisposable
     {
         private readonly Action _disposeAction;
+        private readonly Guid _id = Guid.NewGuid();
 
         public HandlerDescriptor(string method, IJsonRpcHandler handler, Type handlerType, Type @params, Type registrationType, Type capabilityType, Action disposeAction)
         {
@@ -94,14 +95,14 @@ public override bool Equals(object obj)
         {
             if (obj is HandlerDescriptor handler)
             {
-                return handler.HandlerType == HandlerType;
+                return handler._id == _id;
             }
             return false;
         }
 
         public override int GetHashCode()
         {
-            return HandlerType.GetHashCode();
+            return _id.GetHashCode();
         }
     }
-}
+}

test/Lsp.Tests/HandlerResolverTests.cs

@@ -19,10 +19,10 @@ public class HandlerResolverTests
         [Theory]
         [InlineData(typeof(IInitializeHandler), "initialize", 1)]
         [InlineData(typeof(IInitializedHandler), "initialized", 1)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didOpen", 4)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didChange", 4)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didClose", 4)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didSave", 4)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didOpen", 5)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didChange", 5)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didClose", 5)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didSave", 5)]
         public void Should_Contain_AllDefinedMethods(Type requestHandler, string key, int count)
         {
             var handler = new HandlerCollection();