squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Handle more cases in highlight_name_by_syntax

Browse source
This commit is contained in:
Matthew Jasper 2020-05-21 17:44:45 +01:00
parent e2d36cb692
commit 1895888aec
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
crates/ra_ide/src/syntax_highlighting.rs
View file

@ -481,23 +481,31 @@ fn highlight_name(db: &RootDatabase, def: Definition) -> Highlight {
} }
fn highlight_name_by_syntax(name: ast::Name) -> Highlight { fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
let default = HighlightTag::Function.into(); let default = HighlightTag::UnresolvedReference;
let parent = match name.syntax().parent() { let parent = match name.syntax().parent() {
Some(it) => it, Some(it) => it,
_ => return default, _ => return default.into(),
}; };
match parent.kind() { let tag = match parent.kind() {
STRUCT_DEF => HighlightTag::Struct.into(), STRUCT_DEF => HighlightTag::Struct,
ENUM_DEF => HighlightTag::Enum.into(), ENUM_DEF => HighlightTag::Enum,
UNION_DEF => HighlightTag::Union.into(), UNION_DEF => HighlightTag::Union,
TRAIT_DEF => HighlightTag::Trait.into(), TRAIT_DEF => HighlightTag::Trait,
TYPE_ALIAS_DEF => HighlightTag::TypeAlias.into(), TYPE_ALIAS_DEF => HighlightTag::TypeAlias,
TYPE_PARAM => HighlightTag::TypeParam.into(), TYPE_PARAM => HighlightTag::TypeParam,
RECORD_FIELD_DEF => HighlightTag::Field.into(), RECORD_FIELD_DEF => HighlightTag::Field,
MODULE => HighlightTag::Module,
FN_DEF => HighlightTag::Function,
CONST_DEF => HighlightTag::Constant,
STATIC_DEF => HighlightTag::Static,
ENUM_VARIANT => HighlightTag::EnumVariant,
BIND_PAT => HighlightTag::Local,
_ => default, _ => default,
} };
tag.into()
} }
fn highlight_injection( fn highlight_injection(