fix #2550 inlay hints lambdas parameter type null reference exception

OmniSharp · Feb 17, 2024 · eb1a575 · eb1a575
1 parent 8495e47
commit eb1a575
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/src/OmniSharp.LanguageServerProtocol/Handlers/OmniSharpInlayHintHandler.cs b/src/OmniSharp.LanguageServerProtocol/Handlers/OmniSharpInlayHintHandler.cs
@@ -82,7 +82,7 @@ private static LSPInlayHint ToLSPInlayHint(OmniSharpInlayHint hint)
                     ? new MarkupContent() { Kind = MarkupKind.Markdown, Value = hint.Tooltip }
                     : null,
                 Position = ToPosition(hint.Position),
-                TextEdits = new(ToTextEdits(hint.TextEdits)),
+                TextEdits = hint.TextEdits is not null ? new(ToTextEdits(hint.TextEdits)) : null,
                 PaddingLeft = hint.Label.Length > trimmedStartLabel.Length,
                 PaddingRight = trimmedStartLabel.Length > trimmedLabel.Length,
                 Data = JToken.FromObject(hint.Data),

diff --git a/tests/OmniSharp.Lsp.Tests/OmniSharpInlayHintHandlerFacts.cs b/tests/OmniSharp.Lsp.Tests/OmniSharpInlayHintHandlerFacts.cs
@@ -156,6 +156,43 @@ public async Task InlayHintsForVarTypes(string fileName)
         }
     }
 
+    [Theory]
+    [InlineData("dummy.cs")]
+    [InlineData("dummy.csx")]
+    public async Task InlayHintsForLambdaParameterTypeNearFunctionParameterName(string fileName)
+    {
+        var code = @"
+using System;
+void fun(Func<int, bool> lambda) {}
+{|ihRegion:fun(b => true);|}
+";
+
+        var options = InlayHintsOptions.AllOn with { ForLambdaParameterTypes = false };
+
+        {
+            await SetInlayHintOptionsAsync(options);
+            var response = await GetInlayHints(fileName, code);
+            AssertEx.Equal(new[]
+                {
+                    new InlayHint { Position = new Position { Line = 3, Character = 4 }, Label = "lambda:", Kind = InlayHintKind.Parameter, Tooltip = null, TextEdits = new[] { new TextEdit { Range = new Range() { Start = new Position() { Line = 3, Character = 4 }, End = new Position() { Line = 3, Character = 4 } }, NewText = "lambda: " } }, PaddingLeft = false, PaddingRight = true },
+                },
+                response,
+                ignoreDataComparer);
+        }
+
+        {
+            await SetInlayHintOptionsAsync(options with { ForLambdaParameterTypes = true });
+            var response = await GetInlayHints(fileName, code);
+            AssertEx.Equal(new[]
+                {
+                    new InlayHint { Position = new Position { Line = 3, Character = 4 }, Label = "lambda:", Kind = InlayHintKind.Parameter, Tooltip = null, TextEdits = new[] { new TextEdit { Range = new Range() { Start = new Position() { Line = 3, Character = 4 }, End = new Position() { Line = 3, Character = 4 } }, NewText = "lambda: " } }, PaddingLeft = false, PaddingRight = true },
+                    new InlayHint { Position = new Position { Line = 3, Character = 4 }, Label = "int", Kind = InlayHintKind.Type, Tooltip = null, TextEdits = null, PaddingLeft = false, PaddingRight = true },
+                },
+                response,
+                ignoreDataComparer);
+        }
+    }
+
     [Theory]
     [InlineData("dummy.cs")]
     [InlineData("dummy.csx")]