Changed around how handlers are created

Author: david-driscoll

src/Lsp/HandlerCollection.cs

@@ -23,14 +23,14 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetEnumerator();
         }
 
-        public IDisposable Add(params IJsonRpcHandler[] handlers)
+        public IDisposable Add(IEnumerable<IJsonRpcHandler> handlers)
         {
-            return Add(handlers.AsEnumerable());
+            return Add(handlers.ToArray());
         }
 
-        public IDisposable Add(IEnumerable<IJsonRpcHandler> handlers)
+        public IDisposable Add(params IJsonRpcHandler[] handlers)
         {
-            var descriptors = new List<HandlerDescriptor>();
+            var descriptors = new HashSet<HandlerDescriptor>();
             foreach (var handler in handlers)
             {
                 foreach (var implementedInterface in handler.GetType().GetTypeInfo()
@@ -65,11 +65,15 @@ public IDisposable Add(IEnumerable<IJsonRpcHandler> handlers)
                         () => _handlers.RemoveWhere(instance => instance.Handler == handler));
 
                     descriptors.Add(h);
-                    _handlers.Add(h);
                 }
             }
 
-            return new ImutableDisposable(descriptors);
+            foreach (var handler in descriptors)
+            {
+                _handlers.Add(handler);
+            }
+
+            return new ImmutableDisposable(descriptors);
         }
 
         private Type UnwrapGenericType(Type genericType, Type type)

src/Lsp/ImutableDisposable.cs renamed to src/Lsp/ImmutableDisposable.cs

@@ -3,16 +3,16 @@
 
 namespace OmniSharp.Extensions.LanguageServer
 {
-    class ImutableDisposable : IDisposable
+    class ImmutableDisposable : IDisposable
     {
         private readonly IEnumerable<IDisposable> _instances;
 
-        public ImutableDisposable(IEnumerable<IDisposable> instances)
+        public ImmutableDisposable(IEnumerable<IDisposable> instances)
         {
             _instances = instances;
         }
 
-        public ImutableDisposable(params IDisposable[] instances)
+        public ImmutableDisposable(params IDisposable[] instances)
         {
             _instances = instances;
         }
@@ -25,4 +25,4 @@ public void Dispose()
             }
         }
     }
-}
+}

src/Lsp/LanguageServer.cs

@@ -60,16 +60,16 @@ public IDisposable AddHandler(IJsonRpcHandler handler)
             return AddHandler(handler);
         }
 
-        public IDisposable AddHandlers(params IJsonRpcHandler[] handlers)
+        public IDisposable AddHandlers(IEnumerable<IJsonRpcHandler> handlers)
         {
-            return AddHandlers(handlers.AsEnumerable());
+            return AddHandlers(handlers.ToArray());
         }
 
-        public IDisposable AddHandlers(IEnumerable<IJsonRpcHandler> handlers)
+        public IDisposable AddHandlers(params IJsonRpcHandler[] handlers)
         {
             var handlerDisposable = _collection.Add(handlers);
 
-            return new ImutableDisposable(
+            return new ImmutableDisposable(
                 handlerDisposable,
                 new Disposable(() =>
                 {