Ensure discards are initially soft selected in VSCode #75655
Merged
Conversation
This file contains 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
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
dibarbet
commented
Oct 28, 2024
| @@ -363,6 +363,82 @@ internal static void FilterItems( | |||
| } | |||
| } | |||
|
|
|||
| internal static bool IsHardSelection(CompletionItem item, bool matchedFilterText, bool hasSuggestionModeItem, string filterText) | |||
There was a problem hiding this comment.
everything in this file is moved unchanged
genlu
reviewed
Oct 29, 2024
src/LanguageServer/Protocol/Handler/Completion/CompletionHandler.cs
Outdated
Show resolved
Hide resolved
genlu
reviewed
Oct 29, 2024
| if (matchResultsBuilder.Count > 0) | ||
| { | ||
| var bestResult = GetBestCompletionItemSelectionFromFilteredResults(matchResultsBuilder); | ||
| isHardSelection = CompletionService.IsHardSelection(bestResult.CompletionItem, bestResult.ShouldBeConsideredMatchingFilterText, completionList.SuggestionModeItem != null, filterText); |
There was a problem hiding this comment.
is this part needed to handle soft-selecting _? I think we could just use the result of IsAllPunctuation(filterText) to decide both selection mode and isIncomplete
There was a problem hiding this comment.
Ah interesting, I can make that change
genlu
reviewed
Oct 30, 2024
src/LanguageServer/Protocol/Handler/Completion/CompletionHandler.cs
Outdated
Show resolved
Hide resolved
genlu
approved these changes
Oct 30, 2024
This was referenced Nov 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves dotnet/vscode-csharp#7623
Unfortunately LSP doesn't give servers much control over filtering. Servers do not generally get callbacks as filter text is typed - meaning we generally are not able to modify hard vs soft selection after the initial list is presented.
However, we can force VSCode to call us back in some scenarios using the
isIncompleteflag on the completion list. For this case, when we see only punctuation typed (_), we set theisIncompleteflag and unset the commit characters to mimic soft selection.As the user continues typing (e.g.
_o) we get called again and we can update to hard selection if they are completing a variable.However - this does not cover every case of switching between hard/soft selection. It could be covered by always setting
isIncompletebut that would be expensive as we're re-computing and reserializing the entire list.