From 609680ef97dbf82c07b6b06e21aa366423892304 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 17:52:53 +0200
Subject: Rename EnumDef -> Enum

---
 crates/ra_ide/src/display/navigation_target.rs | 8 ++++----
 crates/ra_ide/src/display/short_label.rs       | 2 +-
 crates/ra_ide/src/file_structure.rs            | 4 ++--
 crates/ra_ide/src/goto_implementation.rs       | 2 +-
 crates/ra_ide/src/syntax_highlighting.rs       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'crates/ra_ide')

diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index 5686faaab..02fefd6bb 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -381,7 +381,7 @@ pub(crate) fn docs_from_symbol(db: &RootDatabase, symbol: &FileSymbol) -> Option
         match node {
             ast::Fn(it) => it.doc_comment_text(),
             ast::Struct(it) => it.doc_comment_text(),
-            ast::EnumDef(it) => it.doc_comment_text(),
+            ast::Enum(it) => it.doc_comment_text(),
             ast::TraitDef(it) => it.doc_comment_text(),
             ast::Module(it) => it.doc_comment_text(),
             ast::TypeAlias(it) => it.doc_comment_text(),
@@ -406,7 +406,7 @@ pub(crate) fn description_from_symbol(db: &RootDatabase, symbol: &FileSymbol) ->
         match node {
             ast::Fn(it) => it.short_label(),
             ast::Struct(it) => it.short_label(),
-            ast::EnumDef(it) => it.short_label(),
+            ast::Enum(it) => it.short_label(),
             ast::TraitDef(it) => it.short_label(),
             ast::Module(it) => it.short_label(),
             ast::TypeAlias(it) => it.short_label(),
@@ -446,7 +446,7 @@ fn foo() { enum FooInner { } }
                         5..13,
                     ),
                     name: "FooInner",
-                    kind: ENUM_DEF,
+                    kind: ENUM,
                     container_name: None,
                     description: Some(
                         "enum FooInner",
@@ -462,7 +462,7 @@ fn foo() { enum FooInner { } }
                         34..42,
                     ),
                     name: "FooInner",
-                    kind: ENUM_DEF,
+                    kind: ENUM,
                     container_name: Some(
                         "foo",
                     ),
diff --git a/crates/ra_ide/src/display/short_label.rs b/crates/ra_ide/src/display/short_label.rs
index 504b884c5..5bf70937f 100644
--- a/crates/ra_ide/src/display/short_label.rs
+++ b/crates/ra_ide/src/display/short_label.rs
@@ -25,7 +25,7 @@ impl ShortLabel for ast::Union {
     }
 }
 
-impl ShortLabel for ast::EnumDef {
+impl ShortLabel for ast::Enum {
     fn short_label(&self) -> Option<String> {
         short_label_from_node(self, "enum ")
     }
diff --git a/crates/ra_ide/src/file_structure.rs b/crates/ra_ide/src/file_structure.rs
index 6f198fcbc..c909f96aa 100644
--- a/crates/ra_ide/src/file_structure.rs
+++ b/crates/ra_ide/src/file_structure.rs
@@ -128,7 +128,7 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
             },
             ast::Struct(it) => decl(it),
             ast::Union(it) => decl(it),
-            ast::EnumDef(it) => decl(it),
+            ast::Enum(it) => decl(it),
             ast::EnumVariant(it) => decl(it),
             ast::TraitDef(it) => decl(it),
             ast::Module(it) => decl(it),
@@ -308,7 +308,7 @@ fn very_obsolete() {}
                         label: "E",
                         navigation_range: 165..166,
                         node_range: 160..180,
-                        kind: ENUM_DEF,
+                        kind: ENUM,
                         detail: None,
                         deprecated: false,
                     },
diff --git a/crates/ra_ide/src/goto_implementation.rs b/crates/ra_ide/src/goto_implementation.rs
index 699fad57d..e2f7e6373 100644
--- a/crates/ra_ide/src/goto_implementation.rs
+++ b/crates/ra_ide/src/goto_implementation.rs
@@ -45,7 +45,7 @@ fn impls_for_def(
 ) -> Option<Vec<NavigationTarget>> {
     let ty = match node {
         ast::AdtDef::Struct(def) => sema.to_def(def)?.ty(sema.db),
-        ast::AdtDef::EnumDef(def) => sema.to_def(def)?.ty(sema.db),
+        ast::AdtDef::Enum(def) => sema.to_def(def)?.ty(sema.db),
         ast::AdtDef::Union(def) => sema.to_def(def)?.ty(sema.db),
     };
 
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index ba1fd6242..7e2833bd5 100644
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -706,7 +706,7 @@ fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
 
     let tag = match parent.kind() {
         STRUCT => HighlightTag::Struct,
-        ENUM_DEF => HighlightTag::Enum,
+        ENUM => HighlightTag::Enum,
         UNION => HighlightTag::Union,
         TRAIT_DEF => HighlightTag::Trait,
         TYPE_ALIAS => HighlightTag::TypeAlias,
-- 
cgit v1.2.3