Skip to content
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.

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

Fix resolving import completion item in LSP #69454

Merged
merged 1 commit into from
Aug 10, 2023

Conversation

genlu
Copy link
Member

@genlu genlu commented Aug 9, 2023

Fix dotnet/vscode-csharp#6051

The bug was introduced in #69265, not sure how I didn't catch it during testing :(

@genlu genlu requested a review from a team as a code owner August 9, 2023 23:32
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead labels Aug 9, 2023
Copy link
Member

@dibarbet dibarbet left a comment

Choose a reason for hiding this comment

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

not sure how I didn't catch it during testing :(

we really need more integration tests on the vscode side as well.

@@ -540,6 +540,10 @@ void M()
itemFromNS1.Data = completionResult.ItemDefaults.Data;
itemFromNS2.Data = completionResult.ItemDefaults.Data;

// Remove the label details as this is the behavior of the VSCode client when resolving completion items.
itemFromNS1.LabelDetails = null;
Copy link
Member

Choose a reason for hiding this comment

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

ah this is why the unit tests didn't catch it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yea. And I blame jetlag as the reason why it's not caught by manual testing

@@ -80,8 +80,11 @@ public async Task<LSP.CompletionItem> HandleRequestAsync(LSP.CompletionItem comp

private static bool MatchesLSPCompletionItem(LSP.CompletionItem lspCompletionItem, CompletionItem completionItem)
{
// We want to make sure we are resolving the same unimported item in case we have multiple with same name
Copy link
Member

Choose a reason for hiding this comment

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

Instead of doing this, we could consider adding information to the completion item resolve data that would definitively indicate which one we're resolving. Fine whichever you think is best.

Copy link
Member Author

Choose a reason for hiding this comment

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

That does have the advantage of immune to change client might make to the resolve request in the future, with the cost of extra data on each unimported item. Let's take this fix for now, assuming such change would be very rare, but if it turns out not to be the case, we can switch to your proposal.

@genlu
Copy link
Member Author

genlu commented Aug 10, 2023

we really need more integration tests on the vscode side as well.

How do I add integration tests for vscode completion?

@genlu genlu enabled auto-merge August 10, 2023 00:25
@dibarbet
Copy link
Member

How do I add integration tests for vscode completion?

Not setup yet (soonTM) - was more wishing

@genlu genlu merged commit 731f331 into dotnet:main Aug 10, 2023
24 checks passed
@ghost ghost added this to the Next milestone Aug 10, 2023
@genlu genlu deleted the FixLspImportCompletion branch August 10, 2023 16:14
@dibarbet dibarbet modified the milestones: Next, 17.8 P2 Aug 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Automatic Namespace Imports no longer function
2 participants