fields are part of the structure

2 files changed, 34 insertions, 2 deletions

diff --git a/crates/libsyntax2/src/ast/generated.rs b/crates/libsyntax2/src/ast/generated.rs
index 80670ce71..1ec05c950 100644
--- a/crates/libsyntax2/src/ast/generated.rs
+++ b/crates/libsyntax2/src/ast/generated.rs
@@ -249,6 +249,25 @@ impl<R: TreeRoot> AstNode<R> for NameRef<R> {
 
 impl<R: TreeRoot> NameRef<R> {}
 
+// NamedField
+#[derive(Debug, Clone, Copy)]
+pub struct NamedField<R: TreeRoot = Arc<SyntaxRoot>> {
+    syntax: SyntaxNode<R>,
+}
+
+impl<R: TreeRoot> AstNode<R> for NamedField<R> {
+    fn cast(syntax: SyntaxNode<R>) -> Option<Self> {
+        match syntax.kind() {
+            NAMED_FIELD => Some(NamedField { syntax }),
+            _ => None,
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode<R> { &self.syntax }
+}
+
+impl<R: TreeRoot> ast::NameOwner<R> for NamedField<R> {}
+impl<R: TreeRoot> NamedField<R> {}
+
 // NeverType
 #[derive(Debug, Clone, Copy)]
 pub struct NeverType<R: TreeRoot = Arc<SyntaxRoot>> {
@@ -436,7 +455,13 @@ impl<R: TreeRoot> AstNode<R> for StructDef<R> {
 }
 
 impl<R: TreeRoot> ast::NameOwner<R> for StructDef<R> {}
-impl<R: TreeRoot> StructDef<R> {}
+impl<R: TreeRoot> StructDef<R> {
+    pub fn fields<'a>(&'a self) -> impl Iterator<Item = NamedField<R>> + 'a {
+        self.syntax()
+            .children()
+            .filter_map(NamedField::cast)
+    }
+}
 
 // TraitDef
 #[derive(Debug, Clone, Copy)]
diff --git a/crates/libsyntax2/src/grammar.ron b/crates/libsyntax2/src/grammar.ron
index 3ae403bb5..aa28ab922 100644
--- a/crates/libsyntax2/src/grammar.ron
+++ b/crates/libsyntax2/src/grammar.ron
@@ -222,7 +222,13 @@ Grammar(
             ]
         ),
         "FnDef": ( traits: ["NameOwner"] ),
-        "StructDef": ( traits: ["NameOwner"] ),
+        "StructDef": (
+            traits: ["NameOwner"],
+            collections: [
+                ["fields", "NamedField"]
+            ]
+        ),
+        "NamedField": ( traits: ["NameOwner"] ),
         "EnumDef": ( traits: ["NameOwner"] ),
         "TraitDef": ( traits: ["NameOwner"] ),
         "Module": ( traits: ["NameOwner"] ),
@@ -230,6 +236,7 @@ Grammar(
         "StaticDef": ( traits: ["NameOwner"] ),
         "TypeDef": ( traits: ["NameOwner"] ),
         "ImplItem": (),
+
         "Name": (),
         "NameRef": (),