Merge pull request #158 from OmniSharp/fix/delegating-handlers

Added cancellation support to the delegating handlers

Author: david-driscoll

src/JsonRpc/DelegatingRequestHandler.cs

@@ -7,36 +7,36 @@ namespace OmniSharp.Extensions.JsonRpc
 {
     public class DelegatingRequestHandler<T, TResponse> : IJsonRpcRequestHandler<DelegatingRequest<T>, JToken>
     {
-        private readonly Func<T, Task<TResponse>> _handler;
+        private readonly Func<T, CancellationToken, Task<TResponse>> _handler;
         private readonly ISerializer _serializer;
 
-        public DelegatingRequestHandler(ISerializer serializer, Func<T, Task<TResponse>> handler)
+        public DelegatingRequestHandler(ISerializer serializer, Func<T, CancellationToken, Task<TResponse>> handler)
         {
             _handler = handler;
             _serializer = serializer;
         }
 
         public async Task<JToken> Handle(DelegatingRequest<T> request, CancellationToken cancellationToken)
         {
-            var response = await _handler.Invoke(request.Value);
+            var response = await _handler.Invoke(request.Value, cancellationToken);
             return JToken.FromObject(response, _serializer.JsonSerializer);
         }
     }
 
     public class DelegatingRequestHandler<T> : IJsonRpcRequestHandler<DelegatingRequest<T>, JToken>
     {
-        private readonly Func<T, Task> _handler;
+        private readonly Func<T, CancellationToken, Task> _handler;
         private readonly ISerializer _serializer;
 
-        public DelegatingRequestHandler(ISerializer serializer, Func<T, Task> handler)
+        public DelegatingRequestHandler(ISerializer serializer, Func<T, CancellationToken, Task> handler)
         {
             _handler = handler;
             _serializer = serializer;
         }
 
         public async Task<JToken> Handle(DelegatingRequest<T> request, CancellationToken cancellationToken)
         {
-            await _handler.Invoke(request.Value);
+            await _handler.Invoke(request.Value, cancellationToken);
             return JValue.CreateNull();
         }
     }

src/JsonRpc/JsonRpcServerExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -10,6 +11,14 @@ public static IDisposable OnRequest<T, TResponse>(
             this IJsonRpcHandlerRegistry registry,
             string method,
             Func<T, Task<TResponse>> handler)
+        {
+            return registry.AddHandler(method, _ => new DelegatingRequestHandler<T, TResponse>(_.GetRequiredService<ISerializer>(), (x, ct) => handler(x)));
+        }
+
+        public static IDisposable OnRequest<T, TResponse>(
+            this IJsonRpcHandlerRegistry registry,
+            string method,
+            Func<T, CancellationToken, Task<TResponse>> handler)
         {
             return registry.AddHandler(method, _ => new DelegatingRequestHandler<T, TResponse>(_.GetRequiredService<ISerializer>(), handler));
         }
@@ -18,6 +27,14 @@ public static IDisposable OnRequest<T>(
             this IJsonRpcHandlerRegistry registry,
             string method,
             Func<T, Task> handler)
+        {
+            return registry.AddHandler(method, _ => new DelegatingRequestHandler<T>(_.GetRequiredService<ISerializer>(), (x, ct) => handler(x)));
+        }
+
+        public static IDisposable OnRequest<T>(
+            this IJsonRpcHandlerRegistry registry,
+            string method,
+            Func<T, CancellationToken, Task> handler)
         {
             return registry.AddHandler(method, _ => new DelegatingRequestHandler<T>(_.GetRequiredService<ISerializer>(), handler));
         }