From 4ccd6b082491589c5ecca297504fc963c2a6637e Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 14 Sep 2023 13:37:02 -0700 Subject: [PATCH 1/3] Provide InlineHint ranking to OmniSharp --- .../OmniSharp/InlineHints/OmniSharpInlineHintsService.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Tools/ExternalAccess/OmniSharp/InlineHints/OmniSharpInlineHintsService.cs b/src/Tools/ExternalAccess/OmniSharp/InlineHints/OmniSharpInlineHintsService.cs index 9f169fd6ef96b..6e299f2e99e7d 100644 --- a/src/Tools/ExternalAccess/OmniSharp/InlineHints/OmniSharpInlineHintsService.cs +++ b/src/Tools/ExternalAccess/OmniSharp/InlineHints/OmniSharpInlineHintsService.cs @@ -22,6 +22,7 @@ public static async Task> GetInlineHintsAsyn var hints = await service.GetInlineHintsAsync(document, textSpan, roslynOptions, displayAllOverride: false, cancellationToken).ConfigureAwait(false); return hints.SelectAsArray(static h => new OmniSharpInlineHint( h.Span, + h.Ranking, h.DisplayParts, h.ReplacementTextChange, h.GetDescriptionAsync)); @@ -34,17 +35,20 @@ internal readonly struct OmniSharpInlineHint public OmniSharpInlineHint( TextSpan span, + double ranking, ImmutableArray displayParts, TextChange? replacementTextChange, Func>> getDescriptionAsync) { Span = span; + Ranking = ranking; DisplayParts = displayParts; ReplacementTextChange = replacementTextChange; _getDescriptionAsync = getDescriptionAsync; } public readonly TextSpan Span { get; } + public readonly double Ranking { get; } public readonly ImmutableArray DisplayParts { get; } public readonly TextChange? ReplacementTextChange { get; } From ef8e69d0cdb8d3efbec5e616940130742cd095f4 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 14 Sep 2023 14:01:09 -0700 Subject: [PATCH 2/3] Update internal api --- src/Tools/ExternalAccess/OmniSharp/InternalAPI.Unshipped.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tools/ExternalAccess/OmniSharp/InternalAPI.Unshipped.txt b/src/Tools/ExternalAccess/OmniSharp/InternalAPI.Unshipped.txt index a290c148e41c7..0f808cb92a9f7 100644 --- a/src/Tools/ExternalAccess/OmniSharp/InternalAPI.Unshipped.txt +++ b/src/Tools/ExternalAccess/OmniSharp/InternalAPI.Unshipped.txt @@ -89,6 +89,7 @@ Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint. Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.GetDescriptionAsync(Microsoft.CodeAnalysis.Document! document, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task>! Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.OmniSharpInlineHint() -> void Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.OmniSharpInlineHint(Microsoft.CodeAnalysis.Text.TextSpan span, System.Collections.Immutable.ImmutableArray displayParts, Microsoft.CodeAnalysis.Text.TextChange? replacementTextChange, System.Func>!>! getDescriptionAsync) -> void +Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.Ranking.get -> double Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.ReplacementTextChange.get -> Microsoft.CodeAnalysis.Text.TextChange? Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.Span.get -> Microsoft.CodeAnalysis.Text.TextSpan Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHintsOptions From 5e583effcb969cbfb438eaadd75452e769edfa7d Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 14 Sep 2023 14:27:59 -0700 Subject: [PATCH 3/3] Update internal api --- src/Tools/ExternalAccess/OmniSharp/InternalAPI.Unshipped.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tools/ExternalAccess/OmniSharp/InternalAPI.Unshipped.txt b/src/Tools/ExternalAccess/OmniSharp/InternalAPI.Unshipped.txt index 0f808cb92a9f7..fb8a6f4c939c6 100644 --- a/src/Tools/ExternalAccess/OmniSharp/InternalAPI.Unshipped.txt +++ b/src/Tools/ExternalAccess/OmniSharp/InternalAPI.Unshipped.txt @@ -88,7 +88,7 @@ Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.DisplayParts.get -> System.Collections.Immutable.ImmutableArray Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.GetDescriptionAsync(Microsoft.CodeAnalysis.Document! document, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task>! Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.OmniSharpInlineHint() -> void -Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.OmniSharpInlineHint(Microsoft.CodeAnalysis.Text.TextSpan span, System.Collections.Immutable.ImmutableArray displayParts, Microsoft.CodeAnalysis.Text.TextChange? replacementTextChange, System.Func>!>! getDescriptionAsync) -> void +Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.OmniSharpInlineHint(Microsoft.CodeAnalysis.Text.TextSpan span, double ranking, System.Collections.Immutable.ImmutableArray displayParts, Microsoft.CodeAnalysis.Text.TextChange? replacementTextChange, System.Func>!>! getDescriptionAsync) -> void Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.Ranking.get -> double Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.ReplacementTextChange.get -> Microsoft.CodeAnalysis.Text.TextChange? Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints.OmniSharpInlineHint.Span.get -> Microsoft.CodeAnalysis.Text.TextSpan