mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #9344

Browse Source 
9344: fix: rename works when invoked on a reference r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-06-20 14:08:19 +00:00 committed by GitHub
commit f1097c2d26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
crates/ide/src/rename.rs
View File

@ -10,7 +10,7 @@ use ide_db::{
rename::{bail, format_err, source_edit_from_references, IdentifierKind}, rename::{bail, format_err, source_edit_from_references, IdentifierKind},
RootDatabase, RootDatabase,
}; };
use stdx::never; use stdx::{always, never};
use syntax::{ast, AstNode, SyntaxNode}; use syntax::{ast, AstNode, SyntaxNode};
use text_edit::TextEdit; use text_edit::TextEdit;
@ -31,10 +31,13 @@ pub(crate) fn prepare_rename(
let source_file = sema.parse(position.file_id); let source_file = sema.parse(position.file_id);
let syntax = source_file.syntax(); let syntax = source_file.syntax();
let def = find_definition(&sema, syntax, position)?; let (name_like, def) = find_definition(&sema, syntax, position)?;
let frange = def if def.range_for_rename(&sema).is_none() {
.range_for_rename(&sema) bail!("No references found at position")
.ok_or_else(|| format_err!("No references found at position"))?; }
let frange = sema.original_range(name_like.syntax());
always!(frange.range.contains_inclusive(position.offset) && frange.file_id == position.file_id);
Ok(RangeInfo::new(frange.range, ())) Ok(RangeInfo::new(frange.range, ()))
} }
@ -55,31 +58,23 @@ pub(crate) fn rename(
new_name: &str, new_name: &str,
) -> RenameResult<SourceChange> { ) -> RenameResult<SourceChange> {
let sema = Semantics::new(db); let sema = Semantics::new(db);
rename_with_semantics(&sema, position, new_name)
}
pub(crate) fn rename_with_semantics(
sema: &Semantics<RootDatabase>,
position: FilePosition,
new_name: &str,
) -> RenameResult<SourceChange> {
let source_file = sema.parse(position.file_id); let source_file = sema.parse(position.file_id);
let syntax = source_file.syntax(); let syntax = source_file.syntax();
let def = find_definition(sema, syntax, position)?; let (_name_like, def) = find_definition(&sema, syntax, position)?;
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); return rename_self_to_param(&sema, local, self_param, new_name);
} }
if new_name == "self" { if new_name == "self" {
cov_mark::hit!(rename_to_self); cov_mark::hit!(rename_to_self);
return rename_to_self(sema, local); return rename_to_self(&sema, local);
} }
} }
def.rename(sema, new_name) def.rename(&sema, new_name)
} }
/// Called by the client when it is about to rename a file. /// Called by the client when it is about to rename a file.
@ -100,11 +95,12 @@ fn find_definition(
sema: &Semantics<RootDatabase>, sema: &Semantics<RootDatabase>,
syntax: &SyntaxNode, syntax: &SyntaxNode,
position: FilePosition, position: FilePosition,
) -> RenameResult<Definition> { ) -> RenameResult<(ast::NameLike, Definition)> {
match sema let name_like = sema
.find_node_at_offset_with_descend(syntax, position.offset) .find_node_at_offset_with_descend::<ast::NameLike>(syntax, position.offset)
.ok_or_else(|| format_err!("No references found at position"))? .ok_or_else(|| format_err!("No references found at position"))?;
{
let def = match &name_like {
// renaming aliases would rename the item being aliased as the HIR doesn't track aliases yet // renaming aliases would rename the item being aliased as the HIR doesn't track aliases yet
ast::NameLike::Name(name) ast::NameLike::Name(name)
if name.syntax().parent().map_or(false, |it| ast::Rename::can_cast(it.kind())) => if name.syntax().parent().map_or(false, |it| ast::Rename::can_cast(it.kind())) =>
@ -134,7 +130,9 @@ fn find_definition(
.map(|it| it.referenced_or_defined(sema.db)) .map(|it| it.referenced_or_defined(sema.db))
}), }),
} }
.ok_or_else(|| format_err!("No references found at position")) .ok_or_else(|| format_err!("No references found at position"))?;
Ok((name_like, def))
} }
fn rename_to_self(sema: &Semantics<RootDatabase>, local: hir::Local) -> RenameResult<SourceChange> { fn rename_to_self(sema: &Semantics<RootDatabase>, local: hir::Local) -> RenameResult<SourceChange> {
@ -328,7 +326,7 @@ mod tests {
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#"8..17: 'lifetime"#]]);
check_prepare(r"fn name<'lifetime>() { name$0(); }", expect![[r#"3..7: name"#]]); check_prepare(r"fn name<'lifetime>() { name$0(); }", expect![[r#"23..27: name"#]]);
} }
#[test] #[test]