More cleanup

src/Features/LanguageServer/Microsoft.CommonLanguageServerProtocol.Framework/AbstractLanguageServer.cs

@@ -143,18 +143,15 @@ protected virtual void SetupRequestDispatcher(IHandlerProvider handlerProvider)
                 throw new InvalidOperationException($"Language specific handlers for {methodGroup.Key} have mis-matched number of parameters or returns:{Environment.NewLine}{string.Join(Environment.NewLine, methodGroup)}");
             }
 
-            // Pick the kind of streamjsonrpc handling based on the number of request / response arguments
-            // We use the first since we've validated above that the language specific handlers have similarly shaped requests.
-            var methodInfo = DelegatingEntryPoint.GetMethodInstantiation(methodGroup.First().RequestType, methodGroup.First().ResponseType);
-
+            var entryPointMethodInfo = typeof(DelegatingEntryPoint).GetMethod(nameof(DelegatingEntryPoint.ExecuteRequestAsync))!;
             var delegatingEntryPoint = new DelegatingEntryPoint(methodGroup.Key, this, handlerProvider);
 
             var methodAttribute = new JsonRpcMethodAttribute(methodGroup.Key)
             {
                 UseSingleObjectParameterDeserialization = true,
             };
 
-            _jsonRpc.AddLocalRpcMethod(methodInfo, delegatingEntryPoint, methodAttribute);
+            _jsonRpc.AddLocalRpcMethod(entryPointMethodInfo, delegatingEntryPoint, methodAttribute);
         }
     }
 
@@ -196,11 +193,6 @@ private sealed class DelegatingEntryPoint
         private readonly Lazy<ImmutableDictionary<string, (MethodInfo MethodInfo, RequestHandlerMetadata Metadata)>> _languageEntryPoint;
         private readonly AbstractLanguageServer<TRequestContext> _target;
 
-        private static readonly MethodInfo s_entryPointMethod = typeof(DelegatingEntryPoint).GetMethod(nameof(EntryPointAsync))!;
-        private static readonly MethodInfo s_parameterlessEntryPointMethod = typeof(DelegatingEntryPoint).GetMethod(nameof(ParameterlessEntryPointAsync))!;
-        private static readonly MethodInfo s_notificationMethod = typeof(DelegatingEntryPoint).GetMethod(nameof(NotificationEntryPointAsync))!;
-        private static readonly MethodInfo s_parameterlessNotificationMethod = typeof(DelegatingEntryPoint).GetMethod(nameof(ParameterlessNotificationEntryPointAsync))!;
-
         private static readonly MethodInfo s_queueExecuteAsyncMethod = typeof(RequestExecutionQueue<TRequestContext>).GetMethod(nameof(RequestExecutionQueue<TRequestContext>.ExecuteAsync))!;
 
         public DelegatingEntryPoint(string method, AbstractLanguageServer<TRequestContext> target, IHandlerProvider handlerProvider)
@@ -224,24 +216,11 @@ public DelegatingEntryPoint(string method, AbstractLanguageServer<TRequestContex
             });
         }
 
-        public static MethodInfo GetMethodInstantiation(Type? requestType, Type? responseType)
-            => (requestType, responseType) switch
-            {
-                (requestType: not null, responseType: not null) => s_entryPointMethod,
-                (requestType: null, responseType: not null) => s_parameterlessEntryPointMethod,
-                (requestType: not null, responseType: null) => s_notificationMethod,
-                (requestType: null, responseType: null) => s_parameterlessNotificationMethod,
-            };
-
-        public Task NotificationEntryPointAsync(JToken request, CancellationToken cancellationToken) => ExecuteRequestAsync(request, cancellationToken);
-
-        public Task ParameterlessNotificationEntryPointAsync(CancellationToken cancellationToken) => ExecuteRequestAsync(null, cancellationToken);
-
-        public Task<JToken?> EntryPointAsync(JToken request, CancellationToken cancellationToken) => ExecuteRequestAsync(request, cancellationToken);
-
-        public Task<JToken?> ParameterlessEntryPointAsync(CancellationToken cancellationToken) => ExecuteRequestAsync(null, cancellationToken);
-
-        private async Task<JToken?> ExecuteRequestAsync(JToken? request, CancellationToken cancellationToken)
+        /// <summary>
+        /// StreamJsonRpc entry point for all handler methods.
+        /// The optional parameters allow StreamJsonRpc to call into the same method for any kind of request / notification (with any number of params or response).
+        /// </summary>
+        public async Task<JToken?> ExecuteRequestAsync(JToken? request = null, CancellationToken cancellationToken = default)
         {
             var queue = _target.GetRequestExecutionQueue();
             var lspServices = _target.GetLspServices();