Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #14407 - Veykril:rename-fix, r=Veykril

Browse source 
fix: Fix renames of locals being broken in macro calls

Fixes https://github.com/rust-lang/rust-analyzer/issues/14379
This commit is contained in:
bors 2023-03-25 18:35:13 +00:00
commit d1c7984396
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/hir-expand/src/lib.rs
View file

@ -977,6 +977,7 @@ impl<N: AstNode> InFile<N> {
self.value.syntax().descendants().filter_map(T::cast).map(move |n| self.with_value(n)) self.value.syntax().descendants().filter_map(T::cast).map(move |n| self.with_value(n))
} }
// FIXME: this should return `Option<InFileNotHirFile<N>>`
pub fn original_ast_node(self, db: &dyn db::ExpandDatabase) -> Option<InFile<N>> { pub fn original_ast_node(self, db: &dyn db::ExpandDatabase) -> Option<InFile<N>> {
// This kind of upmapping can only be achieved in attribute expanded files, // This kind of upmapping can only be achieved in attribute expanded files,
// as we don't have node inputs otherwise and therefore can't find an `N` node in the input // as we don't have node inputs otherwise and therefore can't find an `N` node in the input

26
crates/ide-db/src/rename.rs
View file

@ -207,7 +207,7 @@ fn rename_mod(
} }
// The anchor is on the same level as target dir // The anchor is on the same level as target dir
(false, true, Some(mod_name)) => { (false, true, Some(mod_name)) => {
Some((mod_name.unescaped().to_string(), new_name.to_string())) Some((mod_name.unescaped().to_string(), new_name.to_owned()))
} }
_ => None, _ => None,
}; };
@ -232,7 +232,7 @@ fn rename_mod(
{ {
source_change.insert_source_edit( source_change.insert_source_edit(
file_id, file_id,
TextEdit::replace(file_range.range, new_name.to_string()), TextEdit::replace(file_range.range, new_name.to_owned()),
) )
}; };
} }
@ -442,7 +442,7 @@ fn source_edit_from_name_ref(
let s = field_name.syntax().text_range().start(); let s = field_name.syntax().text_range().start();
let e = pat.syntax().text_range().start(); let e = pat.syntax().text_range().start();
edit.delete(TextRange::new(s, e)); edit.delete(TextRange::new(s, e));
edit.replace(name.syntax().text_range(), new_name.to_string()); edit.replace(name.syntax().text_range(), new_name.to_owned());
return true; return true;
} }
} }
@ -462,7 +462,19 @@ fn source_edit_from_def(
if let Definition::Local(local) = def { if let Definition::Local(local) = def {
let mut file_id = None; let mut file_id = None;
for source in local.sources(sema.db) { for source in local.sources(sema.db) {
let source = source.source; let source = match source.source.clone().original_ast_node(sema.db) {
Some(source) => source,
None => match source.source.syntax().original_file_range_opt(sema.db) {
Some(FileRange { file_id: file_id2, range }) => {
file_id = Some(file_id2);
edit.replace(range, new_name.to_owned());
continue;
}
None => {
bail!("Can't rename local that is defined in a macro declaration")
}
},
};
file_id = source.file_id.file_id(); file_id = source.file_id.file_id();
if let Either::Left(pat) = source.value { if let Either::Left(pat) = source.value {
let name_range = pat.name().unwrap().syntax().text_range(); let name_range = pat.name().unwrap().syntax().text_range();
@ -485,7 +497,7 @@ fn source_edit_from_def(
// Foo { field: ref mut local @ local 2} -> Foo { field: ref mut new_name @ local2 } // Foo { field: ref mut local @ local 2} -> Foo { field: ref mut new_name @ local2 }
// Foo { field: ref mut local } -> Foo { field: ref mut new_name } // Foo { field: ref mut local } -> Foo { field: ref mut new_name }
// ^^^^^ replace this with `new_name` // ^^^^^ replace this with `new_name`
edit.replace(name_range, new_name.to_string()); edit.replace(name_range, new_name.to_owned());
} }
} else { } else {
// Foo { ref mut field } -> Foo { field: ref mut new_name } // Foo { ref mut field } -> Foo { field: ref mut new_name }
@ -495,10 +507,10 @@ fn source_edit_from_def(
pat.syntax().text_range().start(), pat.syntax().text_range().start(),
format!("{}: ", pat_field.field_name().unwrap()), format!("{}: ", pat_field.field_name().unwrap()),
); );
edit.replace(name_range, new_name.to_string()); edit.replace(name_range, new_name.to_owned());
} }
} else { } else {
edit.replace(name_range, new_name.to_string()); edit.replace(name_range, new_name.to_owned());
} }
} }
} }