Started on support for manyhandlers, needs unit tests to verify working as intedned

Author: david-driscoll

src/Lsp/LspRequestRouter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
@@ -18,7 +19,7 @@ namespace OmniSharp.Extensions.LanguageServer
     class LspRequestRouter : IRequestRouter
     {
         private readonly IHandlerCollection _collection;
-        private ITextDocumentSyncHandler _textDocumentSyncHandler;
+        private ITextDocumentSyncHandler[] _textDocumentSyncHandlers;
         private readonly ConcurrentDictionary<string, CancellationTokenSource> _requests = new ConcurrentDictionary<string, CancellationTokenSource>();
 
         public LspRequestRouter(IHandlerCollection collection)
@@ -46,19 +47,20 @@ private ILspHandlerDescriptor FindDescriptor(string method, JToken @params)
             var descriptor = _collection.FirstOrDefault(x => x.Method == method);
             if (descriptor is null) return null;
 
-            if (_textDocumentSyncHandler == null)
+            if (_textDocumentSyncHandlers == null)
             {
-                _textDocumentSyncHandler = _collection
+                _textDocumentSyncHandlers = _collection
                     .Select(x => x.Handler is ITextDocumentSyncHandler r ? r : null)
-                    .FirstOrDefault(x => x != null);
+                    .Where(x => x != null)
+                    .ToArray();
             }
 
-            if (_textDocumentSyncHandler is null) return descriptor;
-
             if (typeof(ITextDocumentIdentifierParams).GetTypeInfo().IsAssignableFrom(descriptor.Params))
             {
                 var textDocumentIdentifierParams = @params.ToObject(descriptor.Params) as ITextDocumentIdentifierParams;
-                var attributes = _textDocumentSyncHandler.GetTextDocumentAttributes(textDocumentIdentifierParams.TextDocument.Uri);
+                var attributes = _textDocumentSyncHandlers
+                    .Select(x => x.GetTextDocumentAttributes(textDocumentIdentifierParams.TextDocument.Uri))
+                    .Where(x => x != null);
 
                 return GetHandler(method, attributes);
             }
@@ -75,6 +77,13 @@ private ILspHandlerDescriptor FindDescriptor(string method, JToken @params)
             return descriptor;
         }
 
+        private ILspHandlerDescriptor GetHandler(string method, IEnumerable<TextDocumentAttributes> attributes)
+        {
+            return attributes
+                .Select(x => GetHandler(method, x))
+                .FirstOrDefault(x => x != null);
+        }
+
         private ILspHandlerDescriptor GetHandler(string method, TextDocumentAttributes attributes)
         {
             foreach (var handler in _collection.Where(x => x.Method == method))

vscode-testextension/src/extension.ts

@@ -7,13 +7,14 @@
 import * as path from 'path';
 
 import { workspace, Disposable, ExtensionContext } from 'vscode';
-import { LanguageClient, LanguageClientOptions, SettingMonitor, ServerOptions, TransportKind } from 'vscode-languageclient';
+import { LanguageClient, LanguageClientOptions, SettingMonitor, ServerOptions, TransportKind, InitializeParams } from 'vscode-languageclient';
+import { Trace } from 'vscode-jsonrpc';
 
 export function activate(context: ExtensionContext) {
 
     // The server is implemented in node
-    // let serverExe = 'D:/Development/Omnisharp/omnisharp-roslyn/bin/Debug/OmniSharp.Stdio/net46/OmniSharp.exe';
-    let serverExe = 'D:/Development/Omnisharp/omnisharp-roslyn/artifacts/publish/OmniSharp.Stdio/win7-x64/OmniSharp.exe';
+    let serverExe = 'C:/other/omnisharp-roslyn/bin/Debug/OmniSharp.Stdio/net46/OmniSharp.exe';
+    // let serverExe = 'C:/other/omnisharp-roslyn/artifacts/publish/OmniSharp.Stdio/win7-x64/OmniSharp.exe';
     // let serverExe = context.asAbsolutePath('D:/Development/Omnisharp/omnisharp-roslyn/artifacts/publish/OmniSharp.Stdio/win7-x64/OmniSharp.exe');
     // The debug options for the server
     // let debugOptions = { execArgv: ['-lsp', '-d' };5
@@ -40,11 +41,12 @@ export function activate(context: ExtensionContext) {
             configurationSection: 'languageServerExample',
             // Notify the server about file changes to '.clientrc files contain in the workspace
             fileEvents: workspace.createFileSystemWatcher('**/.clientrc')
-        }
+        },
     }
 
     // Create the language client and start the client.
     const client = new LanguageClient('languageServerExample', 'Language Server Example', serverOptions, clientOptions);
+    client.trace = Trace.Verbose;
     let disposable = client.start();
 
     // Push the disposable to the context's subscriptions so that the