Merge pull request #21 from OmniSharp/oninit

Added OnInitialize handler

Author: david-driscoll

src/Lsp/Handlers/ShutdownEventHandler.cs

@@ -1,4 +1,4 @@
 namespace OmniSharp.Extensions.LanguageServer.Handlers
 {
     public delegate void ShutdownEventHandler(bool shutdownRequested);
-}
+}

src/Lsp/Handlers/ShutdownHandler.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Abstractions;
 
@@ -18,7 +18,7 @@ public Task Handle()
 
         public bool ShutdownRequested { get; private set; }
 
-        private TaskCompletionSource<bool> shutdownSource = new TaskCompletionSource<bool>(TaskContinuationOptions.LongRunning);
+        private readonly TaskCompletionSource<bool> shutdownSource = new TaskCompletionSource<bool>(TaskContinuationOptions.LongRunning);
         Task IAwaitableTermination.WasShutDown => shutdownSource.Task;
     }
-}
+}

src/Lsp/LanguageServer.cs

@@ -17,11 +17,14 @@
 
 namespace OmniSharp.Extensions.LanguageServer
 {
+    public delegate Task InitializeDelegate(InitializeParams request);
+
     public class LanguageServer : ILanguageServer, IInitializeHandler, IInitializedHandler, IDisposable, IAwaitableTermination
     {
         private readonly Connection _connection;
         private readonly LspRequestRouter _requestRouter;
         private readonly ShutdownHandler _shutdownHandler = new ShutdownHandler();
+        private readonly List<InitializeDelegate> _initializeDelegates = new List<InitializeDelegate>();
         private readonly ExitHandler _exitHandler;
         private ClientVersion? _clientVersion;
         private readonly HandlerCollection _collection = new HandlerCollection();
@@ -94,6 +97,8 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
         {
             Client = request;
 
+            await Task.WhenAll(_initializeDelegates.Select(c => c(request)));
+
             _clientVersion = request.Capabilities.GetClientVersion();
 
             if (_clientVersion == ClientVersion.Lsp3)
@@ -165,6 +170,12 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
             return result;
         }
 
+        public LanguageServer OnInitialize(InitializeDelegate @delegate)
+        {
+            _initializeDelegates.Add(@delegate);
+            return this;
+        }
+
         public Task Handle()
         {
             if (_clientVersion == ClientVersion.Lsp3)

vscode-testextension/src/extension.ts

@@ -12,24 +12,25 @@ import { LanguageClient, LanguageClientOptions, SettingMonitor, ServerOptions, T
 export function activate(context: ExtensionContext) {
 
     // The server is implemented in node
-    let serverExe = context.asAbsolutePath('../sample/SampleServer/bin/Debug/netcoreapp1.1/win7-x64/SampleServer.exe');
+    let serverExe = 'D:/Development/Omnisharp/omnisharp-roslyn/bin/Debug/OmniSharp.Stdio/net46/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: ["--nolazy", "--debug=6009"] };
+    // let debugOptions = { execArgv: ['-lsp', '-d' };
 
     // If the extension is launched in debug mode then the debug server options are used
     // Otherwise the run options are used
     let serverOptions: ServerOptions = {
-        run : { command: serverExe },
-        debug: { command: serverExe, options: debugOptions }
+        run : { command: serverExe, args: ['-lsp'] },
+        debug: { command: serverExe, args: ['-lsp', '-d'] }
     }
 
     // Options to control the language client
     let clientOptions: LanguageClientOptions = {
         // Register the server for plain text documents
-        documentSelector: [{
-            language: 'xml',
-            pattern: '*.csproj'
-        }],
+        // documentSelector: [{
+        //     language: 'xml',
+        //     pattern: '*.csproj'
+        // }],
         synchronize: {
             // Synchronize the setting section 'languageServerExample' to the server
             configurationSection: 'languageServerExample',
@@ -39,7 +40,8 @@ export function activate(context: ExtensionContext) {
     }
 
     // Create the language client and start the client.
-    let disposable = new LanguageClient('languageServerExample', 'Language Server Example', serverOptions, clientOptions).start();
+    const client = new LanguageClient('languageServerExample', 'Language Server Example', serverOptions, clientOptions);
+    let disposable = client.start();
 
     // Push the disposable to the context's subscriptions so that the
     // client can be deactivated on extension deactivation