language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42: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

14
crates/ide/src/references.rs
View file

@ -58,7 +58,7 @@ pub(crate) fn find_all_refs(
let (def, is_literal_search) =
if let Some(name) = get_name_of_item_declaration(&syntax, position) {
(NameClass::classify(sema, &name)?.referenced_or_defined(), true)
(NameClass::classify(sema, &name)?.defined_or_referenced_field(), true)
} else {
(find_def(sema, &syntax, position.offset)?, false)
};
@ -116,13 +116,17 @@ pub(crate) fn find_def(
offset: TextSize,
) -> Option<Definition> {
let def = match sema.find_node_at_offset_with_descend(syntax, offset)? {
ast::NameLike::NameRef(name_ref) => NameRefClass::classify(sema, &name_ref)?.referenced(),
ast::NameLike::Name(name) => NameClass::classify(sema, &name)?.referenced_or_defined(),
ast::NameLike::NameRef(name_ref) => {
NameRefClass::classify(sema, &name_ref)?.referenced_local()
}
ast::NameLike::Name(name) => {
NameClass::classify(sema, &name)?.defined_or_referenced_local()
}
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(|class| class.referenced_or_defined())
.map(|class| class.defined_or_referenced_local())
})?,
};
Some(def)