Fix override completion in VS Code for Cohosting #11938
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The SingleOrDefault here is running on a non-nullable TextChange, so the "default" result was `default(TextChange)` but all the callers, which get back `TextChange?`, were checking for null.
Sometimes resolve doesn't add an edit, but allowing that in tests means we can't validate that we expect a TextEdit, and ensuring we don't regress that is more important
DustinCampbell
approved these changes
Jun 11, 2025
src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/CompletionListMerger.cs
Show resolved
Hide resolved
...c/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/DelegatedCompletionHelper.cs
Outdated
Show resolved
Hide resolved
| // rather than the one LSP knows about. | ||
| if (resolvedCompletionItem.Command is | ||
| { | ||
| CommandIdentifier: "roslyn.client.completionComplexEdit", |
There was a problem hiding this comment.
Consider lifting this to a const, if we can't reference the const in Roslyn.
There was a problem hiding this comment.
👍
Will do this as a follow up, along with #11911 (comment), since both will require dual, or at least timed, insertion fun.
| if (resolvedCompletionItem.Command is | ||
| { | ||
| CommandIdentifier: "roslyn.client.completionComplexEdit", | ||
| Arguments: [TextDocumentIdentifier, TextEdit complexEdit, _, int nextCursorPosition] args |
There was a problem hiding this comment.
Would it be useful to add a Debug.Assert somewhere to validate the number of arguments and their types? That would shine a light if Roslyn ever changes the shape of the data for this command.
There was a problem hiding this comment.
Good idea. In fact, it's probably worth making it a log message so we get user reports (though I'll have to add another parameter to this method 😛)
This was referenced Jun 14, 2025
davidwengier
added a commit
that referenced
this pull request
Jun 18, 2025
Razor side of dotnet/roslyn#78949 Two followups from previous PRs: * Export formatting options for Razor testing: #11911 (comment) * Share const for complex edit command name: #11938 (comment) Won't build, of course, without the above PR merged and packages referenced
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #11840
Two main bits to this change:
ItemDefaults.Datafor VS Code, and all of our data merging and wrapping didn't support itI broke things up into lots of commits because it was lots of little changes in lots of places, so might be easier to review that way.