aboutsummaryrefslogtreecommitdiff
path: root/crates/ide/src/syntax_highlighting.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-10-15 16:27:50 +0100
committerAleksey Kladov <[email protected]>2020-10-15 16:38:17 +0100
commit56e67e3a392d7c7c7f30ca39d8e83446ea8bbec3 (patch)
tree4fe5fa460ddaf0bc19347d42bb91215614b5e840 /crates/ide/src/syntax_highlighting.rs
parentf9c1336873d65805ad34129939d800dbf59daf61 (diff)
More idiomatic classification API
Diffstat (limited to 'crates/ide/src/syntax_highlighting.rs')
-rw-r--r--crates/ide/src/syntax_highlighting.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs
index 928f771a9..b35c03162 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs
@@ -8,7 +8,7 @@ mod tests;
8 8
9use hir::{Local, Name, Semantics, VariantDef}; 9use hir::{Local, Name, Semantics, VariantDef};
10use ide_db::{ 10use ide_db::{
11 defs::{classify_name, classify_name_ref, Definition, NameClass, NameRefClass}, 11 defs::{Definition, NameClass, NameRefClass},
12 RootDatabase, 12 RootDatabase,
13}; 13};
14use rustc_hash::FxHashMap; 14use rustc_hash::FxHashMap;
@@ -443,7 +443,7 @@ fn highlight_element(
443 // Highlight definitions depending on the "type" of the definition. 443 // Highlight definitions depending on the "type" of the definition.
444 NAME => { 444 NAME => {
445 let name = element.into_node().and_then(ast::Name::cast).unwrap(); 445 let name = element.into_node().and_then(ast::Name::cast).unwrap();
446 let name_kind = classify_name(sema, &name); 446 let name_kind = NameClass::classify(sema, &name);
447 447
448 if let Some(NameClass::Definition(Definition::Local(local))) = &name_kind { 448 if let Some(NameClass::Definition(Definition::Local(local))) = &name_kind {
449 if let Some(name) = local.name(db) { 449 if let Some(name) = local.name(db) {
@@ -480,7 +480,7 @@ fn highlight_element(
480 NAME_REF => { 480 NAME_REF => {
481 let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap(); 481 let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap();
482 highlight_func_by_name_ref(sema, &name_ref).unwrap_or_else(|| { 482 highlight_func_by_name_ref(sema, &name_ref).unwrap_or_else(|| {
483 match classify_name_ref(sema, &name_ref) { 483 match NameRefClass::classify(sema, &name_ref) {
484 Some(name_kind) => match name_kind { 484 Some(name_kind) => match name_kind {
485 NameRefClass::ExternCrate(_) => HighlightTag::Module.into(), 485 NameRefClass::ExternCrate(_) => HighlightTag::Module.into(),
486 NameRefClass::Definition(def) => { 486 NameRefClass::Definition(def) => {