Speed up resolving a "Generate delegate method" assist #19362
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
rustbot
added
the
S-waiting-on-review
Veykril
reviewed
Mar 16, 2025
| @@ -32,7 +32,7 @@ pub(crate) fn add_braces(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<( | |||
| let (expr_type, expr) = get_replacement_node(ctx)?; | |||
|
|
|||
| acc.add( | |||
| AssistId("add_braces", AssistKind::RefactorRewrite), | |||
| AssistId("add_braces", AssistKind::RefactorRewrite, None), | |||
There was a problem hiding this comment.
It would likely be nicer to have a constructor function for the None case here, something like
Suggested change
| AssistId("add_braces", AssistKind::RefactorRewrite, None), | |
| assist_id("add_braces", AssistKind::RefactorRewrite), |
or
Suggested change
| AssistId("add_braces", AssistKind::RefactorRewrite, None), | |
| AssistId::refactor_rewrite(add_braces"), |
To keep the group one long but the common case short?
There was a problem hiding this comment.
I force-pushed a new version with the second option. I chose it over the first one because it resulted in more concise code. Thanks for the suggestion.
nemethf
force-pushed
the
fix-19322
branch
2 times, most recently
from
c86a7fe to
3a68f9a
Compare
Veykril
approved these changes
Mar 21, 2025
Fix rust-lang#19322 Sometimes there are 185 "Generate delegate" assists with the same assist_id and asssist_kind. This commit introduces and additional differentiator: assist_subtype. Therefore, when the LSP client sends an assist resolve request, rust-analyzer only need to compute edits for a single assist instead of 185.
Make it compile by adding a `None` subtype to rest of the AssistId instantiations.
|
I've resolved the merge conflict. Is there anything more that I need to do here? Thanks. |
|
Nope, should be good to go |
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.
To advance the discussion of #19322 this pull request implements the solution outlined there. The PR is split into two parts. The first one contains the core idea, while the boring second part makes sure rust-analyzer compiles after the extension of struct
AssistId.Part 1
Fix #19322
Sometimes there are 185 "Generate delegate" assists with the same
assist_id and asssist_kind. This commit introduces and additional
differentiator: assist_subtype. Therefore, when the LSP client sends
an assist resolve request, rust-analyzer only need to compute edits
for a single assist instead of 185.
Part 2
Make it compile by adding a
Nonesubtype to rest of the AssistIdinstantiations.