Additional changes so that notifications get picked up properly

Author: david-driscoll

sample/SampleServer/TextDocumentHandler.cs

@@ -19,8 +19,7 @@ class TextDocumentHandler : ITextDocumentSyncHandler
         private readonly DocumentSelector _documentSelector = new DocumentSelector(
             new DocumentFilter()
             {
-                Pattern = "**/*.csproj",
-                Language = "xml"
+                Pattern = "**/*.cs"
             }
         );
 

src/JsonRpc/InputHandler.cs

@@ -175,7 +175,8 @@ private void HandleRequest(string request)
                     _scheduler.Add(
                         type,
                         item.Request.Method,
-                        async () => {
+                        async () =>
+                        {
                             try
                             {
                                 var result = await _requestRouter.RouteRequest(descriptor, item.Request);
@@ -191,15 +192,17 @@ private void HandleRequest(string request)
                         }
                     );
                 }
-                else if (item.IsNotification)
+
+                if (item.IsNotification)
                 {
                     var descriptor = _requestRouter.GetDescriptor(item.Notification);
                     if (descriptor is null) continue;
                     var type = _requestProcessIdentifier.Identify(descriptor);
                     _scheduler.Add(
                         type,
                         item.Notification.Method,
-                        async () => {
+                        async () =>
+                        {
                             try
                             {
                                 await _requestRouter.RouteNotification(descriptor, item.Notification);
@@ -214,7 +217,8 @@ private void HandleRequest(string request)
                         }
                     );
                 }
-                else if (item.IsError)
+
+                if (item.IsError)
                 {
                     // TODO:
                     _outputHandler.Send(item.Error);

src/JsonRpc/ProcessScheduler.cs

@@ -97,7 +97,7 @@ private void ProcessRequestQueue()
                         {
                             // TODO: Should we rethrow or swallow?
                             // If an exception happens... the whole system could be in a bad state, hence this throwing currently.
-                            _logger.LogCritical(Events.UnhandledException, e, "Unhandled exception executing request {Name}", name);
+                            _logger.LogCritical(Events.UnhandledException, e, "Unhandled exception executing {Name}", name);
                             throw;
                         }
                     }

src/Server/LanguageServer.cs

@@ -232,6 +232,16 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
         {
             ClientSettings = request;
 
+            if (request.Trace == InitializeTrace.Verbose && MinimumLogLevel >= LogLevel.Information)
+            {
+                MinimumLogLevel = LogLevel.Trace;
+            }
+
+            await Task.WhenAll(_initializeDelegates.Select(c => c(request)));
+
+            _clientVersion = request.Capabilities.GetClientVersion();
+            _serializer.SetClientCapabilities(_clientVersion.Value, request.Capabilities);
+
             var supportedCapabilites = new List<ISupports>();
             if (_clientVersion == ClientVersion.Lsp3)
             {
@@ -252,13 +262,8 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
 
             _supportedCapabilities.Add(supportedCapabilites);
 
-            await Task.WhenAll(_initializeDelegates.Select(c => c(request)));
-
             AddHandlers(_serviceProvider.GetServices<IJsonRpcHandler>().ToArray());
 
-            _clientVersion = request.Capabilities.GetClientVersion();
-            _serializer.SetClientCapabilities(_clientVersion.Value, request.Capabilities);
-
             var textDocumentCapabilities = ClientSettings.Capabilities.TextDocument;
             var workspaceCapabilities = ClientSettings.Capabilities.Workspace;
 
@@ -334,7 +339,6 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
 
             await Task.WhenAll(_initializedDelegates.Select(c => c(request, result)));
 
-
             // TODO:
             if (_clientVersion == ClientVersion.Lsp2)
             {
@@ -367,9 +371,8 @@ private async Task DynamicallyRegisterHandlers(Registration[] registrations)
 
             var @params = new RegistrationParams() { Registrations = registrations };
 
-            await _initializeComplete
-                .Select(x => System.Reactive.Unit.Default)
-                .Concat(Observable.Defer(() => Client.RegisterCapability(@params).ToObservable()));
+            await _initializeComplete;
+            await Client.RegisterCapability(@params);
         }
 
         public IObservable<bool> Shutdown => _shutdownHandler.Shutdown;
@@ -452,7 +455,8 @@ public void Add(IEnumerable<ISupports> supports)
         {
             foreach (var item in supports)
             {
-                _supports.Add(item.ValueType, item.Value);
+                if (!_supports.TryGetValue(item.ValueType, out _))
+                    _supports.Add(item.ValueType, item.Value);
             }
         }
 

src/Server/LanguageServerLogger.cs

@@ -35,7 +35,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                 _responseRouter.Window.Log(new LogMessageParams()
                 {
                     Type = messageType,
-                    Message = formatter(state, exception)
+                    Message = formatter(state, exception) + (exception != null ? " - " + exception.ToString() : "")
                 });
             }
         }

src/Server/LspReciever.cs

@@ -34,7 +34,7 @@ public override (IEnumerable<Renor> results, bool hasResponse) GetRequests(JToke
                 {
                     newResults.Add(item);
                 }
-                else if (item.IsNotification && item.Notification.Method == GeneralNames.Exit)
+                else if (item.IsNotification)
                 {
                     newResults.Add(item);
                 }

test/JsonRpc.Tests/Server/SpecifictionRecieverTests.cs

@@ -101,6 +101,13 @@ public override IEnumerable<ValueTuple<string, Renor[]>> GetValues()
                         new Notification("foobar", new JObject())
                     });
 
+                yield return (
+                    @"{""jsonrpc"":""2.0"",""method"":""initialized"",""params"":{}}",
+                    new Renor[] {
+                        new Notification("initialized", new JObject()), 
+                    }
+                );
+
                 yield return (
                     @"{""jsonrpc"": ""2.0"", ""method"": 1, ""params"": ""bar""}",
                     new Renor[]