Skip to content

Commit 1895888

Browse files
committed
Handle more cases in highlight_name_by_syntax
1 parent e2d36cb commit 1895888

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

crates/ra_ide/src/syntax_highlighting.rs

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -481,23 +481,31 @@ fn highlight_name(db: &RootDatabase, def: Definition) -> Highlight {
481481
}
482482

483483
fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
484-
let default = HighlightTag::Function.into();
484+
let default = HighlightTag::UnresolvedReference;
485485

486486
let parent = match name.syntax().parent() {
487487
Some(it) => it,
488-
_ => return default,
488+
_ => return default.into(),
489489
};
490490

491-
match parent.kind() {
492-
STRUCT_DEF => HighlightTag::Struct.into(),
493-
ENUM_DEF => HighlightTag::Enum.into(),
494-
UNION_DEF => HighlightTag::Union.into(),
495-
TRAIT_DEF => HighlightTag::Trait.into(),
496-
TYPE_ALIAS_DEF => HighlightTag::TypeAlias.into(),
497-
TYPE_PARAM => HighlightTag::TypeParam.into(),
498-
RECORD_FIELD_DEF => HighlightTag::Field.into(),
491+
let tag = match parent.kind() {
492+
STRUCT_DEF => HighlightTag::Struct,
493+
ENUM_DEF => HighlightTag::Enum,
494+
UNION_DEF => HighlightTag::Union,
495+
TRAIT_DEF => HighlightTag::Trait,
496+
TYPE_ALIAS_DEF => HighlightTag::TypeAlias,
497+
TYPE_PARAM => HighlightTag::TypeParam,
498+
RECORD_FIELD_DEF => HighlightTag::Field,
499+
MODULE => HighlightTag::Module,
500+
FN_DEF => HighlightTag::Function,
501+
CONST_DEF => HighlightTag::Constant,
502+
STATIC_DEF => HighlightTag::Static,
503+
ENUM_VARIANT => HighlightTag::EnumVariant,
504+
BIND_PAT => HighlightTag::Local,
499505
_ => default,
500-
}
506+
};
507+
508+
tag.into()
501509
}
502510

503511
fn highlight_injection(

0 commit comments

Comments
 (0)