Add derive handles cursor

3 files changed, 26 insertions, 10 deletions

diff --git a/crates/libsyntax2/src/ast/generated.rs b/crates/libsyntax2/src/ast/generated.rs
index c575e15df..be3f73f7e 100644
--- a/crates/libsyntax2/src/ast/generated.rs
+++ b/crates/libsyntax2/src/ast/generated.rs
@@ -339,6 +339,7 @@ impl<R: TreeRoot> AstNode<R> for NominalDef<R> {
     }
 }
 
+impl<R: TreeRoot> ast::AttrsOwner<R> for NominalDef<R> {}
 impl<R: TreeRoot> NominalDef<R> {}
 
 // ParenType
diff --git a/crates/libsyntax2/src/ast/mod.rs b/crates/libsyntax2/src/ast/mod.rs
index fe8f91d15..d53b12ab8 100644
--- a/crates/libsyntax2/src/ast/mod.rs
+++ b/crates/libsyntax2/src/ast/mod.rs
@@ -52,19 +52,31 @@ impl<R: TreeRoot> File<R> {
 impl<R: TreeRoot> FnDef<R> {
     pub fn has_atom_attr(&self, atom: &str) -> bool {
         self.attrs()
-            .filter_map(|x| x.value())
-            .filter_map(|x| as_atom(x))
+            .filter_map(|x| x.as_atom())
             .any(|x| x == atom)
     }
 }
 
-fn as_atom<R: TreeRoot>(tt: TokenTree<R>) -> Option<SmolStr> {
-    let syntax = tt.syntax_ref();
-    let (_bra, attr, _ket) = syntax.children().collect_tuple()?;
-    if attr.kind() == IDENT {
-        Some(attr.leaf_text().unwrap())
-    } else {
-        None
+impl<R: TreeRoot> Attr<R> {
+    pub fn as_atom(&self) -> Option<SmolStr> {
+        let tt = self.value()?;
+        let (_bra, attr, _ket) = tt.syntax().children().collect_tuple()?;
+        if attr.kind() == IDENT {
+            Some(attr.leaf_text().unwrap())
+        } else {
+            None
+        }
+    }
+
+    pub fn as_call(&self) -> Option<(SmolStr, TokenTree<R>)> {
+        let tt = self.value()?;
+        let (_bra, attr, args, _ket) = tt.syntax().children().collect_tuple()?;
+        let args = TokenTree::cast(args)?;
+        if attr.kind() == IDENT {
+            Some((attr.leaf_text().unwrap(), args))
+        } else {
+            None
+        }
     }
 }
 
diff --git a/crates/libsyntax2/src/grammar.ron b/crates/libsyntax2/src/grammar.ron
index 4e523da9a..abeffb2c3 100644
--- a/crates/libsyntax2/src/grammar.ron
+++ b/crates/libsyntax2/src/grammar.ron
@@ -272,6 +272,9 @@ Grammar(
             "DynTraitType",
         ]),
 
-        "NominalDef": ( enum: ["StructDef", "EnumDef"]),
+        "NominalDef": (
+            enum: ["StructDef", "EnumDef"],
+            traits: [ "AttrsOwner" ],
+        ),
     },
 )