diff options
author | Ekaterina Babshukova <[email protected]> | 2019-09-21 17:35:39 +0100 |
---|---|---|
committer | Ekaterina Babshukova <[email protected]> | 2019-10-22 21:47:31 +0100 |
commit | d6ae1b5f0f3e1b9b7f85dcdbd98e0c336b7a882d (patch) | |
tree | b945f83081f91ad49b8636c3aa25761bbee22858 /crates/ra_ide_api/src/syntax_highlighting.rs | |
parent | 11577288c23b1f2de1aaba0137c9c2d6344b9a92 (diff) |
refactor name_ref_kind.rs
Diffstat (limited to 'crates/ra_ide_api/src/syntax_highlighting.rs')
-rw-r--r-- | crates/ra_ide_api/src/syntax_highlighting.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crates/ra_ide_api/src/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs index 03104e348..98373a49c 100644 --- a/crates/ra_ide_api/src/syntax_highlighting.rs +++ b/crates/ra_ide_api/src/syntax_highlighting.rs | |||
@@ -14,7 +14,7 @@ use ra_syntax::{ | |||
14 | 14 | ||
15 | use crate::{ | 15 | use crate::{ |
16 | db::RootDatabase, | 16 | db::RootDatabase, |
17 | name_ref_kind::{classify_name_ref, NameKind::*}, | 17 | name_kind::{classify_name_ref, NameKind::*}, |
18 | FileId, | 18 | FileId, |
19 | }; | 19 | }; |
20 | 20 | ||
@@ -104,7 +104,6 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa | |||
104 | // FIXME: try to reuse the SourceAnalyzers | 104 | // FIXME: try to reuse the SourceAnalyzers |
105 | let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None); | 105 | let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None); |
106 | match classify_name_ref(db, &analyzer, &name_ref) { | 106 | match classify_name_ref(db, &analyzer, &name_ref) { |
107 | Some(Method(_)) => "function", | ||
108 | Some(Macro(_)) => "macro", | 107 | Some(Macro(_)) => "macro", |
109 | Some(FieldAccess(_)) => "field", | 108 | Some(FieldAccess(_)) => "field", |
110 | Some(AssocItem(hir::AssocItem::Function(_))) => "function", | 109 | Some(AssocItem(hir::AssocItem::Function(_))) => "function", |