rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

10
crates/ide/src/hover.rs
View File

@@ -96,18 +96,14 @@ pub(crate) fn hover(
match node {
// we don't use NameClass::referenced_or_defined here as we do not want to resolve
// field pattern shorthands to their definition
ast::Name(name) => NameClass::classify(&sema, &name).and_then(|class| match class {
NameClass::ConstReference(def) => Some(def),
def => def.defined(),
}),
ast::Name(name) => NameClass::classify(&sema, &name).map(|class| class.defined_or_referenced_local()),
ast::NameRef(name_ref) => {
NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced())
NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced_field())
},
ast::Lifetime(lifetime) => NameClass::classify_lifetime(&sema, &lifetime).map_or_else(
|| NameRefClass::classify_lifetime(&sema, &lifetime).map(|d| d.referenced()),
|| NameRefClass::classify_lifetime(&sema, &lifetime).map(|d| d.referenced_local()),
|d| d.defined(),
),
_ => {
if ast::Comment::cast(token.clone()).is_some() {
cov_mark::hit!(no_highlight_on_comment_hover);