4 files changed, 66 insertions, 8 deletions

diff --git a/crates/libsyntax2/src/ast/generated.rs b/crates/libsyntax2/src/ast/generated.rs
index 12e5a1c3e..c9b587ecb 100644
--- a/crates/libsyntax2/src/ast/generated.rs
+++ b/crates/libsyntax2/src/ast/generated.rs
@@ -5,6 +5,30 @@ use {
 };
 
 #[derive(Debug, Clone, Copy)]
+pub struct Enum<R: TreeRoot = Arc<SyntaxRoot>> {
+    syntax: SyntaxNode<R>,
+}
+
+impl<R: TreeRoot> AstNode<R> for Enum<R> {
+    fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
+        match syntax.kind() {
+            ENUM => Some(Enum { syntax }),
+            _ => None,
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode<R> { &self.syntax }
+}
+
+impl<R: TreeRoot> Enum<R> {
+    pub fn name(&self) -> Option<Name<R>> {
+        self.syntax()
+            .children()
+            .filter_map(Name::cast)
+            .next()
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
 pub struct File<R: TreeRoot = Arc<SyntaxRoot>> {
     syntax: SyntaxNode<R>,
 }
@@ -68,3 +92,27 @@ impl<R: TreeRoot> AstNode<R> for Name<R> {
 
 impl<R: TreeRoot> Name<R> {}
 
+#[derive(Debug, Clone, Copy)]
+pub struct Struct<R: TreeRoot = Arc<SyntaxRoot>> {
+    syntax: SyntaxNode<R>,
+}
+
+impl<R: TreeRoot> AstNode<R> for Struct<R> {
+    fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
+        match syntax.kind() {
+            STRUCT => Some(Struct { syntax }),
+            _ => None,
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode<R> { &self.syntax }
+}
+
+impl<R: TreeRoot> Struct<R> {
+    pub fn name(&self) -> Option<Name<R>> {
+        self.syntax()
+            .children()
+            .filter_map(Name::cast)
+            .next()
+    }
+}
+
diff --git a/crates/libsyntax2/src/grammar.ron b/crates/libsyntax2/src/grammar.ron
index 650f72212..a8916c5c7 100644
--- a/crates/libsyntax2/src/grammar.ron
+++ b/crates/libsyntax2/src/grammar.ron
@@ -112,11 +112,11 @@ Grammar(
         "ENUM",
         "FUNCTION",
         "EXTERN_CRATE_ITEM",
-        "MOD_ITEM",
+        "MODULE",
         "USE_ITEM",
         "STATIC_ITEM",
         "CONST_ITEM",
-        "TRAIT_ITEM",
+        "TRAIT",
         "IMPL_ITEM",
         "TYPE_ITEM",
         "MACRO_CALL",
@@ -224,6 +224,16 @@ Grammar(
                 ["name", "Name"]
             ]
         ),
+        "Struct": (
+            options: [
+                ["name", "Name"]
+            ]
+        ),
+        "Enum": (
+            options: [
+                ["name", "Name"]
+            ]
+        ),
         "Name": (),
     },
 )
diff --git a/crates/libsyntax2/src/grammar/items/mod.rs b/crates/libsyntax2/src/grammar/items/mod.rs
index be4ff976a..6f401ea1b 100644
--- a/crates/libsyntax2/src/grammar/items/mod.rs
+++ b/crates/libsyntax2/src/grammar/items/mod.rs
@@ -121,7 +121,7 @@ pub(super) fn maybe_item(p: &mut Parser) -> MaybeItem {
         // unsafe auto trait T {}
         TRAIT_KW => {
             traits::trait_item(p);
-            TRAIT_ITEM
+            TRAIT
         }
 
         // test unsafe_impl
@@ -161,7 +161,7 @@ fn items_without_modifiers(p: &mut Parser) -> Option<SyntaxKind> {
         }
         MOD_KW => {
             mod_item(p);
-            MOD_ITEM
+            MODULE
         }
         STRUCT_KW => {
             structs::struct_item(p);
diff --git a/crates/libsyntax2/src/syntax_kinds/generated.rs b/crates/libsyntax2/src/syntax_kinds/generated.rs
index 7d2fb60f6..c45a4800c 100644
--- a/crates/libsyntax2/src/syntax_kinds/generated.rs
+++ b/crates/libsyntax2/src/syntax_kinds/generated.rs
@@ -112,11 +112,11 @@ pub enum SyntaxKind {
     ENUM,
     FUNCTION,
     EXTERN_CRATE_ITEM,
-    MOD_ITEM,
+    MODULE,
     USE_ITEM,
     STATIC_ITEM,
     CONST_ITEM,
-    TRAIT_ITEM,
+    TRAIT,
     IMPL_ITEM,
     TYPE_ITEM,
     MACRO_CALL,
@@ -347,11 +347,11 @@ impl SyntaxKind {
             ENUM => &SyntaxInfo { name: "ENUM" },
             FUNCTION => &SyntaxInfo { name: "FUNCTION" },
             EXTERN_CRATE_ITEM => &SyntaxInfo { name: "EXTERN_CRATE_ITEM" },
-            MOD_ITEM => &SyntaxInfo { name: "MOD_ITEM" },
+            MODULE => &SyntaxInfo { name: "MODULE" },
             USE_ITEM => &SyntaxInfo { name: "USE_ITEM" },
             STATIC_ITEM => &SyntaxInfo { name: "STATIC_ITEM" },
             CONST_ITEM => &SyntaxInfo { name: "CONST_ITEM" },
-            TRAIT_ITEM => &SyntaxInfo { name: "TRAIT_ITEM" },
+            TRAIT => &SyntaxInfo { name: "TRAIT" },
             IMPL_ITEM => &SyntaxInfo { name: "IMPL_ITEM" },
             TYPE_ITEM => &SyntaxInfo { name: "TYPE_ITEM" },
             MACRO_CALL => &SyntaxInfo { name: "MACRO_CALL" },