Merge #9217

9217: internal: Don't stringify and reparse `cfg_attr`-gated attributes r=jonas-schievink a=jonas-schievink

Bumps ungrammar to include https://github.com/rust-analyzer/ungrammar/pull/33

bors r+

Co-authored-by: Jonas Schievink <[email protected]>

44 files changed, 819 insertions, 680 deletions

diff --git a/Cargo.lock b/Cargo.lock
index ea2c1aed7..12a096ff1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1802,9 +1802,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
 [[package]]
 name = "ungrammar"
-version = "1.13.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76760314176cc2b94047af2f921b92c39f11a34dc05c43a3c2b0fc91cb22959f"
+checksum = "50ef6d7335c77ec3e4a7c4be74c2b9e4642569e94a4004c836f8cca71fede3a7"
 
 [[package]]
 name = "unicase"
diff --git a/crates/hir_def/src/attr.rs b/crates/hir_def/src/attr.rs
index 3886b6c04..d9f9fadc1 100644
--- a/crates/hir_def/src/attr.rs
+++ b/crates/hir_def/src/attr.rs
@@ -106,7 +106,9 @@ impl RawAttrs {
     ) -> Self {
         let entries = collect_attrs(owner)
             .flat_map(|(id, attr)| match attr {
-                Either::Left(attr) => Attr::from_src(db, attr, hygiene, id),
+                Either::Left(attr) => {
+                    attr.meta().and_then(|meta| Attr::from_src(db, meta, hygiene, id))
+                }
                 Either::Right(comment) => comment.doc_comment().map(|doc| Attr {
                     id,
                     input: Some(Interned::new(AttrInput::Literal(SmolStr::new(doc)))),
@@ -172,10 +174,9 @@ impl RawAttrs {
                 let index = attr.id;
                 let attrs = parts.filter(|a| !a.is_empty()).filter_map(|attr| {
                     let tree = Subtree { delimiter: None, token_trees: attr.to_vec() };
-                    let attr = ast::Attr::parse(&format!("#[{}]", tree)).ok()?;
                     // FIXME hygiene
                     let hygiene = Hygiene::new_unhygienic();
-                    Attr::from_src(db, attr, &hygiene, index)
+                    Attr::from_tt(db, &tree, &hygiene, index)
                 });
 
                 let cfg_options = &crate_graph[krate].cfg_options;
@@ -664,7 +665,7 @@ impl fmt::Display for AttrInput {
 impl Attr {
     fn from_src(
         db: &dyn DefDatabase,
-        ast: ast::Attr,
+        ast: ast::Meta,
         hygiene: &Hygiene,
         id: AttrId,
     ) -> Option<Attr> {
@@ -683,6 +684,19 @@ impl Attr {
         Some(Attr { id, path, input })
     }
 
+    fn from_tt(
+        db: &dyn DefDatabase,
+        tt: &tt::Subtree,
+        hygiene: &Hygiene,
+        id: AttrId,
+    ) -> Option<Attr> {
+        let (parse, _) =
+            mbe::token_tree_to_syntax_node(tt, hir_expand::FragmentKind::MetaItem).ok()?;
+        let ast = ast::Meta::cast(parse.syntax_node())?;
+
+        Self::from_src(db, ast, hygiene, id)
+    }
+
     /// Parses this attribute as a `#[derive]`, returns an iterator that yields all contained paths
     /// to derive macros.
     ///
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index ed4f18e1f..1c6d36939 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -208,7 +208,7 @@ pub(crate) fn hover(
 }
 
 fn try_hover_for_attribute(token: &SyntaxToken) -> Option<RangeInfo<HoverResult>> {
-    let attr = token.ancestors().nth(1).and_then(ast::Attr::cast)?;
+    let attr = token.ancestors().find_map(ast::Attr::cast)?;
     let (path, tt) = attr.as_simple_call()?;
     if !tt.syntax().text_range().contains(token.text_range().start()) {
         return None;
diff --git a/crates/ide_db/src/defs.rs b/crates/ide_db/src/defs.rs
index 1b69d72f9..a54f2c323 100644
--- a/crates/ide_db/src/defs.rs
+++ b/crates/ide_db/src/defs.rs
@@ -369,7 +369,7 @@ impl NameRefClass {
             }
 
             if let Some(resolved) = sema.resolve_path(&path) {
-                if path.syntax().parent().and_then(ast::Attr::cast).is_some() {
+                if path.syntax().ancestors().find_map(ast::Attr::cast).is_some() {
                     if let PathResolution::Def(ModuleDef::Function(func)) = resolved {
                         if func.attrs(sema.db).by_key("proc_macro_attribute").exists() {
                             return Some(NameRefClass::Definition(resolved.into()));
diff --git a/crates/mbe/src/tests/expand.rs b/crates/mbe/src/tests/expand.rs
index 5f173f513..75c88687c 100644
--- a/crates/mbe/src/tests/expand.rs
+++ b/crates/mbe/src/tests/expand.rs
@@ -1846,16 +1846,17 @@ fn test_no_space_after_semi_colon() {
     [email protected]
       [email protected] "#"
       [email protected] "["
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "cfg"
-      [email protected]
-        [email protected] "("
-        [email protected] "feature"
-        [email protected] "="
-        [email protected] "\"std\""
-        [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "cfg"
+        [email protected]
+          [email protected] "("
+          [email protected] "feature"
+          [email protected] "="
+          [email protected] "\"std\""
+          [email protected] ")"
       [email protected] "]"
     [email protected] "mod"
     [email protected]
@@ -1865,16 +1866,17 @@ fn test_no_space_after_semi_colon() {
     [email protected]
       [email protected] "#"
       [email protected] "["
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "cfg"
-      [email protected]
-        [email protected] "("
-        [email protected] "feature"
-        [email protected] "="
-        [email protected] "\"std\""
-        [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "cfg"
+        [email protected]
+          [email protected] "("
+          [email protected] "feature"
+          [email protected] "="
+          [email protected] "\"std\""
+          [email protected] ")"
       [email protected] "]"
     [email protected] "mod"
     [email protected]
diff --git a/crates/parser/src/grammar/attributes.rs b/crates/parser/src/grammar/attributes.rs
index b8242cd2f..a44c5e484 100644
--- a/crates/parser/src/grammar/attributes.rs
+++ b/crates/parser/src/grammar/attributes.rs
@@ -13,6 +13,7 @@ pub(super) fn outer_attrs(p: &mut Parser) {
 }
 
 pub(super) fn meta(p: &mut Parser) {
+    let meta = p.start();
     paths::use_path(p);
 
     match p.current() {
@@ -25,6 +26,8 @@ pub(super) fn meta(p: &mut Parser) {
         T!['('] | T!['['] | T!['{'] => items::token_tree(p),
         _ => {}
     }
+
+    meta.complete(p, META);
 }
 
 fn attr(p: &mut Parser, inner: bool) {
diff --git a/crates/parser/src/syntax_kind/generated.rs b/crates/parser/src/syntax_kind/generated.rs
index bcefd183a..5f10b82de 100644
--- a/crates/parser/src/syntax_kind/generated.rs
+++ b/crates/parser/src/syntax_kind/generated.rs
@@ -220,7 +220,7 @@ pub enum SyntaxKind {
     ITEM_LIST,
     ASSOC_ITEM_LIST,
     ATTR,
-    META_ITEM,
+    META,
     USE_TREE,
     USE_TREE_LIST,
     PATH,
diff --git a/crates/syntax/src/ast/generated/nodes.rs b/crates/syntax/src/ast/generated/nodes.rs
index 9a88fdb56..702de59a9 100644
--- a/crates/syntax/src/ast/generated/nodes.rs
+++ b/crates/syntax/src/ast/generated/nodes.rs
@@ -150,10 +150,7 @@ impl Attr {
     pub fn pound_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![#]) }
     pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
     pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) }
+    pub fn meta(&self) -> Option<Meta> { support::child(&self.syntax) }
     pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -632,6 +629,16 @@ impl WherePred {
     pub fn ty(&self) -> Option<Type> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Meta {
+    pub(crate) syntax: SyntaxNode,
+}
+impl Meta {
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ExprStmt {
     pub(crate) syntax: SyntaxNode,
 }
@@ -2072,6 +2079,17 @@ impl AstNode for WherePred {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
+impl AstNode for Meta {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == META }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
 impl AstNode for ExprStmt {
     fn can_cast(kind: SyntaxKind) -> bool { kind == EXPR_STMT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -3887,6 +3905,11 @@ impl std::fmt::Display for WherePred {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
+impl std::fmt::Display for Meta {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
 impl std::fmt::Display for ExprStmt {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index a60bc5ad9..3d27d2c1a 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -144,19 +144,20 @@ impl AttrKind {
 
 impl ast::Attr {
     pub fn as_simple_atom(&self) -> Option<SmolStr> {
-        if self.eq_token().is_some() || self.token_tree().is_some() {
+        let meta = self.meta()?;
+        if meta.eq_token().is_some() || meta.token_tree().is_some() {
             return None;
         }
         self.simple_name()
     }
 
     pub fn as_simple_call(&self) -> Option<(SmolStr, ast::TokenTree)> {
-        let tt = self.token_tree()?;
+        let tt = self.meta()?.token_tree()?;
         Some((self.simple_name()?, tt))
     }
 
     pub fn simple_name(&self) -> Option<SmolStr> {
-        let path = self.path()?;
+        let path = self.meta()?.path()?;
         match (path.segment(), path.qualifier()) {
             (Some(segment), None) => Some(segment.syntax().first_token()?.text().into()),
             _ => None,
@@ -174,6 +175,18 @@ impl ast::Attr {
             _ => AttrKind::Outer,
         }
     }
+
+    pub fn path(&self) -> Option<ast::Path> {
+        self.meta()?.path()
+    }
+
+    pub fn expr(&self) -> Option<ast::Expr> {
+        self.meta()?.expr()
+    }
+
+    pub fn token_tree(&self) -> Option<ast::TokenTree> {
+        self.meta()?.token_tree()
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
diff --git a/crates/syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/syntax/test_data/parser/err/0005_attribute_recover.rast
index 4845a6563..6202c8bfe 100644
--- a/crates/syntax/test_data/parser/err/0005_attribute_recover.rast
+++ b/crates/syntax/test_data/parser/err/0005_attribute_recover.rast
@@ -3,20 +3,21 @@ [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "foo"
-      [email protected]
-        [email protected] "("
-        [email protected] "foo"
-        [email protected] ","
-        [email protected] " "
-        [email protected] "+"
-        [email protected] ","
-        [email protected] " "
-        [email protected] "92"
-        [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "foo"
+        [email protected]
+          [email protected] "("
+          [email protected] "foo"
+          [email protected] ","
+          [email protected] " "
+          [email protected] "+"
+          [email protected] ","
+          [email protected] " "
+          [email protected] "92"
+          [email protected] ")"
       [email protected] "]"
     [email protected] "\n"
     [email protected] "fn"
@@ -35,24 +36,25 @@ [email protected]
   [email protected]
     [email protected] "#"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "foo"
-    [email protected]
-      [email protected] "("
-      [email protected] "\n"
-      [email protected] "fn"
-      [email protected] " "
-      [email protected] "foo"
-      [email protected]
-        [email protected] "("
-        [email protected] ")"
-      [email protected] " "
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "foo"
+      [email protected]
+        [email protected] "("
+        [email protected] "\n"
+        [email protected] "fn"
+        [email protected] " "
+        [email protected] "foo"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n"
+          [email protected] "}"
   [email protected] "\n"
 error 53..53: expected R_PAREN
 error 53..53: expected `]`
diff --git a/crates/syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/syntax/test_data/parser/err/0031_block_inner_attrs.rast
index a443b37db..846279748 100644
--- a/crates/syntax/test_data/parser/err/0031_block_inner_attrs.rast
+++ b/crates/syntax/test_data/parser/err/0031_block_inner_attrs.rast
@@ -27,14 +27,15 @@ [email protected]
             [email protected] "#"
             [email protected] "!"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "doc"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"Inner attributes not ..."
-              [email protected] ")"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Inner attributes not ..."
+                [email protected] ")"
             [email protected] "]"
           [email protected] "\n        "
           [email protected] "//! Nor are ModuleDoc ..."
@@ -57,28 +58,30 @@ [email protected]
               [email protected] "#"
               [email protected] "!"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "doc"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"Nor here\""
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "doc"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "\"Nor here\""
+                  [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
             [email protected]
               [email protected] "#"
               [email protected] "!"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "doc"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"We error on each attr\""
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "doc"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "\"We error on each attr\""
+                  [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
             [email protected] "//! Nor are ModuleDoc ..."
@@ -99,14 +102,15 @@ [email protected]
             [email protected] "#"
             [email protected] "!"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "doc"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"Nor here\""
-              [email protected] ")"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Nor here\""
+                [email protected] ")"
             [email protected] "]"
           [email protected] "\n        "
           [email protected] "//! Nor are ModuleDoc ..."
diff --git a/crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
index 672dd054a..b6209639d 100644
--- a/crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
+++ b/crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
@@ -135,14 +135,15 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "cfg"
-              [email protected]
-                [email protected] "("
-                [email protected] "test"
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "cfg"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "test"
+                  [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
             [email protected]
diff --git a/crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
index 33bb085e9..84c8e9ee7 100644
--- a/crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
+++ b/crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
@@ -47,14 +47,15 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "cfg"
-              [email protected]
-                [email protected] "("
-                [email protected] "test"
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "cfg"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "test"
+                  [email protected] ")"
               [email protected] "]"
           [email protected] "\n    "
           [email protected] "}"
diff --git a/crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
index 8fd8d5e59..7b8b7284f 100644
--- a/crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
+++ b/crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
@@ -15,10 +15,11 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "A"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "A"
           [email protected] "]"
         [email protected] " "
         [email protected]
@@ -35,10 +36,11 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "B"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "B"
           [email protected] "]"
         [email protected] " "
         [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
index 9ae271817..402950bcc 100644
--- a/crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
@@ -12,18 +12,19 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "serde"
-          [email protected]
-            [email protected] "("
-            [email protected] "with"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected] "\"url_serde\""
-            [email protected] ")"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "serde"
+            [email protected]
+              [email protected] "("
+              [email protected] "with"
+              [email protected] " "
+              [email protected] "="
+              [email protected] " "
+              [email protected] "\"url_serde\""
+              [email protected] ")"
           [email protected] "]"
         [email protected] "\n    "
         [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
index 4d09c9f50..db2b645b0 100644
--- a/crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
@@ -12,18 +12,19 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "serde"
-          [email protected]
-            [email protected] "("
-            [email protected] "with"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected] "\"url_serde\""
-            [email protected] ")"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "serde"
+            [email protected]
+              [email protected] "("
+              [email protected] "with"
+              [email protected] " "
+              [email protected] "="
+              [email protected] " "
+              [email protected] "\"url_serde\""
+              [email protected] ")"
           [email protected] "]"
         [email protected] "\n    "
         [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
index 141a7b203..24ac1d66a 100644
--- a/crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
@@ -26,14 +26,15 @@ [email protected]
         [email protected] "#"
         [email protected] "!"
         [email protected] "["
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "doc"
-        [email protected]
-          [email protected] "("
-          [email protected] "\"This is also a doc c ..."
-          [email protected] ")"
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "doc"
+          [email protected]
+            [email protected] "("
+            [email protected] "\"This is also a doc c ..."
+            [email protected] ")"
         [email protected] "]"
       [email protected] "\n"
       [email protected] "}"
diff --git a/crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
index ec7a00f1d..7fbeee203 100644
--- a/crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
@@ -25,42 +25,45 @@ [email protected]
             [email protected] "#"
             [email protected] "!"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "doc"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"Inner attribute\""
-              [email protected] ")"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Inner attribute\""
+                [email protected] ")"
             [email protected] "]"
           [email protected] "\n        "
           [email protected]
             [email protected] "#"
             [email protected] "!"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "doc"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"Can be\""
-              [email protected] ")"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Can be\""
+                [email protected] ")"
             [email protected] "]"
           [email protected] "\n        "
           [email protected]
             [email protected] "#"
             [email protected] "!"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "doc"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"Stacked\""
-              [email protected] ")"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Stacked\""
+                [email protected] ")"
             [email protected] "]"
           [email protected] "\n        "
           [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
index 97924da05..40852f514 100644
--- a/crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
@@ -25,18 +25,19 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "cfg"
-              [email protected]
-                [email protected] "("
-                [email protected] "feature"
-                [email protected] " "
-                [email protected] "="
-                [email protected] " "
-                [email protected] "\"some\""
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "cfg"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "feature"
+                  [email protected] " "
+                  [email protected] "="
+                  [email protected] " "
+                  [email protected] "\"some\""
+                  [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
             [email protected]
@@ -53,18 +54,19 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "cfg"
-              [email protected]
-                [email protected] "("
-                [email protected] "feature"
-                [email protected] " "
-                [email protected] "="
-                [email protected] " "
-                [email protected] "\"other\""
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "cfg"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "feature"
+                  [email protected] " "
+                  [email protected] "="
+                  [email protected] " "
+                  [email protected] "\"other\""
+                  [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
             [email protected]
@@ -81,52 +83,55 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "cfg"
-              [email protected]
-                [email protected] "("
-                [email protected] "feature"
-                [email protected] " "
-                [email protected] "="
-                [email protected] " "
-                [email protected] "\"many\""
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "cfg"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "feature"
+                  [email protected] " "
+                  [email protected] "="
+                  [email protected] " "
+                  [email protected] "\"many\""
+                  [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "cfg"
-              [email protected]
-                [email protected] "("
-                [email protected] "feature"
-                [email protected] " "
-                [email protected] "="
-                [email protected] " "
-                [email protected] "\"attributes\""
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "cfg"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "feature"
+                  [email protected] " "
+                  [email protected] "="
+                  [email protected] " "
+                  [email protected] "\"attributes\""
+                  [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "cfg"
-              [email protected]
-                [email protected] "("
-                [email protected] "feature"
-                [email protected] " "
-                [email protected] "="
-                [email protected] " "
-                [email protected] "\"before\""
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "cfg"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "feature"
+                  [email protected] " "
+                  [email protected] "="
+                  [email protected] " "
+                  [email protected] "\"before\""
+                  [email protected] ")"
               [email protected] "]"
             [email protected] "\n        "
             [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
index 616aa984e..840181383 100644
--- a/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
@@ -10,14 +10,15 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "derive"
-          [email protected]
-            [email protected] "("
-            [email protected] "Lifetime"
-            [email protected] ")"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "derive"
+            [email protected]
+              [email protected] "("
+              [email protected] "Lifetime"
+              [email protected] ")"
           [email protected] "]"
         [email protected] " "
         [email protected]
@@ -28,14 +29,15 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "derive"
-          [email protected]
-            [email protected] "("
-            [email protected] "Type"
-            [email protected] ")"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "derive"
+            [email protected]
+              [email protected] "("
+              [email protected] "Type"
+              [email protected] ")"
           [email protected] "]"
         [email protected] " "
         [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
index 54ea2c7c6..5e82214c0 100644
--- a/crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
@@ -24,14 +24,15 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "cfg"
-              [email protected]
-                [email protected] "("
-                [email protected] "test"
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "cfg"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "test"
+                  [email protected] ")"
               [email protected] "]"
             [email protected] " "
             [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
index 0342e64f3..178204fec 100644
--- a/crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
@@ -15,10 +15,11 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "A"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "A"
           [email protected] "]"
         [email protected] " "
         [email protected]
@@ -36,10 +37,11 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "B"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "B"
           [email protected] "]"
         [email protected] " "
         [email protected]
@@ -56,19 +58,21 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "C"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "C"
           [email protected] "]"
         [email protected] " "
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "D"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "D"
           [email protected] "]"
         [email protected] " "
         [email protected]
@@ -79,10 +83,11 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "D"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "D"
           [email protected] "]"
         [email protected] " "
         [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
index 3b46e5b47..9daac234a 100644
--- a/crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
@@ -19,10 +19,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "A"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "A"
               [email protected] "]"
             [email protected] " "
             [email protected]
@@ -42,10 +43,11 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "B"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "B"
           [email protected] "]"
         [email protected] " "
         [email protected] "&"
diff --git a/crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rast
index 4c07cefa6..c3a79836a 100644
--- a/crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rast
@@ -109,10 +109,11 @@ [email protected]
           [email protected]
             [email protected] "#"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "attr"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "attr"
             [email protected] "]"
           [email protected]
             [email protected] "|"
diff --git a/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
index c54e64e3f..891eace59 100644
--- a/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
@@ -10,10 +10,11 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "must_use"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "must_use"
           [email protected] "]"
         [email protected] " "
         [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
index a84088bf3..a363e592b 100644
--- a/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
@@ -10,10 +10,11 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "attr1"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "attr1"
           [email protected] "]"
         [email protected] " "
         [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0145_record_pat_field.rast b/crates/syntax/test_data/parser/inline/ok/0145_record_pat_field.rast
index e9202a612..c606a7c9b 100644
--- a/crates/syntax/test_data/parser/inline/ok/0145_record_pat_field.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0145_record_pat_field.rast
@@ -87,17 +87,18 @@ [email protected]
               [email protected]
                 [email protected] "#"
                 [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "any"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-                  [email protected] ")"
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "cfg"
+                  [email protected]
+                    [email protected] "("
+                    [email protected] "any"
+                    [email protected]
+                      [email protected] "("
+                      [email protected] ")"
+                    [email protected] ")"
                 [email protected] "]"
               [email protected] " "
               [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rast
index f284aafcd..26cdc2945 100644
--- a/crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rast
@@ -31,14 +31,15 @@ [email protected]
           [email protected]
             [email protected] "#"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "cfg"
-            [email protected]
-              [email protected] "("
-              [email protected] "test"
-              [email protected] ")"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "test"
+                [email protected] ")"
             [email protected] "]"
           [email protected] " "
           [email protected] "2"
diff --git a/crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast b/crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
index 2905c5f1a..1d20765b0 100644
--- a/crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
@@ -23,10 +23,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected] "92"
diff --git a/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rast
index d34b21abe..3b6612677 100644
--- a/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rast
@@ -34,14 +34,15 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "cfg"
-          [email protected]
-            [email protected] "("
-            [email protected] "test"
-            [email protected] ")"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "cfg"
+            [email protected]
+              [email protected] "("
+              [email protected] "test"
+              [email protected] ")"
           [email protected] "]"
         [email protected] " "
         [email protected] "2"
diff --git a/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast b/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast
index 42587243a..be2d1dc12 100644
--- a/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast
+++ b/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast
@@ -3,182 +3,192 @@ [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "attr"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "attr"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "attr"
-    [email protected]
-      [email protected] "("
-      [email protected] "true"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "attr"
+      [email protected]
+        [email protected] "("
+        [email protected] "true"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "attr"
-    [email protected]
-      [email protected] "("
-      [email protected] "ident"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "attr"
+      [email protected]
+        [email protected] "("
+        [email protected] "ident"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "attr"
-    [email protected]
-      [email protected] "("
-      [email protected] "ident"
-      [email protected] ","
-      [email protected] " "
-      [email protected] "100"
-      [email protected] ","
-      [email protected] " "
-      [email protected] "true"
-      [email protected] ","
-      [email protected] " "
-      [email protected] "\"true\""
-      [email protected] ","
-      [email protected] " "
-      [email protected] "ident"
-      [email protected] " "
-      [email protected] "="
-      [email protected] " "
-      [email protected] "100"
-      [email protected] ","
-      [email protected] " "
-      [email protected] "ident"
-      [email protected] " "
-      [email protected] "="
-      [email protected] " "
-      [email protected] "\"hello\""
-      [email protected] ","
-      [email protected] " "
-      [email protected] "ident"
-      [email protected]
-        [email protected] "("
-        [email protected] "100"
-        [email protected] ")"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "attr"
+      [email protected]
+        [email protected] "("
+        [email protected] "ident"
+        [email protected] ","
+        [email protected] " "
+        [email protected] "100"
+        [email protected] ","
+        [email protected] " "
+        [email protected] "true"
+        [email protected] ","
+        [email protected] " "
+        [email protected] "\"true\""
+        [email protected] ","
+        [email protected] " "
+        [email protected] "ident"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected] "100"
+        [email protected] ","
+        [email protected] " "
+        [email protected] "ident"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected] "\"hello\""
+        [email protected] ","
+        [email protected] " "
+        [email protected] "ident"
+        [email protected]
+          [email protected] "("
+          [email protected] "100"
+          [email protected] ")"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "attr"
-    [email protected]
-      [email protected] "("
-      [email protected] "100"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "attr"
+      [email protected]
+        [email protected] "("
+        [email protected] "100"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "attr"
-    [email protected]
-      [email protected] "("
-      [email protected] "enabled"
-      [email protected] " "
-      [email protected] "="
-      [email protected] " "
-      [email protected] "true"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "attr"
+      [email protected]
+        [email protected] "("
+        [email protected] "enabled"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected] "true"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "enabled"
-    [email protected]
-      [email protected] "("
-      [email protected] "true"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "enabled"
+      [email protected]
+        [email protected] "("
+        [email protected] "true"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "attr"
-    [email protected]
-      [email protected] "("
-      [email protected] "\"hello\""
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "attr"
+      [email protected]
+        [email protected] "("
+        [email protected] "\"hello\""
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "repr"
-    [email protected]
-      [email protected] "("
-      [email protected] "C"
-      [email protected] ","
-      [email protected] " "
-      [email protected] "align"
-      [email protected] " "
-      [email protected] "="
-      [email protected] " "
-      [email protected] "4"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "repr"
+      [email protected]
+        [email protected] "("
+        [email protected] "C"
+        [email protected] ","
+        [email protected] " "
+        [email protected] "align"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected] "4"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "repr"
-    [email protected]
-      [email protected] "("
-      [email protected] "C"
-      [email protected] ","
-      [email protected] " "
-      [email protected] "align"
-      [email protected]
-        [email protected] "("
-        [email protected] "4"
-        [email protected] ")"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "repr"
+      [email protected]
+        [email protected] "("
+        [email protected] "C"
+        [email protected] ","
+        [email protected] " "
+        [email protected] "align"
+        [email protected]
+          [email protected] "("
+          [email protected] "4"
+          [email protected] ")"
+        [email protected] ")"
     [email protected] "]"
diff --git a/crates/syntax/test_data/parser/ok/0008_mod_item.rast b/crates/syntax/test_data/parser/ok/0008_mod_item.rast
index b2c1d791f..8b1e0a52d 100644
--- a/crates/syntax/test_data/parser/ok/0008_mod_item.rast
+++ b/crates/syntax/test_data/parser/ok/0008_mod_item.rast
@@ -65,10 +65,11 @@ [email protected]
         [email protected] "#"
         [email protected] "!"
         [email protected] "["
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "attr"
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "attr"
         [email protected] "]"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast
index 478fdba75..ff5877a7b 100644
--- a/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast
+++ b/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast
@@ -3,23 +3,25 @@ [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "cfg"
-      [email protected]
-        [email protected] "("
-        [email protected] "test"
-        [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "cfg"
+        [email protected]
+          [email protected] "("
+          [email protected] "test"
+          [email protected] ")"
       [email protected] "]"
     [email protected] "\n"
     [email protected]
       [email protected] "#"
       [email protected] "["
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "ignore"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "ignore"
       [email protected] "]"
     [email protected] "\n"
     [email protected] "fn"
@@ -38,15 +40,16 @@ [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "path"
-      [email protected] " "
-      [email protected] "="
-      [email protected] " "
-      [email protected]
-        [email protected] "\"a.rs\""
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "path"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "\"a.rs\""
       [email protected] "]"
     [email protected] "\n"
     [email protected] "mod"
diff --git a/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast b/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
index a3e091ad3..94791f771 100644
--- a/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
+++ b/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
@@ -3,15 +3,16 @@ [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "foo"
-      [email protected]
-        [email protected] "("
-        [email protected] "a"
-        [email protected] ","
-        [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "foo"
+        [email protected]
+          [email protected] "("
+          [email protected] "a"
+          [email protected] ","
+          [email protected] ")"
       [email protected] "]"
     [email protected] "\n"
     [email protected] "fn"
diff --git a/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast
index 46b192dc1..20675dbf5 100644
--- a/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -11,71 +11,76 @@ [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "allow"
-    [email protected]
-      [email protected] "("
-      [email protected] "non_camel_case_types"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "allow"
+      [email protected]
+        [email protected] "("
+        [email protected] "non_camel_case_types"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "allow"
-    [email protected]
-      [email protected] "("
-      [email protected] "dead_code"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "allow"
+      [email protected]
+        [email protected] "("
+        [email protected] "dead_code"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "allow"
-    [email protected]
-      [email protected] "("
-      [email protected] "unreachable_code"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "allow"
+      [email protected]
+        [email protected] "("
+        [email protected] "unreachable_code"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "allow"
-    [email protected]
-      [email protected] "("
-      [email protected] "unused_parens"
-      [email protected] ")"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "allow"
+      [email protected]
+        [email protected] "("
+        [email protected] "unused_parens"
+        [email protected] ")"
     [email protected] "]"
   [email protected] "\n\n"
   [email protected]
     [email protected] "#"
     [email protected] "!"
     [email protected] "["
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected] "recursion_limit"
-    [email protected] " "
-    [email protected] "="
-    [email protected] " "
-    [email protected]
-      [email protected] "\"128\""
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "recursion_limit"
+      [email protected] " "
+      [email protected] "="
+      [email protected] " "
+      [email protected]
+        [email protected] "\"128\""
     [email protected] "]"
   [email protected] "\n\n"
   [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/syntax/test_data/parser/ok/0044_let_attrs.rast
index af44a4dbe..d0e7a1dbe 100644
--- a/crates/syntax/test_data/parser/ok/0044_let_attrs.rast
+++ b/crates/syntax/test_data/parser/ok/0044_let_attrs.rast
@@ -17,18 +17,19 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "cfg"
-          [email protected]
-            [email protected] "("
-            [email protected] "feature"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected] "\"backtrace\""
-            [email protected] ")"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "cfg"
+            [email protected]
+              [email protected] "("
+              [email protected] "feature"
+              [email protected] " "
+              [email protected] "="
+              [email protected] " "
+              [email protected] "\"backtrace\""
+              [email protected] ")"
           [email protected] "]"
         [email protected] "\n    "
         [email protected] "let"
diff --git a/crates/syntax/test_data/parser/ok/0045_block_attrs.rast b/crates/syntax/test_data/parser/ok/0045_block_attrs.rast
index 5e50b4e0b..7fbd635d0 100644
--- a/crates/syntax/test_data/parser/ok/0045_block_attrs.rast
+++ b/crates/syntax/test_data/parser/ok/0045_block_attrs.rast
@@ -15,14 +15,15 @@ [email protected]
         [email protected] "#"
         [email protected] "!"
         [email protected] "["
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "doc"
-        [email protected]
-          [email protected] "("
-          [email protected] "\"Inner attributes all ..."
-          [email protected] ")"
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "doc"
+          [email protected]
+            [email protected] "("
+            [email protected] "\"Inner attributes all ..."
+            [email protected] ")"
         [email protected] "]"
       [email protected] "\n    "
       [email protected] "//! As are ModuleDoc  ..."
@@ -35,28 +36,30 @@ [email protected]
             [email protected] "#"
             [email protected] "!"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "doc"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"Inner attributes are ..."
-              [email protected] ")"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Inner attributes are ..."
+                [email protected] ")"
             [email protected] "]"
           [email protected] "\n        "
           [email protected]
             [email protected] "#"
             [email protected] "!"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "doc"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"Being validated is n ..."
-              [email protected] ")"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Being validated is n ..."
+                [email protected] ")"
             [email protected] "]"
           [email protected] "\n        "
           [email protected] "//! As are ModuleDoc  ..."
@@ -71,14 +74,15 @@ [email protected]
           [email protected] "#"
           [email protected] "!"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "doc"
-          [email protected]
-            [email protected] "("
-            [email protected] "\"Inner attributes are ..."
-            [email protected] ")"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Inner attributes are ..."
+              [email protected] ")"
           [email protected] "]"
         [email protected] "\n        "
         [email protected] "//! As are ModuleDoc  ..."
@@ -111,14 +115,15 @@ [email protected]
           [email protected]
             [email protected] "#"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "doc"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"Outer attributes are ..."
-              [email protected] ")"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Outer attributes are ..."
+                [email protected] ")"
             [email protected] "]"
           [email protected] " "
           [email protected] "{"
@@ -200,14 +205,15 @@ [email protected]
             [email protected] "#"
             [email protected] "!"
             [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "allow"
-            [email protected]
-              [email protected] "("
-              [email protected] "unused_variables"
-              [email protected] ")"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "allow"
+              [email protected]
+                [email protected] "("
+                [email protected] "unused_variables"
+                [email protected] ")"
             [email protected] "]"
           [email protected] " "
           [email protected] "// this is  `inner_at ..."
diff --git a/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast b/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast
index 37594769a..854ff9d56 100644
--- a/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast
+++ b/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast
@@ -14,14 +14,15 @@ [email protected]
         [email protected] "#"
         [email protected] "!"
         [email protected] "["
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "doc"
-        [email protected]
-          [email protected] "("
-          [email protected] "\"This is also a doc c ..."
-          [email protected] ")"
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "doc"
+          [email protected]
+            [email protected] "("
+            [email protected] "\"This is also a doc c ..."
+            [email protected] ")"
         [email protected] "]"
       [email protected] "\n"
       [email protected] "}"
diff --git a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
index 88470c41c..f935a0df5 100644
--- a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -10,19 +10,21 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "attr1"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "attr1"
           [email protected] "]"
         [email protected] " "
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "attr2"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "attr2"
           [email protected] "]"
         [email protected] " "
         [email protected]
@@ -52,10 +54,11 @@ [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "attr1"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "attr1"
           [email protected] "]"
         [email protected] " "
         [email protected]
@@ -111,10 +114,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected] "..."
@@ -157,10 +161,11 @@ [email protected]
                       [email protected]
                         [email protected] "#"
                         [email protected] "["
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "attr"
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected]
+                                [email protected] "attr"
                         [email protected] "]"
                       [email protected] " "
                       [email protected]
@@ -207,10 +212,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected]
@@ -229,10 +235,11 @@ [email protected]
               [email protected] "#"
               [email protected] " "
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected]
@@ -275,10 +282,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "must_use"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "must_use"
               [email protected] "]"
             [email protected] " "
             [email protected]
@@ -300,10 +308,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected]
@@ -325,10 +334,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected] "&"
@@ -357,10 +367,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected] "&"
@@ -391,10 +402,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected] "&"
@@ -426,10 +438,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected] "&"
@@ -457,10 +470,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected]
@@ -489,10 +503,11 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "attr"
               [email protected] "]"
             [email protected] " "
             [email protected]
diff --git a/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
index 87d8ebcba..97416f16a 100644
--- a/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
+++ b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
@@ -5,10 +5,11 @@ [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "macro_export"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "macro_export"
       [email protected] "]"
     [email protected] "\n"
     [email protected] "macro_rules"
diff --git a/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast
index 0c22c31a4..e75848f0f 100644
--- a/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast
+++ b/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast
@@ -55,10 +55,11 @@ [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "test"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "test"
       [email protected] "]"
     [email protected] "\n"
     [email protected] "fn"
diff --git a/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast
index f7c094898..dcc4105c9 100644
--- a/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast
+++ b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast
@@ -96,14 +96,15 @@ [email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "cfg"
-              [email protected]
-                [email protected] "("
-                [email protected] "never"
-                [email protected] ")"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "cfg"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "never"
+                  [email protected] ")"
               [email protected] "]"
             [email protected] " "
             [email protected]
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 997770958..c4fc91386 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = "1.0.26"
 flate2 = "1.0"
 proc-macro2 = "1.0.8"
 quote = "1.0.2"
-ungrammar = "=1.13"
+ungrammar = "=1.14"
 walkdir = "2.3.1"
 write-json = "0.1.0"
 xshell = "0.1"
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 0fd1d13e6..fe37d0245 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -184,7 +184,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "ITEM_LIST",
         "ASSOC_ITEM_LIST",
         "ATTR",
-        "META_ITEM", // not an item actually
+        "META",
         "USE_TREE",
         "USE_TREE_LIST",
         "PATH",