Qualify trait impl created by add_custom_impl assist #6458
Merged
+114
−38
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
matklad
reviewed
Nov 4, 2020
Comment on lines
+57
to
+69
| let found_traits = imports_locator::find_imports(&ctx.sema, current_crate, trait_token.text()) | ||
| .into_iter() | ||
| .filter_map(|candidate: either::Either<hir::ModuleDef, hir::MacroDef>| match candidate { | ||
| either::Either::Left(hir::ModuleDef::Trait(trait_)) => Some(trait_), | ||
| _ => None, | ||
| }) | ||
| .flat_map(|trait_| { | ||
| current_module | ||
| .find_use_path(ctx.sema.db, hir::ModuleDef::Trait(trait_)) | ||
| .as_ref() | ||
| .map(mod_path_to_ast) | ||
| .zip(Some(trait_)) | ||
| }); |
Contributor
There was a problem hiding this comment.
I wonder if it makes sense to move this search into the edit phase of an assist? That way, we won't need to run somewhat costly find imports infra only to check if we should show a 💡.
Otoh, that means that we'd have to get by with a single assist....
Yeah, I guess it's better to use this logic, the applicability is narrow anyway
bors r+
Contributor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
When we find at least one trait with the same name as the derive accessible from the current module we now generate a qualified path to that trait in the generated impl.
If we don't find any we just do what was done before and emit the trait name in the generated impl.