-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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: Acknowledge pub(crate)
imports in import suggestions
#16265
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
Status: Awaiting review from the assignee but also interested parties.
label
Jan 5, 2024
Veykril
reviewed
Jan 10, 2024
Veykril
added
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Jan 10, 2024
Veykril
reviewed
Jan 10, 2024
Patryk27
force-pushed
the
suggest-pub-crate-imports
branch
from
January 10, 2024 17:19
4061b71
to
5f7ed0e
Compare
Ready! |
Patryk27
force-pushed
the
suggest-pub-crate-imports
branch
from
January 10, 2024 17:20
5f7ed0e
to
d6d4dd5
Compare
rust-analyzer has logic that discounts suggesting `use`s for private imports, but that logic is unnecessarily strict - for instance given this code: ```rust mod foo { pub struct Foo; } pub(crate) use self::foo::*; mod bar { fn main() { Foo$0; } } ``` ... RA will suggest to add `use crate::foo::Foo;`, which not only makes the code overly verbose (especially in larger code bases), but also is disjoint with what rustc itself suggests. This commit adjusts the logic, so that `pub(crate)` imports are taken into account when generating the suggestions; considering rustc's behavior, I think this change doesn't warrant any extra configuration flag. Note that this is my first commit to RA, so I guess the approach taken here might be suboptimal - certainly feels somewhat hacky, maybe there's some better way of finding out the optimal import path 😅
Patryk27
force-pushed
the
suggest-pub-crate-imports
branch
from
January 10, 2024 17:21
d6d4dd5
to
76aaf17
Compare
Veykril
approved these changes
Jan 11, 2024
Veykril
changed the title
Suggest
fix: Acknowledge Jan 11, 2024
pub(crate)
importspub(crate)
imports in import suggestions
Thanks! |
☀️ Test successful - checks-actions |
bors
added a commit
that referenced
this pull request
Jan 11, 2024
internal: Consider all kinds of explicit private imports in find_path Builds on top of #16265 to make things a bit more general, now we consider all explicit private imports.
This was referenced May 9, 2024
This was referenced May 28, 2024
This was referenced Jun 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
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.
rust-analyzer has logic that discounts suggesting
use
s for private imports, but that logic is unnecessarily strict - for instance given this code:... RA will suggest to add
use crate::foo::Foo;
, which not only makes the code overly verbose (especially in larger code bases), but also is disjoint with what rustc itself suggests.This commit adjusts the logic, so that
pub(crate)
imports are taken into account when generating the suggestions; considering rustc's behavior, I think this change doesn't warrant any extra configuration flag.Note that this is my first commit to RA, so I guess the approach taken here might be suboptimal - certainly feels somewhat hacky, maybe there's some better way of finding out the optimal import path 😅