Merge pull request #72 from OmniSharp/fix/resolve-exception

Handle case of null CanBeResolvedHandlerType

Author: david-driscoll

src/Server/Matchers/ResolveCommandMatcher.cs

@@ -92,7 +92,7 @@ public object Process(ILspHandlerDescriptor descriptor, object parameters, objec
         {
             // Only pin the handler type, if we know the source handler (codelens) is also the resolver.
             if (response is IEnumerable<ICanBeResolved> canBeResolveds &&
-                descriptor.CanBeResolvedHandlerType.GetTypeInfo().IsAssignableFrom(descriptor.Handler.GetType()))
+                descriptor?.CanBeResolvedHandlerType?.GetTypeInfo().IsAssignableFrom(descriptor.Handler.GetType()) == true)
             {
                 _logger.LogTrace("Updating Resolve items with wrapped data for {Method}:{Handler}",
                     descriptor.Method,

test/Lsp.Tests/Matchers/ResolveCommandMatcherTests.cs

@@ -52,6 +52,27 @@ public void Should_Return_Empty_Descriptor()
             result.Should().BeEmpty();
         }
 
+        [Fact]
+        public void Should_Not_Throw_Given_Another_Descriptor()
+        {
+            // Given
+            var resolveHandler = Substitute.For<ICodeLensHandler>();
+            var handlerDescriptor = new HandlerDescriptor(
+                        DocumentNames.CodeLens,
+                        "Key",
+                        resolveHandler,
+                        resolveHandler.GetType(),
+                        typeof(CodeLensParams),
+                        null,
+                        null,
+                        () => { });
+            var handlerMatcher = new ResolveCommandMatcher(_logger);
+
+            // When
+            Action a = () => handlerMatcher.Process(handlerDescriptor, new CodeLensParams(), new CodeLensContainer());
+            a.ShouldNotThrow();
+        }
+
         [Fact]
         public void Should_Return_CodeLensResolve_Descriptor()
         {
@@ -63,8 +84,7 @@ public void Should_Return_CodeLensResolve_Descriptor()
             resolveHandler2.CanResolve(Arg.Any<CodeLens>()).Returns(true);
 
             // When
-            var result = handlerMatcher.FindHandler(new CodeLens()
-            {
+            var result = handlerMatcher.FindHandler(new CodeLens() {
                 Data = JToken.FromObject(new { handlerType = typeof(ICodeLensResolveHandler).FullName, data = new { a = 1 } })
             },
                     new List<HandlerDescriptor> {
@@ -103,8 +123,7 @@ public void Should_Return_CompletionResolve_Descriptor()
             resolveHandler2.CanResolve(Arg.Any<CompletionItem>()).Returns(true);
 
             // When
-            var result = handlerMatcher.FindHandler(new CompletionItem()
-            {
+            var result = handlerMatcher.FindHandler(new CompletionItem() {
                 Data = JToken.FromObject(new { handlerType = typeof(ICompletionResolveHandler).FullName, data = new { a = 1 } })
             },
                     new List<HandlerDescriptor> {
@@ -146,8 +165,7 @@ public void Should_Deal_WithHandlers_That_Not_Also_Resolvers()
             (resolveHandler2 as ICompletionResolveHandler).CanResolve(Arg.Any<CompletionItem>()).Returns(true);
 
             // When
-            var result = handlerMatcher.FindHandler(new CompletionItem()
-            {
+            var result = handlerMatcher.FindHandler(new CompletionItem() {
                 Data = new JObject()
             },
                     new List<HandlerDescriptor> {
@@ -189,8 +207,7 @@ public void Should_Deal_WithHandlers_That_Not_Also_Resolvers2()
             (resolveHandler2 as ICompletionResolveHandler).CanResolve(Arg.Any<CompletionItem>()).Returns(false);
 
             // When
-            var result = handlerMatcher.FindHandler(new CompletionItem()
-            {
+            var result = handlerMatcher.FindHandler(new CompletionItem() {
                 Data = new JObject()
             },
                     new List<HandlerDescriptor> {
@@ -287,9 +304,9 @@ public void Should_Update_CompletionItems_With_HandlerType()
                             () => { });
 
             var item = new CompletionItem() {
-                Data =JObject.FromObject(new { hello = "world" })
+                Data = JObject.FromObject(new { hello = "world" })
             };
-            var list = new CompletionList(new [] {item});
+            var list = new CompletionList(new[] { item });
 
             (list is IEnumerable<ICanBeResolved>).Should().BeTrue();
 
@@ -325,9 +342,9 @@ public void Should_Update_CodeLensContainer_With_HandlerType()
                             () => { });
 
             var item = new CodeLens() {
-                Data =JObject.FromObject(new { hello = "world" })
+                Data = JObject.FromObject(new { hello = "world" })
             };
-            var list = new CodeLensContainer(new [] {item});
+            var list = new CodeLensContainer(new[] { item });
 
             (list is IEnumerable<ICanBeResolved>).Should().BeTrue();