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

Classify name takes const patterns into account

Browse Source
This commit is contained in:
Aleksey Kladov
2020-02-28 15:27:52 +01:00
parent 9ef6359950
commit 209eb32796
6 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ra_ide/src/syntax_highlighting.rs
View File

@@ -7,7 +7,7 @@ mod tests;
use hir::{Name, Semantics};
use ra_ide_db::{
defs::{classify_name, NameDefinition},
defs::{classify_name, NameClass, NameDefinition},
RootDatabase,
};
use ra_prof::profile;
@@ -169,7 +169,7 @@ fn highlight_element(
let name = element.into_node().and_then(ast::Name::cast).unwrap();
let name_kind = classify_name(sema, &name);
if let Some(NameDefinition::Local(local)) = &name_kind {
if let Some(NameClass::NameDefinition(NameDefinition::Local(local))) = &name_kind {
if let Some(name) = local.name(db) {
let shadow_count = bindings_shadow_count.entry(name.clone()).or_default();
*shadow_count += 1;
@@ -177,11 +177,13 @@ fn highlight_element(
}
};
let h = match name_kind {
Some(name_kind) => highlight_name(db, name_kind),
None => highlight_name_by_syntax(name),
};
h | HighlightModifier::Definition
match name_kind {
Some(NameClass::NameDefinition(def)) => {
highlight_name(db, def) | HighlightModifier::Definition
}
Some(NameClass::ConstReference(def)) => highlight_name(db, def),
None => highlight_name_by_syntax(name) | HighlightModifier::Definition,
}
}
// Highlight references like the definitions they resolve to