Merge pull request #147 from OmniSharp/fix/gh141

Added a fix for #141 with test validating that it works

Author: david-driscoll

.gitignore

@@ -41,3 +41,4 @@ tools/*/
 coverage.*.xml
 coverage.json
 coverage.info
+/codealike.json

LSP.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2003
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29025.244
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D764E024-3D3F-4112-B932-2DB722A1BACC}"
 	ProjectSection(SolutionItems) = preProject

src/JsonRpc/IRequestRouter.cs

@@ -5,16 +5,18 @@
 
 namespace OmniSharp.Extensions.JsonRpc
 {
-    public interface IRequestRouter<TDescriptor>
+    public interface IRequestRouter
+    {
+        Task RouteNotification(Notification notification, CancellationToken token);
+        Task<ErrorResponse> RouteRequest(Request request, CancellationToken token);
+        void CancelRequest(object id);
+    }
+
+    public interface IRequestRouter<TDescriptor> : IRequestRouter
     {
         TDescriptor GetDescriptor(Notification notification);
         TDescriptor GetDescriptor(Request request);
-
-        Task RouteNotification(Notification notification, CancellationToken token);
         Task RouteNotification(TDescriptor descriptor, Notification notification, CancellationToken token);
-        Task<ErrorResponse> RouteRequest(Request request, CancellationToken token);
         Task<ErrorResponse> RouteRequest(TDescriptor descriptor, Request request, CancellationToken token);
-
-        void CancelRequest(object id);
     }
 }

src/JsonRpc/RequestRouterBase.cs

@@ -198,12 +198,12 @@ private string GetId(object id)
             return id?.ToString();
         }
 
-        Task IRequestRouter<TDescriptor>.RouteNotification(Notification notification, CancellationToken token)
+        Task IRequestRouter.RouteNotification(Notification notification, CancellationToken token)
         {
             return RouteNotification(GetDescriptor(notification), notification, token);
         }
 
-        Task<ErrorResponse> IRequestRouter<TDescriptor>.RouteRequest(Request request, CancellationToken token)
+        Task<ErrorResponse> IRequestRouter.RouteRequest(Request request, CancellationToken token)
         {
             return RouteRequest(GetDescriptor(request), request, token);
         }

src/Server/LanguageServer.cs

@@ -61,7 +61,14 @@ public static Task<ILanguageServer> From(Action<LanguageServerOptions> optionsAc
         {
             var options = new LanguageServerOptions();
             optionsAction(options);
-            return From(options);
+            return From(options, token);
+        }
+
+        public static ILanguageServer PreInit(Action<LanguageServerOptions> optionsAction)
+        {
+            var options = new LanguageServerOptions();
+            optionsAction(options);
+            return PreInit(options);
         }
 
         public static async Task<ILanguageServer> From(LanguageServerOptions options, CancellationToken token)
@@ -91,6 +98,38 @@ public static async Task<ILanguageServer> From(LanguageServerOptions options, Ca
             return server;
         }
 
+        /// <summary>
+        /// Create the server without connecting to the client
+        ///
+        /// Mainly used for unit testing
+        /// </summary>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public static ILanguageServer PreInit(LanguageServerOptions options)
+        {
+            var server = new LanguageServer(
+                options.Input,
+                options.Output,
+                options.Reciever,
+                options.RequestProcessIdentifier,
+                options.LoggerFactory,
+                options.Serializer,
+                options.Services,
+                options.HandlerTypes.Select(x => x.Assembly)
+                    .Distinct().Concat(options.HandlerAssemblies),
+                options.Handlers,
+                options.NamedHandlers,
+                options.NamedServiceHandlers,
+                options.InitializeDelegates,
+                options.InitializedDelegates
+            );
+
+            if (options.AddDefaultLoggingProvider)
+                options.LoggerFactory.AddProvider(new LanguageServerLoggerProvider(server));
+
+            return server;
+        }
+
         internal LanguageServer(
             Stream input,
             Stream output,
@@ -132,7 +171,9 @@ internal LanguageServer(
             services.AddSingleton<ILanguageServer>(this);
             services.AddTransient<IHandlerMatcher, ExecuteCommandMatcher>();
             services.AddTransient<IHandlerMatcher, ResolveCommandMatcher>();
-            services.AddSingleton<IRequestRouter<ILspHandlerDescriptor>, LspRequestRouter>();
+            services.AddSingleton<LspRequestRouter>();
+            services.AddSingleton<IRequestRouter<ILspHandlerDescriptor>>(_ => _.GetRequiredService<LspRequestRouter>());
+            services.AddSingleton<IRequestRouter<IHandlerDescriptor>>(_ => _.GetRequiredService<LspRequestRouter>());
             services.AddSingleton<IResponseRouter, ResponseRouter>();
             services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ResolveCommandPipeline<,>));
 
@@ -285,7 +326,7 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
                 MinimumLogLevel = LogLevel.Trace;
             }
 
-            _clientVersion = request.Capabilities.GetClientVersion();
+            _clientVersion = request.Capabilities?.GetClientVersion() ?? ClientVersion.Lsp2;
             _serializer.SetClientCapabilities(_clientVersion.Value, request.Capabilities);
 
             var supportedCapabilities = new List<ISupports>();
@@ -312,8 +353,8 @@ async Task<InitializeResult> IRequestHandler<InitializeParams, InitializeResult>
 
             await Task.WhenAll(_initializeDelegates.Select(c => c(this, request)));
 
-            var textDocumentCapabilities = ClientSettings.Capabilities.TextDocument;
-            var workspaceCapabilities = ClientSettings.Capabilities.Workspace;
+            var textDocumentCapabilities = ClientSettings.Capabilities?.TextDocument ?? new TextDocumentClientCapabilities();
+            var workspaceCapabilities = ClientSettings.Capabilities?.Workspace ?? new WorkspaceClientCapabilities();
 
             var ccp = new ClientCapabilityProvider(_collection);
 

src/Server/LspRequestRouter.cs

@@ -19,7 +19,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Server
 {
-    internal class LspRequestRouter : RequestRouterBase<ILspHandlerDescriptor>
+    internal class LspRequestRouter : RequestRouterBase<ILspHandlerDescriptor>, IRequestRouter<IHandlerDescriptor>
     {
         private readonly IEnumerable<ILspHandlerDescriptor> _collection;
         private readonly IEnumerable<IHandlerMatcher> _handlerMatchers;
@@ -68,6 +68,18 @@ private ILspHandlerDescriptor FindDescriptor(string method, JToken @params)
 
             return _handlerMatchers.SelectMany(strat => strat.FindHandler(paramsValue, lspHandlerDescriptors)).FirstOrDefault() ?? descriptor;
         }
-
+        
+        IHandlerDescriptor IRequestRouter<IHandlerDescriptor>.GetDescriptor(Notification notification) => GetDescriptor(notification);
+        IHandlerDescriptor IRequestRouter<IHandlerDescriptor>.GetDescriptor(Request request) => GetDescriptor(request);
+        Task IRequestRouter<IHandlerDescriptor>.RouteNotification(IHandlerDescriptor descriptor, Notification notification, CancellationToken token) =>
+            RouteNotification(
+                descriptor is ILspHandlerDescriptor d ? d : throw new Exception("This should really never happen, seriously, only hand this correct descriptors"),
+                notification,
+                token);
+        Task<ErrorResponse> IRequestRouter<IHandlerDescriptor>.RouteRequest(IHandlerDescriptor descriptor, Request request, CancellationToken token) =>
+            RouteRequest(
+                descriptor is ILspHandlerDescriptor d ? d : throw new Exception("This should really never happen, seriously, only hand this correct descriptors"),
+                request,
+                token);
     }
 }

test/Lsp.Tests/LanguageServerTests.cs

@@ -2,10 +2,14 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using FluentAssertions;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
+using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.LanguageServer.Client;
 using OmniSharp.Extensions.LanguageServer.Client.Processes;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 using OmniSharp.Extensions.LanguageServer.Server;
 using Xunit;
@@ -19,7 +23,7 @@ public LanguageServerTests(ITestOutputHelper testOutputHelper) : base(testOutput
         {
         }
 
-        [Fact(Skip="Disabled to see if build passes on ci")]
+        [Fact(Skip = "Disabled to see if build passes on ci")]
         public async Task Works_With_IWorkspaceSymbolsHandler()
         {
             var process = new NamedPipeServerProcess(Guid.NewGuid().ToString("N"), LoggerFactory);
@@ -50,5 +54,24 @@ await Task.WhenAll(
             var server = await serverStart;
             server.AddHandlers(handler);
         }
+
+        [Fact]
+        public async Task GH141_CrashesWithEmptyInitializeParams()
+        {
+            var process = new NamedPipeServerProcess(Guid.NewGuid().ToString("N"), LoggerFactory);
+            await process.Start();
+            var server = LanguageServer.PreInit(x => x
+                .WithInput(process.ClientOutputStream)
+                .WithOutput(process.ClientInputStream)
+                .WithLoggerFactory(LoggerFactory)
+                .AddDefaultLoggingProvider()
+                .WithMinimumLogLevel(LogLevel.Trace)
+            ) as IRequestHandler<InitializeParams, InitializeResult>;
+
+            var handler = server as IRequestHandler<InitializeParams, InitializeResult>;
+
+            Func<Task> a = async () => await handler.Handle(new InitializeParams() { }, CancellationToken.None);
+            a.Should().NotThrow();
+        }
     }
 }