Fix union classification

diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index 30ca9d8b010c08edc596ec17636182e83fa0f8ee..c0f7c1c9ff936b3ed3d362dc615012b8b2b1c82b 100644 (file)
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -292,7 +292,7 @@ fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
     match parent.kind() {
         STRUCT_DEF => HighlightTag::Struct.into(),
         ENUM_DEF => HighlightTag::Enum.into(),
-        UNION_KW => HighlightTag::Union.into(),
+        UNION_DEF => HighlightTag::Union.into(),
         TRAIT_DEF => HighlightTag::Trait.into(),
         TYPE_ALIAS_DEF => HighlightTag::TypeAlias.into(),
         TYPE_PARAM => HighlightTag::TypeParam.into(),

diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs
index e10e72f7112c80caf099b8f8f2819fb020534f54..484755158731064fd4d92a0b6160b5d020079b6b 100644 (file)
--- a/crates/ra_ide_db/src/defs.rs
+++ b/crates/ra_ide_db/src/defs.rs
@@ -90,6 +90,10 @@ pub fn classify_name(sema: &Semantics<RootDatabase>, name: &ast::Name) -> Option
                 let def: hir::Struct = sema.to_def(&it)?;
                 Some(from_module_def(def.into()))
             },
+            ast::UnionDef(it) => {
+                let def: hir::Union = sema.to_def(&it)?;
+                Some(from_module_def(def.into()))
+            },
             ast::EnumDef(it) => {
                 let def: hir::Enum = sema.to_def(&it)?;
                 Some(from_module_def(def.into()))

diff --git a/editors/code/package.json b/editors/code/package.json
index b013c3f4ae3f6120d5180c501696312b3cbab83b..862de32103f6afc0736de8a1cebbbac8c81d6363 100644 (file)
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -460,14 +460,12 @@
             {
                 "selector": "typeAlias",
                 "scope": [
-                    "entity.name.type",
                     "entity.name.typeAlias"
                 ]
             },
             {
                 "selector": "union",
                 "scope": [
-                    "entity.name.type",
                     "entity.name.union"
                 ]
             },