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

fix

Browse source
This commit is contained in:
Alex Vasilev 2023-01-24 23:22:30 +05:30
parent 5d013a79d6
commit 3c898dd9a1
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -334,11 +334,12 @@ pub fn source_edit_from_references(
_ => false,
};
if !has_emitted_edit && !edited_ranges.contains(&range.start()) {
let new_name = match name {
ast::NameLike::Lifetime(_) => {
format!("'{}", new_name.trim_start_matches("'"))
}
_ => new_name.into(),
let (range, new_name) = match name {
ast::NameLike::Lifetime(_) => (
TextRange::new(range.start() + syntax::TextSize::from(1), range.end()),
new_name.strip_prefix('\'').unwrap_or(new_name).to_owned(),
),
_ => (range, new_name.to_owned()),
};
edit.replace(range, new_name);
@ -507,14 +508,14 @@ fn source_edit_from_def(
}
}
if edit.is_empty() {
let new_name = match def {
let (range, new_name) = match def {
Definition::GenericParam(hir::GenericParam::LifetimeParam(_))
| Definition::Label(_) => {
format!("'{}", new_name.trim_start_matches("'"))
}
_ => new_name.into(),
| Definition::Label(_) => (
TextRange::new(range.start() + syntax::TextSize::from(1), range.end()),
new_name.strip_prefix('\'').unwrap_or(new_name).to_owned(),
),
_ => (range, new_name.to_owned()),
};
edit.replace(range, new_name);
}
Ok((file_id, edit.finish()))