Add Kind parameter to InlayHint

OmniSharp · Oct 4, 2023 · 27f9c83 · 27f9c83
1 parent 79106f6
commit 27f9c83
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 42 deletions.
diff --git a/src/OmniSharp.Abstractions/Models/v1/InlayHints/InlayHint.cs b/src/OmniSharp.Abstractions/Models/v1/InlayHints/InlayHint.cs
@@ -16,6 +16,12 @@ public sealed record InlayHint
     /// </summary>
     public string Label { get; set; }
 
+    /// <summary>
+    /// The kind of this hint. Can be omitted in which case the client
+	/// should fall back to a reasonable default.
+    /// </summary>
+    public InlayHintKind? Kind { get; set; }
+
     /// <summary>
     /// The tooltip text when you hover over this item.
     /// </summary>

diff --git a/src/OmniSharp.LanguageServerProtocol/Handlers/OmniSharpInlayHintHandler.cs b/src/OmniSharp.LanguageServerProtocol/Handlers/OmniSharpInlayHintHandler.cs
@@ -77,6 +77,7 @@ private static LSPInlayHint ToLSPInlayHint(OmniSharpInlayHint hint)
             return new LSPInlayHint()
             {
                 Label = trimmedLabel,
+                Kind = hint.Kind.HasValue ? ConvertEnum<OmniSharpInlayHintKind, LSPInlayHintKind>(hint.Kind.Value) : null,
                 Tooltip = hint.Tooltip is not null
                     ? new MarkupContent() { Kind = MarkupKind.Markdown, Value = hint.Tooltip }
                     : null,
@@ -93,6 +94,7 @@ private static OmniSharpInlayHint FromLSPInlayHint(LSPInlayHint hint)
             return new OmniSharpInlayHint()
             {
                 Label = $"{(hint.PaddingLeft == true ? " " : "")}{hint.Label.String}{(hint.PaddingRight == true ? " " : "")}",
+                Kind = hint.Kind.HasValue ? ConvertEnum<LSPInlayHintKind, OmniSharpInlayHintKind>(hint.Kind.Value) : null,
                 Tooltip = hint.Tooltip is not null
                     ? hint.Tooltip.HasMarkupContent
                         ? hint.Tooltip.MarkupContent.Value

diff --git a/src/OmniSharp.Roslyn.CSharp/Services/InlayHints/InlayHintService.cs b/src/OmniSharp.Roslyn.CSharp/Services/InlayHints/InlayHintService.cs
@@ -35,6 +35,8 @@ internal class InlayHintService :
     private readonly InlineHintCache _cache;
     private readonly FormattingOptions _formattingOptions;
 
+    private const double ParameterRanking = 0.0;
+
     [ImportingConstructor]
     public InlayHintService(OmniSharpWorkspace workspace, FormattingOptions formattingOptions, ILoggerFactory loggerFactory, IOptionsMonitor<OmniSharpOptions> omniSharpOptions)
     {
@@ -140,6 +142,9 @@ public List<InlayHint> MapAndCacheHints(ImmutableArray<OmniSharpInlineHint> rosl
                     resultList.Add(new InlayHint()
                     {
                         Label = string.Concat(hint.DisplayParts),
+                        Kind = hint.Ranking == ParameterRanking
+                            ? InlayHintKind.Parameter
+                            : InlayHintKind.Type,
                         Position = text.GetPointFromPosition(hint.Span.End),
                         TextEdits = ConvertToTextChanges(hint.ReplacementTextChange, text),
                         Data = (solutionVersionString, position)