make macro a NameOwner

crates/ra_syntax/src/ast/generated.rs

@@ -1908,6 +1908,7 @@ impl ToOwned for MacroCall {
 }
 
 
+impl ast::NameOwner for MacroCall {}
 impl MacroCall {
     pub fn token_tree(&self) -> Option<&TokenTree> {
         super::child_opt(self)

crates/ra_syntax/src/grammar.ron

@@ -545,7 +545,10 @@ Grammar(
         "Visibility": (),
         "Name": (),
         "NameRef": (),
-        "MacroCall": ( options: [ "TokenTree", "Path" ] ),
+        "MacroCall": (
+            traits: [ "NameOwner" ],
+            options: [ "TokenTree", "Path" ],
+        ),
         "Attr": ( options: [ ["value", "TokenTree"] ] ),
         "TokenTree": (),
         "TypeParamList": (

crates/ra_syntax/src/grammar/items.rs

@@ -347,7 +347,9 @@ fn macro_call(p: &mut Parser) -> BlockLike {
 
 pub(super) fn macro_call_after_excl(p: &mut Parser) -> BlockLike {
     p.expect(EXCL);
-    p.eat(IDENT);
+    if p.at(IDENT) {
+        name(p);
+    }
     match p.current() {
         L_CURLY => {
             token_tree(p);

crates/ra_syntax/tests/data/parser/err/0028_macro_2.0.txt

@@ -6,6 +6,7 @@ SOURCE_FILE@[0; 349)
           IDENT@[0; 5) "macro"
           err: `expected EXCL`
     WHITESPACE@[5; 6)
+    NAME@[6; 21)
       IDENT@[6; 21) "parse_use_trees"
     TOKEN_TREE@[21; 41)
       L_PAREN@[21; 22)

crates/ra_syntax/tests/data/parser/inline/ok/0062_mod_contents.txt

@@ -19,6 +19,7 @@ SOURCE_FILE@[0; 70)
           IDENT@[12; 23) "macro_rules"
     EXCL@[23; 24)
     WHITESPACE@[24; 25)
+    NAME@[25; 28)
       IDENT@[25; 28) "foo"
     WHITESPACE@[28; 29)
     TOKEN_TREE@[29; 31)

crates/ra_syntax/tests/data/parser/inline/ok/0096_no_semi_after_block.txt

@@ -92,6 +92,7 @@ SOURCE_FILE@[0; 167)
                 IDENT@[109; 120) "macro_rules"
           EXCL@[120; 121)
           WHITESPACE@[121; 122)
+          NAME@[122; 126)
             IDENT@[122; 126) "test"
           WHITESPACE@[126; 127)
           TOKEN_TREE@[127; 152)