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

Explicitly check for reference locals or fields in Name classification

Browse source
This commit is contained in:
Lukas Wirth 2021-07-11 14:03:35 +02:00
parent 87621de2b9
commit c65bb7f8b9
11 changed files with 67 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,11 +108,11 @@ fn find_definition(
bail!("Renaming aliases is currently unsupported")
}
ast::NameLike::Name(name) => {
NameClass::classify(sema, &name).map(|class| class.referenced_or_defined())
NameClass::classify(sema, &name).map(|class| class.defined_or_referenced_local())
}
ast::NameLike::NameRef(name_ref) => {
if let Some(def) =
NameRefClass::classify(sema, &name_ref).map(|class| class.referenced())
NameRefClass::classify(sema, &name_ref).map(|class| class.referenced_local())
{
// if the name differs from the definitions name it has to be an alias
if def.name(sema.db).map_or(false, |it| it.to_string() != name_ref.text()) {
@ -124,9 +124,10 @@ fn find_definition(
}
}
ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, &lifetime)
.map(|class| class.referenced())
.map(|class| class.referenced_local())
.or_else(|| {
NameClass::classify_lifetime(sema, &lifetime).map(|it| it.referenced_or_defined())
NameClass::classify_lifetime(sema, &lifetime)
.map(|it| it.defined_or_referenced_field())
}),
}
.ok_or_else(|| format_err!("No references found at position"))?;