Skip to content

Fixing override completion in VSCode when LSP is enabled #12039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 18, 2025
Merged

Fixing override completion in VSCode when LSP is enabled #12039

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e55c7bc
Fixing override completion in VSCode when LSP is enbaled
alexgav Jul 17, 2025
30b08fd
CR suggestion - simplify logic
alexgav Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...icrosoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/DelegatedCompletionHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Collections.Immutable;
using System.Diagnostics;
using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.Language;
Expand Down Expand Up @@ -317,6 +318,14 @@ public static async Task<VSInternalCompletionItem> FormatCSharpCompletionItemAsy
// rather than the one LSP knows about.
if (resolvedCompletionItem.Command is { CommandIdentifier: Constants.CompleteComplexEditCommand, Arguments: var args })
{
// In LSP case, command parameters will be JsonElement objects and will need to be deserialized first
if (args is [JsonElement textDocumentIdentifierData, JsonElement complexEditData, _, _])
{
args[0] = textDocumentIdentifierData.Deserialize<TextDocumentIdentifier>() ?? args[0];
args[1] = complexEditData.Deserialize<TextEdit>() ?? args[1];
}

// In cohosting case, command parameters will be of the correct types (or deserialized by now in LSP case)
if (args is [TextDocumentIdentifier, TextEdit complexEdit, _, int nextCursorPosition])
{
var formattedTextEdit = await FormatTextEditsAsync([complexEdit], documentContext, options, formattingService, cancellationToken).ConfigureAwait(false);
Expand Down