language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

exclude '

Browse source
This commit is contained in:
Alex Vasilev 2023-01-24 13:19:20 +05:30
parent 5f1796f837
commit 5d013a79d6
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ use ide_db::{
}; };
use itertools::Itertools; use itertools::Itertools;
use stdx::{always, never}; use stdx::{always, never};
use syntax::{ast, AstNode, SyntaxNode}; use syntax::{ast, AstNode, SyntaxNode, TextRange, TextSize};
use text_edit::TextEdit; use text_edit::TextEdit;
@ -48,7 +48,13 @@ pub(crate) fn prepare_rename(
frange.range.contains_inclusive(position.offset) frange.range.contains_inclusive(position.offset)
&& frange.file_id == position.file_id && frange.file_id == position.file_id
); );
Ok(frange.range)
Ok(match name_like {
ast::NameLike::Lifetime(_) => {
TextRange::new(frange.range.start() + TextSize::from(1), frange.range.end())
}
_ => frange.range,
})
}) })
.reduce(|acc, cur| match (acc, cur) { .reduce(|acc, cur| match (acc, cur) {
// ensure all ranges are the same // ensure all ranges are the same
@ -407,7 +413,7 @@ mod tests {
#[test] #[test]
fn test_prepare_rename_namelikes() { fn test_prepare_rename_namelikes() {
check_prepare(r"fn name$0<'lifetime>() {}", expect![[r#"3..7: name"#]]); check_prepare(r"fn name$0<'lifetime>() {}", expect![[r#"3..7: name"#]]);
check_prepare(r"fn name<'lifetime$0>() {}", expect![[r#"8..17: 'lifetime"#]]); check_prepare(r"fn name<'lifetime$0>() {}", expect![[r#"9..17: lifetime"#]]);
check_prepare(r"fn name<'lifetime>() { name$0(); }", expect![[r#"23..27: name"#]]); check_prepare(r"fn name<'lifetime>() { name$0(); }", expect![[r#"23..27: name"#]]);
} }