Skip to content

Partial fix for https://github.com/dotnet/vscode-csharp/issues/7678 #11681

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+24 −17
Open

Partial fix for https://github.com/dotnet/vscode-csharp/issues/7678 #11681

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3adeec
Partial fix for https://github.com/dotnet/vscode-csharp/issues/7678
alexgav Mar 31, 2025
c14fac9
Fix C# commit characters
alexgav Apr 29, 2025
5246955
Remove unnecessary HashSet creation per CR
alexgav Apr 29, 2025
2213da9
Fixing tests
alexgav May 5, 2025
cb48e2c
Merged with main
alexgav May 27, 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
8 changes: 7 additions & 1 deletion ...icrosoft.CodeAnalysis.Razor.Workspaces/Completion/CompletionTriggerAndCommitCharacters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,13 @@ public CompletionTriggerAndCommitCharacters(LanguageServerFeatureOptions languag
allTriggerCharacters.UnionWith(delegationTriggerCharacters);

var commitCharacters = new HashSet<char>();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If languageServerFEatureOptions.UseVsCodeCompletionTriggerCharacters isn't set, there isn't reason to create commitCharacters, since it'll just end up setting AllCommitCharacters to [] below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, pushed a commit to fix this. Thanks!

commitCharacters.UnionWith(s_commitCharacters);
// We shouldn't specify commit characters for VSCode.
// It doesn't appear to need them and they interfere with normal item commit.
// E.g. see https://github.com/dotnet/vscode-csharp/issues/7678
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, this is kind of a point-in-time comment that might be confusing when somebody else is reading it in a year.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What would make it clearer? Or do you suggest dropping the comment completely?

if (!languageServerFeatureOptions.UseVsCodeCompletionTriggerCharacters)
{
commitCharacters.UnionWith(s_commitCharacters);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does our CommitElementsWithSpace option still work with this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CommitElementsWithSpace is already broken without this change. We are currently always committing elements with space in VS Code even though that setting is "false". That happens because specifying commit characters via capabilities ends up bypassing the code we use to remove Space from the specified commit characters. That code works only when Space is specified by the specific instance of the completion list or specific completion items in that list. We should discuss if that option makes sense in VS Code given behavior differences in how aggressively completion list is shown with low quality matches in VS Code. I would suggest we don't combine that work with this fix because once again, that options is broken already, without this PR. I am glad you brought it up though, thank you.

}

_csharpTriggerCharacters = csharpTriggerCharacters;
_htmlTriggerCharacters = htmlTriggerCharacters;
Expand Down