language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-23 00:33:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow renaming when there are multiple definitions (due to macros) even when some cannot rename

Browse source
This commit is contained in:
Chayim Refael Friedman 2025-08-05 00:10:21 +03:00
parent 978393bae8
commit 47845d6097
1 changed files with 69 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

118
crates/ide/src/rename.rs
View file

@ -27,6 +27,27 @@ pub use ide_db::rename::RenameError;
type RenameResult<T> = Result<T, RenameError>; type RenameResult<T> = Result<T, RenameError>;
/// This is similar to `collect::<Result<Vec<_>, _>>`, but unlike it, it succeeds if there is *any* `Ok` item.
fn ok_if_any<T, E>(iter: impl Iterator<Item = Result<T, E>>) -> Result<Vec<T>, E> {
let mut err = None;
let oks = iter
.filter_map(|item| match item {
Ok(it) => Some(it),
Err(it) => {
err = Some(it);
None
}
})
.collect::<Vec<_>>();
if !oks.is_empty() {
Ok(oks)
} else if let Some(err) = err {
Err(err)
} else {
Ok(Vec::new())
}
}
/// Prepares a rename. The sole job of this function is to return the TextRange of the thing that is /// Prepares a rename. The sole job of this function is to return the TextRange of the thing that is
/// being targeted for a rename. /// being targeted for a rename.
pub(crate) fn prepare_rename( pub(crate) fn prepare_rename(
@ -95,58 +116,57 @@ pub(crate) fn rename(
alias_fallback(syntax, position, &new_name.display(db, edition).to_string()); alias_fallback(syntax, position, &new_name.display(db, edition).to_string());
let ops: RenameResult<Vec<SourceChange>> = match alias_fallback { let ops: RenameResult<Vec<SourceChange>> = match alias_fallback {
Some(_) => defs Some(_) => ok_if_any(
// FIXME: This can use the `ide_db::rename_reference` (or def.rename) method once we can defs
// properly find "direct" usages/references. // FIXME: This can use the `ide_db::rename_reference` (or def.rename) method once we can
.map(|(.., def, new_name, _)| { // properly find "direct" usages/references.
match kind { .map(|(.., def, new_name, _)| {
IdentifierKind::Ident => (), match kind {
IdentifierKind::Lifetime => { IdentifierKind::Ident => (),
bail!("Cannot alias reference to a lifetime identifier") IdentifierKind::Lifetime => {
} bail!("Cannot alias reference to a lifetime identifier")
IdentifierKind::Underscore => bail!("Cannot alias reference to `_`"), }
IdentifierKind::LowercaseSelf => { IdentifierKind::Underscore => bail!("Cannot alias reference to `_`"),
bail!("Cannot rename alias reference to `self`") IdentifierKind::LowercaseSelf => {
} bail!("Cannot rename alias reference to `self`")
}; }
let mut usages = def.usages(&sema).all(); };
let mut usages = def.usages(&sema).all();
// FIXME: hack - removes the usage that triggered this rename operation. // FIXME: hack - removes the usage that triggered this rename operation.
match usages.references.get_mut(&file_id).and_then(|refs| { match usages.references.get_mut(&file_id).and_then(|refs| {
refs.iter() refs.iter()
.position(|ref_| ref_.range.contains_inclusive(position.offset)) .position(|ref_| ref_.range.contains_inclusive(position.offset))
.map(|idx| refs.remove(idx)) .map(|idx| refs.remove(idx))
}) { }) {
Some(_) => (), Some(_) => (),
None => never!(), None => never!(),
}; };
let mut source_change = SourceChange::default(); let mut source_change = SourceChange::default();
source_change.extend(usages.references.get_mut(&file_id).iter().map(|refs| { source_change.extend(usages.references.get_mut(&file_id).iter().map(|refs| {
( (
position.file_id, position.file_id,
source_edit_from_references(db, refs, def, &new_name, edition), source_edit_from_references(db, refs, def, &new_name, edition),
) )
})); }));
Ok(source_change) Ok(source_change)
}) }),
.collect(), ),
None => defs None => ok_if_any(defs.map(|(.., def, new_name, rename_def)| {
.map(|(.., def, new_name, rename_def)| { if let Definition::Local(local) = def {
if let Definition::Local(local) = def { if let Some(self_param) = local.as_self_param(sema.db) {
if let Some(self_param) = local.as_self_param(sema.db) { cov_mark::hit!(rename_self_to_param);
cov_mark::hit!(rename_self_to_param); return rename_self_to_param(&sema, local, self_param, &new_name, kind);
return rename_self_to_param(&sema, local, self_param, &new_name, kind);
}
if kind == IdentifierKind::LowercaseSelf {
cov_mark::hit!(rename_to_self);
return rename_to_self(&sema, local);
}
} }
def.rename(&sema, new_name.as_str(), rename_def) if kind == IdentifierKind::LowercaseSelf {
}) cov_mark::hit!(rename_to_self);
.collect(), return rename_to_self(&sema, local);
}
}
def.rename(&sema, new_name.as_str(), rename_def)
})),
}; };
ops?.into_iter() ops?.into_iter()
@ -320,7 +340,7 @@ fn find_definitions(
}) })
}); });
let res: RenameResult<Vec<_>> = symbols.filter_map(Result::transpose).collect(); let res: RenameResult<Vec<_>> = ok_if_any(symbols.filter_map(Result::transpose));
match res { match res {
Ok(v) => { Ok(v) => {
// remove duplicates, comparing `Definition`s // remove duplicates, comparing `Definition`s