Merge pull request #156 from OmniSharp/fix-registration

Move registration options to the descriptor

Author: david-driscoll

src/JsonRpc/JsonRpc.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
@@ -13,7 +13,7 @@
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
         <PackageReference Include="Newtonsoft.Json" />
-        <Compile Include="../../submodules/MediatR/src/MediatR/**/*.cs" Exclude="**/AssemblyInfo.cs" Visible="false" />
-        <Compile Include="../../submodules/MediatR.Extensions.Microsoft.DependencyInjection/src/MediatR.Extensions.Microsoft.DependencyInjection/**/*.cs" Exclude="**/AssemblyInfo.cs" Visible="false" />
+        <Compile Include="../../submodules/MediatR/src/MediatR/**/*.cs" Exclude="**/*AssemblyInfo.cs" Visible="false" />
+        <Compile Include="../../submodules/MediatR.Extensions.Microsoft.DependencyInjection/src/MediatR.Extensions.Microsoft.DependencyInjection/**/*.cs" Exclude="**/*AssemblyInfo.cs" Visible="false" />
     </ItemGroup>
 </Project>

src/JsonRpc/RequestRouterBase.cs

@@ -65,7 +65,7 @@ public async Task RouteNotification(TDescriptor descriptor, Notification notific
                                 @params = notification.Params?.ToObject(descriptor.Params, _serializer.JsonSerializer);
                             }
 
-                            await HandleNotification(mediator, descriptor, @params ?? EmptyRequest.Instance, token);
+                            await HandleNotification(mediator, descriptor, @params ?? Activator.CreateInstance(descriptor.Params), token);
                         }
                     }
                     catch (Exception e)

src/Protocol/Models/Registration.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
 

src/Server/Abstractions/ILspHandlerDescriptor.cs

@@ -6,9 +6,11 @@ namespace OmniSharp.Extensions.LanguageServer.Server.Abstractions
 {
     public interface ILspHandlerDescriptor : IHandlerDescriptor
     {
+        Guid Id { get; }
         bool HasRegistration { get; }
         Type RegistrationType { get; }
-        Registration Registration { get; }
+        object RegistrationOptions { get; }
+        bool AllowsDynamicRegistration { get; }
 
         bool HasCapability { get; }
         Type CapabilityType { get; }

src/Server/ClientCapabilityProvider.cs

@@ -92,29 +92,29 @@ public TOptions Get<TInterface, TOptions>(Func<TInterface, TOptions> action)
                 where TOptions : class
             {
                 return _collection
-                    .Select(x => x.Registration?.RegisterOptions is TInterface cl ? action(cl) : null)
+                    .Select(x => x.RegistrationOptions is TInterface cl ? action(cl) : null)
                     .FirstOrDefault(x => x != null);
             }
 
             public Supports<TOptions> Can<TInterface, TOptions>(Func<TInterface, TOptions> action)
                 where TOptions : class
             {
                 var options = _collection
-                    .Select(x => x.Registration?.RegisterOptions is TInterface cl ? action(cl) : null)
+                    .Select(x => x.RegistrationOptions is TInterface cl ? action(cl) : null)
                     .FirstOrDefault(x => x != null);
                 if (options == null)
                     return Supports.OfBoolean<TOptions>(false);
 
                 return _collection
-                    .Select(x => x.Registration?.RegisterOptions is TInterface cl ? action(cl) : null)
+                    .Select(x => x.RegistrationOptions is TInterface cl ? action(cl) : null)
                     .FirstOrDefault(x => x != null);
             }
 
             public TOptions Reduce<TInterface, TOptions>(Func<IEnumerable<TInterface>, TOptions> action)
                 where TOptions : class
             {
                 return action(_collection
-                    .Select(x => x.Registration?.RegisterOptions is TInterface cl ? cl : default)
+                    .Select(x => x.RegistrationOptions is TInterface cl ? cl : default)
                     .Where(x => x != null));
             }
         }

src/Server/HandlerCollection.cs

@@ -145,7 +145,6 @@ private HandlerDescriptor GetDescriptor(string method, Type handlerType, IJsonRp
 
             Type @params = null;
             object registrationOptions = null;
-            Registration registration = null;
             if (@interface.GetTypeInfo().IsGenericType)
             {
                 @params = @interface.GetTypeInfo().GetGenericArguments()[0];
@@ -156,15 +155,6 @@ private HandlerDescriptor GetDescriptor(string method, Type handlerType, IJsonRp
                 registrationOptions = GetRegistrationMethod
                     .MakeGenericMethod(registrationType)
                     .Invoke(null, new object[] { handler });
-
-                if (_supportedCapabilities.AllowsDynamicRegistration(capabilityType))
-                {
-                    registration = new Registration() {
-                        Id = Guid.NewGuid().ToString(),
-                        Method = method,
-                        RegisterOptions = registrationOptions
-                    };
-                }
             }
 
             var key = "default";
@@ -193,7 +183,8 @@ private HandlerDescriptor GetDescriptor(string method, Type handlerType, IJsonRp
                 @interface,
                 @params,
                 registrationType,
-                registration,
+                registrationOptions,
+                registrationType != null && _supportedCapabilities.AllowsDynamicRegistration(capabilityType),
                 capabilityType,
                 () => {
                     _handlers.RemoveWhere(d => d.Handler == handler);

src/Server/HandlerDescriptor.cs

@@ -22,11 +22,13 @@ public HandlerDescriptor(
             Type handlerType,
             Type @params,
             Type registrationType,
-            Registration registration,
+            object registrationOptions,
+            bool allowsDynamicRegistration,
             Type capabilityType,
             Action disposeAction)
         {
             _disposeAction = disposeAction;
+            Id = Guid.NewGuid();
             Method = method;
             Key = key;
             ImplementationType = handler.GetType();
@@ -35,7 +37,8 @@ public HandlerDescriptor(
             Params = @params;
             Response = Response;
             RegistrationType = registrationType;
-            Registration = registration;
+            RegistrationOptions = registrationOptions;
+            AllowsDynamicRegistration = allowsDynamicRegistration;
             CapabilityType = capabilityType;
 
             var requestInterface = @params?.GetInterfaces()
@@ -63,9 +66,11 @@ public HandlerDescriptor(
         public Type ImplementationType { get; }
         public Type HandlerType { get; }
 
+        public Guid Id { get; }
         public bool HasRegistration => RegistrationType != null;
         public Type RegistrationType { get; }
-        public Registration Registration { get; }
+        public object RegistrationOptions { get; }
+        public bool AllowsDynamicRegistration { get; }
 
         public bool HasCapability => CapabilityType != null;
         public Type CapabilityType { get; }

src/Server/ISupportedCapabilities.cs

@@ -6,7 +6,6 @@ namespace OmniSharp.Extensions.LanguageServer.Server
 {
     public interface ISupportedCapabilities
     {
-        bool AllowsDynamicRegistration(ILspHandlerDescriptor descriptor);
         bool AllowsDynamicRegistration(Type capabilityType);
         void SetCapability(ILspHandlerDescriptor descriptor, IJsonRpcHandler handler);
     }

src/Server/LanguageServer.cs

@@ -328,8 +328,12 @@ private IDisposable RegisterHandlers(LspHandlerDescriptorDisposable handlerDispo
             using (var scope = _serviceProvider.CreateScope())
             {
                 var registrations = handlerDisposable.Descriptors
-                    .Select(x => x.Registration)
-                    .Where(x => x != null)
+                    .Where(d => d.AllowsDynamicRegistration)
+                    .Select(d => new Registration() {
+                        Id = d.Id.ToString(),
+                        Method = d.Method,
+                        RegisterOptions = d.RegistrationOptions
+                    })
                     .ToArray();
 
                 // Fire and forget

src/Server/Matchers/ExecuteCommandMatcher.cs

@@ -28,7 +28,7 @@ public IEnumerable<ILspHandlerDescriptor> FindHandler(object parameters, IEnumer
                 _logger.LogTrace("Registration options {OptionsName}", executeCommandParams.GetType().FullName);
                 foreach (var descriptor in descriptors)
                 {
-                    if (descriptor.Registration?.RegisterOptions is ExecuteCommandRegistrationOptions registrationOptions && registrationOptions.Commands.Any(x => x == executeCommandParams.Command))
+                    if (descriptor.RegistrationOptions is ExecuteCommandRegistrationOptions registrationOptions && registrationOptions.Commands.Any(x => x == executeCommandParams.Command))
                     {
                         _logger.LogTrace("Checking handler {Method}:{Handler}",
                             executeCommandParams.Command,