diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs
index 6405a508ab0..0c52d5aadbf 100644
--- a/crates/parser/src/grammar/items.rs
+++ b/crates/parser/src/grammar/items.rs
@@ -249,14 +249,8 @@ fn opt_item_without_modifiers(p: &mut Parser, m: Marker) -> Result<(), Marker> {
         T![enum] => adt::enum_(p, m),
         IDENT if p.at_contextual_kw("union") && p.nth(1) == IDENT => adt::union(p, m),
 
-        // test pub_macro_def
-        // pub macro m($:ident) {}
-        T![macro] => {
-            macro_def(p, m);
-        }
-        IDENT if p.at_contextual_kw("macro_rules") && p.nth(1) == BANG => {
-            macro_rules(p, m);
-        }
+        T![macro] => macro_def(p, m),
+        IDENT if p.at_contextual_kw("macro_rules") && p.nth(1) == BANG => macro_rules(p, m),
 
         T![const] if (la == IDENT || la == T![_] || la == T![mut]) => consts::konst(p, m),
         T![static] => consts::static_(p, m),
@@ -413,12 +407,13 @@ fn macro_rules(p: &mut Parser, m: Marker) {
 }
 
 // test macro_def
-// macro m { ($i:ident) => {} }
 // macro m($i:ident) {}
 fn macro_def(p: &mut Parser, m: Marker) {
     p.expect(T![macro]);
     name_r(p, ITEM_RECOVERY_SET);
     if p.at(T!['{']) {
+        // test macro_def_curly
+        // macro m { ($i:ident) => {} }
         token_tree(p);
     } else if !p.at(T!['(']) {
         p.error("unmatched `(`");
diff --git a/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rast b/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rast
index 6655aeab139..4d7b78d5caa 100644
--- a/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rast
@@ -1,45 +1,19 @@
-SOURCE_FILE@0..50
-  MACRO_DEF@0..28
+SOURCE_FILE@0..21
+  MACRO_DEF@0..20
     MACRO_KW@0..5 "macro"
     WHITESPACE@5..6 " "
     NAME@6..7
       IDENT@6..7 "m"
-    WHITESPACE@7..8 " "
-    TOKEN_TREE@8..28
-      L_CURLY@8..9 "{"
-      WHITESPACE@9..10 " "
-      TOKEN_TREE@10..20
-        L_PAREN@10..11 "("
-        DOLLAR@11..12 "$"
-        IDENT@12..13 "i"
-        COLON@13..14 ":"
-        IDENT@14..19 "ident"
-        R_PAREN@19..20 ")"
-      WHITESPACE@20..21 " "
-      EQ@21..22 "="
-      R_ANGLE@22..23 ">"
-      WHITESPACE@23..24 " "
-      TOKEN_TREE@24..26
-        L_CURLY@24..25 "{"
-        R_CURLY@25..26 "}"
-      WHITESPACE@26..27 " "
-      R_CURLY@27..28 "}"
-  WHITESPACE@28..29 "\n"
-  MACRO_DEF@29..49
-    MACRO_KW@29..34 "macro"
-    WHITESPACE@34..35 " "
-    NAME@35..36
-      IDENT@35..36 "m"
-    TOKEN_TREE@36..49
-      TOKEN_TREE@36..46
-        L_PAREN@36..37 "("
-        DOLLAR@37..38 "$"
-        IDENT@38..39 "i"
-        COLON@39..40 ":"
-        IDENT@40..45 "ident"
-        R_PAREN@45..46 ")"
-      WHITESPACE@46..47 " "
-      TOKEN_TREE@47..49
-        L_CURLY@47..48 "{"
-        R_CURLY@48..49 "}"
-  WHITESPACE@49..50 "\n"
+    TOKEN_TREE@7..20
+      TOKEN_TREE@7..17
+        L_PAREN@7..8 "("
+        DOLLAR@8..9 "$"
+        IDENT@9..10 "i"
+        COLON@10..11 ":"
+        IDENT@11..16 "ident"
+        R_PAREN@16..17 ")"
+      WHITESPACE@17..18 " "
+      TOKEN_TREE@18..20
+        L_CURLY@18..19 "{"
+        R_CURLY@19..20 "}"
+  WHITESPACE@20..21 "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rs b/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rs
index 319a4e2aad2..a014ae5464e 100644
--- a/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rs
@@ -1,2 +1 @@
-macro m { ($i:ident) => {} }
 macro m($i:ident) {}
diff --git a/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast b/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast
deleted file mode 100644
index 1c527f60b9c..00000000000
--- a/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast
+++ /dev/null
@@ -1,21 +0,0 @@
-SOURCE_FILE@0..24
-  MACRO_DEF@0..23
-    VISIBILITY@0..3
-      PUB_KW@0..3 "pub"
-    WHITESPACE@3..4 " "
-    MACRO_KW@4..9 "macro"
-    WHITESPACE@9..10 " "
-    NAME@10..11
-      IDENT@10..11 "m"
-    TOKEN_TREE@11..23
-      TOKEN_TREE@11..20
-        L_PAREN@11..12 "("
-        DOLLAR@12..13 "$"
-        COLON@13..14 ":"
-        IDENT@14..19 "ident"
-        R_PAREN@19..20 ")"
-      WHITESPACE@20..21 " "
-      TOKEN_TREE@21..23
-        L_CURLY@21..22 "{"
-        R_CURLY@22..23 "}"
-  WHITESPACE@23..24 "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs b/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs
deleted file mode 100644
index 3b2be597fd8..00000000000
--- a/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub macro m($:ident) {}
diff --git a/crates/syntax/test_data/parser/inline/ok/0173_macro_def_curly.rast b/crates/syntax/test_data/parser/inline/ok/0173_macro_def_curly.rast
new file mode 100644
index 00000000000..3ec00bf55a0
--- /dev/null
+++ b/crates/syntax/test_data/parser/inline/ok/0173_macro_def_curly.rast
@@ -0,0 +1,27 @@
+SOURCE_FILE@0..29
+  MACRO_DEF@0..28
+    MACRO_KW@0..5 "macro"
+    WHITESPACE@5..6 " "
+    NAME@6..7
+      IDENT@6..7 "m"
+    WHITESPACE@7..8 " "
+    TOKEN_TREE@8..28
+      L_CURLY@8..9 "{"
+      WHITESPACE@9..10 " "
+      TOKEN_TREE@10..20
+        L_PAREN@10..11 "("
+        DOLLAR@11..12 "$"
+        IDENT@12..13 "i"
+        COLON@13..14 ":"
+        IDENT@14..19 "ident"
+        R_PAREN@19..20 ")"
+      WHITESPACE@20..21 " "
+      EQ@21..22 "="
+      R_ANGLE@22..23 ">"
+      WHITESPACE@23..24 " "
+      TOKEN_TREE@24..26
+        L_CURLY@24..25 "{"
+        R_CURLY@25..26 "}"
+      WHITESPACE@26..27 " "
+      R_CURLY@27..28 "}"
+  WHITESPACE@28..29 "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0173_macro_def_curly.rs b/crates/syntax/test_data/parser/inline/ok/0173_macro_def_curly.rs
new file mode 100644
index 00000000000..5ed0c777dc9
--- /dev/null
+++ b/crates/syntax/test_data/parser/inline/ok/0173_macro_def_curly.rs
@@ -0,0 +1 @@
+macro m { ($i:ident) => {} }
diff --git a/crates/syntax/test_data/parser/ok/0012_visibility.rast b/crates/syntax/test_data/parser/ok/0012_visibility.rast
index c5dbfb702a1..79dc9001a21 100644
--- a/crates/syntax/test_data/parser/ok/0012_visibility.rast
+++ b/crates/syntax/test_data/parser/ok/0012_visibility.rast
@@ -1,4 +1,4 @@
-SOURCE_FILE@0..98
+SOURCE_FILE@0..122
   FN@0..9
     FN_KW@0..2 "fn"
     WHITESPACE@2..3 " "
@@ -28,81 +28,101 @@ SOURCE_FILE@0..98
       L_CURLY@21..22 "{"
       R_CURLY@22..23 "}"
   WHITESPACE@23..24 "\n"
-  FN@24..44
-    VISIBILITY@24..34
+  MACRO_DEF@24..47
+    VISIBILITY@24..27
       PUB_KW@24..27 "pub"
-      L_PAREN@27..28 "("
-      PATH@28..33
-        PATH_SEGMENT@28..33
-          NAME_REF@28..33
-            CRATE_KW@28..33 "crate"
-      R_PAREN@33..34 ")"
-    WHITESPACE@34..35 " "
-    FN_KW@35..37 "fn"
-    WHITESPACE@37..38 " "
-    NAME@38..39
-      IDENT@38..39 "c"
-    PARAM_LIST@39..41
-      L_PAREN@39..40 "("
-      R_PAREN@40..41 ")"
-    WHITESPACE@41..42 " "
-    BLOCK_EXPR@42..44
-      L_CURLY@42..43 "{"
-      R_CURLY@43..44 "}"
-  WHITESPACE@44..45 "\n"
-  FN@45..65
-    VISIBILITY@45..55
-      PUB_KW@45..48 "pub"
-      L_PAREN@48..49 "("
-      PATH@49..54
-        PATH_SEGMENT@49..54
-          NAME_REF@49..54
-            SUPER_KW@49..54 "super"
-      R_PAREN@54..55 ")"
-    WHITESPACE@55..56 " "
-    FN_KW@56..58 "fn"
+    WHITESPACE@27..28 " "
+    MACRO_KW@28..33 "macro"
+    WHITESPACE@33..34 " "
+    NAME@34..35
+      IDENT@34..35 "m"
+    TOKEN_TREE@35..47
+      TOKEN_TREE@35..44
+        L_PAREN@35..36 "("
+        DOLLAR@36..37 "$"
+        COLON@37..38 ":"
+        IDENT@38..43 "ident"
+        R_PAREN@43..44 ")"
+      WHITESPACE@44..45 " "
+      TOKEN_TREE@45..47
+        L_CURLY@45..46 "{"
+        R_CURLY@46..47 "}"
+  WHITESPACE@47..48 "\n"
+  FN@48..68
+    VISIBILITY@48..58
+      PUB_KW@48..51 "pub"
+      L_PAREN@51..52 "("
+      PATH@52..57
+        PATH_SEGMENT@52..57
+          NAME_REF@52..57
+            CRATE_KW@52..57 "crate"
+      R_PAREN@57..58 ")"
     WHITESPACE@58..59 " "
-    NAME@59..60
-      IDENT@59..60 "d"
-    PARAM_LIST@60..62
-      L_PAREN@60..61 "("
-      R_PAREN@61..62 ")"
-    WHITESPACE@62..63 " "
-    BLOCK_EXPR@63..65
-      L_CURLY@63..64 "{"
-      R_CURLY@64..65 "}"
-  WHITESPACE@65..66 "\n"
-  FN@66..97
-    VISIBILITY@66..87
-      PUB_KW@66..69 "pub"
-      L_PAREN@69..70 "("
-      IN_KW@70..72 "in"
-      WHITESPACE@72..73 " "
-      PATH@73..86
-        PATH@73..81
-          PATH@73..76
-            PATH_SEGMENT@73..76
-              NAME_REF@73..76
-                IDENT@73..76 "foo"
-          COLON2@76..78 "::"
-          PATH_SEGMENT@78..81
-            NAME_REF@78..81
-              IDENT@78..81 "bar"
-        COLON2@81..83 "::"
-        PATH_SEGMENT@83..86
-          NAME_REF@83..86
-            IDENT@83..86 "baz"
-      R_PAREN@86..87 ")"
-    WHITESPACE@87..88 " "
-    FN_KW@88..90 "fn"
-    WHITESPACE@90..91 " "
-    NAME@91..92
-      IDENT@91..92 "e"
-    PARAM_LIST@92..94
-      L_PAREN@92..93 "("
-      R_PAREN@93..94 ")"
-    WHITESPACE@94..95 " "
-    BLOCK_EXPR@95..97
-      L_CURLY@95..96 "{"
-      R_CURLY@96..97 "}"
-  WHITESPACE@97..98 "\n"
+    FN_KW@59..61 "fn"
+    WHITESPACE@61..62 " "
+    NAME@62..63
+      IDENT@62..63 "c"
+    PARAM_LIST@63..65
+      L_PAREN@63..64 "("
+      R_PAREN@64..65 ")"
+    WHITESPACE@65..66 " "
+    BLOCK_EXPR@66..68
+      L_CURLY@66..67 "{"
+      R_CURLY@67..68 "}"
+  WHITESPACE@68..69 "\n"
+  FN@69..89
+    VISIBILITY@69..79
+      PUB_KW@69..72 "pub"
+      L_PAREN@72..73 "("
+      PATH@73..78
+        PATH_SEGMENT@73..78
+          NAME_REF@73..78
+            SUPER_KW@73..78 "super"
+      R_PAREN@78..79 ")"
+    WHITESPACE@79..80 " "
+    FN_KW@80..82 "fn"
+    WHITESPACE@82..83 " "
+    NAME@83..84
+      IDENT@83..84 "d"
+    PARAM_LIST@84..86
+      L_PAREN@84..85 "("
+      R_PAREN@85..86 ")"
+    WHITESPACE@86..87 " "
+    BLOCK_EXPR@87..89
+      L_CURLY@87..88 "{"
+      R_CURLY@88..89 "}"
+  WHITESPACE@89..90 "\n"
+  FN@90..121
+    VISIBILITY@90..111
+      PUB_KW@90..93 "pub"
+      L_PAREN@93..94 "("
+      IN_KW@94..96 "in"
+      WHITESPACE@96..97 " "
+      PATH@97..110
+        PATH@97..105
+          PATH@97..100
+            PATH_SEGMENT@97..100
+              NAME_REF@97..100
+                IDENT@97..100 "foo"
+          COLON2@100..102 "::"
+          PATH_SEGMENT@102..105
+            NAME_REF@102..105
+              IDENT@102..105 "bar"
+        COLON2@105..107 "::"
+        PATH_SEGMENT@107..110
+          NAME_REF@107..110
+            IDENT@107..110 "baz"
+      R_PAREN@110..111 ")"
+    WHITESPACE@111..112 " "
+    FN_KW@112..114 "fn"
+    WHITESPACE@114..115 " "
+    NAME@115..116
+      IDENT@115..116 "e"
+    PARAM_LIST@116..118
+      L_PAREN@116..117 "("
+      R_PAREN@117..118 ")"
+    WHITESPACE@118..119 " "
+    BLOCK_EXPR@119..121
+      L_CURLY@119..120 "{"
+      R_CURLY@120..121 "}"
+  WHITESPACE@121..122 "\n"
diff --git a/crates/syntax/test_data/parser/ok/0012_visibility.rs b/crates/syntax/test_data/parser/ok/0012_visibility.rs
index 75b1db12134..129d486fae2 100644
--- a/crates/syntax/test_data/parser/ok/0012_visibility.rs
+++ b/crates/syntax/test_data/parser/ok/0012_visibility.rs
@@ -1,5 +1,6 @@
 fn a() {}
 pub fn b() {}
+pub macro m($:ident) {}
 pub(crate) fn c() {}
 pub(super) fn d() {}
 pub(in foo::bar::baz) fn e() {}