fix: rename and add import #19799
Open
fix: rename and add import #19799
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
rustbot
added
the
S-waiting-on-review
Hmikihiro
commented
May 15, 2025
Comment on lines
1196
to
+1200
| if self.def == def | ||
| // is our def a trait assoc item? then we want to find all assoc items from trait impls of our trait | ||
| || matches!(self.assoc_item_container, Some(hir::AssocItemContainer::Trait(_))) | ||
| && convert_to_def_in_trait(self.sema.db, def) == self.def => | ||
| && convert_to_def_in_trait(self.sema.db, def) == self.def | ||
| || self.is_related_import(name_ref) => |
There was a problem hiding this comment.
When I find some definition item, we use NameRefClass::classify but it only return single definition. So, I check use block have some definition.
There was a problem hiding this comment.
this change give affect to this test
rust-analyzer/crates/ide/src/references.rs
Lines 1765 to 1780 in d2a05af
Signed-off-by: Hayashi Mikihiro <[email protected]>
Hmikihiro
force-pushed
the
rename_conflict_ns
branch
from
4b1488f to
d2a05af
Compare
Hmikihiro
commented
May 15, 2025
Comment on lines
+531
to
+555
| } else if let Some(res) = ast::UseTree::find_tail_use_tree_for_name_ref(name_ref) | ||
| .and_then(|u| u.path()) | ||
| .and_then(|p| sema.resolve_path_per_ns(&p)) | ||
| { | ||
| let res = res | ||
| .to_small_vec() | ||
| .into_iter() | ||
| .flatten() | ||
| .filter_map(|res| match res { | ||
| hir::PathResolution::Def(def) => Some(Definition::from(def)), | ||
| _ => None, | ||
| }) | ||
| .unique() | ||
| .collect::<Vec<_>>(); | ||
|
|
||
| let range = name_ref.syntax().text_range(); | ||
| if res.iter().any(|res| res == &def) { | ||
| if res.len() == 1 { | ||
| edit.replace(range, new_name.to_owned()); | ||
| } else { | ||
| edit.replace(range, format!("{{{}, {}}}", new_name, name_ref.text())); | ||
| } | ||
| } | ||
|
|
||
| return true; |
There was a problem hiding this comment.
When we rename import item, We check that the path is ambiguous or not. if It is ambiguous, we add old import name and new name.
Hmikihiro
commented
May 15, 2025
Comment on lines
+254
to
+269
| if let Some(path) = ast::UseTree::find_tail_use_tree_for_name_ref(name_ref).and_then(|u| u.path()).and_then(|p| sema.resolve_path_per_ns(&p)){ | ||
| let defs = path.to_small_vec().into_iter().filter_map(|res| match res{ | ||
| Some(PathResolution::Def(def)) => Some(Definition::from(def)), | ||
| _ => None, | ||
| }).unique().collect::<Vec<_>>(); | ||
| match defs.len() { | ||
| 0 => Err(format_err!("No references found at position")), | ||
| 1 => { | ||
| if defs[0].name(sema.db).is_some_and(|it| it.as_str() != name_ref.text().trim_start_matches("r#")) { | ||
| Err(format_err!("Renaming aliases is currently unsupported")) | ||
| } else { | ||
| Ok(defs[0]) | ||
| } | ||
| } | ||
| }) | ||
| 2.. => Err(format_err!("Ambiguous import is currently unsupported")), | ||
| } |
There was a problem hiding this comment.
use bar::foo;
//^^^ It import `fn foo()` and `struct foo{}`
mod bar {
pub fn foo() {}
pub struct foo {}
}I think we shouldn't rename the ambiguous import name_ref.
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.
fix: #18892
2025-05-16.4.31.58.mov