76 files changed, 1425 insertions, 900 deletions

diff --git a/crates/base_db/src/lib.rs b/crates/base_db/src/lib.rs
index 62bf2a4b2..54baa3a63 100644
--- a/crates/base_db/src/lib.rs
+++ b/crates/base_db/src/lib.rs
@@ -120,6 +120,7 @@ impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
     }
 
     fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
+        let _p = profile::span("relevant_crates");
         let source_root = self.0.file_source_root(file_id);
         self.0.source_root_crates(source_root)
     }
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index debc3ee62..0bb3767c1 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -191,6 +191,7 @@ impl Crate {
         db: &dyn DefDatabase,
         query: import_map::Query,
     ) -> impl Iterator<Item = Either<ModuleDef, MacroDef>> {
+        let _p = profile::span("query_external_importables");
         import_map::search_dependencies(db, self.into(), query).into_iter().map(|item| match item {
             ItemInNs::Types(mod_id) | ItemInNs::Values(mod_id) => Either::Left(mod_id.into()),
             ItemInNs::Macros(mac_id) => Either::Right(mac_id.into()),
@@ -1450,6 +1451,20 @@ impl AssocItem {
             _ => None,
         }
     }
+
+    pub fn containing_trait_impl(self, db: &dyn HirDatabase) -> Option<Trait> {
+        match self.container(db) {
+            AssocItemContainer::Impl(i) => i.trait_(db),
+            _ => None,
+        }
+    }
+
+    pub fn containing_trait_or_trait_impl(self, db: &dyn HirDatabase) -> Option<Trait> {
+        match self.container(db) {
+            AssocItemContainer::Trait(t) => Some(t),
+            AssocItemContainer::Impl(i) => i.trait_(db),
+        }
+    }
 }
 
 impl HasVisibility for AssocItem {
@@ -2185,6 +2200,7 @@ impl Type {
         name: Option<&Name>,
         mut callback: impl FnMut(&Ty, Function) -> Option<T>,
     ) -> Option<T> {
+        let _p = profile::span("iterate_method_candidates");
         // There should be no inference vars in types passed here
         // FIXME check that?
         // FIXME replace Unknown by bound vars here
@@ -2218,6 +2234,7 @@ impl Type {
         name: Option<&Name>,
         mut callback: impl FnMut(&Ty, AssocItem) -> Option<T>,
     ) -> Option<T> {
+        let _p = profile::span("iterate_path_candidates");
         let canonical = hir_ty::replace_errors_with_variables(&self.ty);
 
         let env = self.env.clone();
@@ -2255,6 +2272,7 @@ impl Type {
         &'a self,
         db: &'a dyn HirDatabase,
     ) -> impl Iterator<Item = Trait> + 'a {
+        let _p = profile::span("applicable_inherent_traits");
         self.autoderef(db)
             .filter_map(|derefed_type| derefed_type.ty.dyn_trait())
             .flat_map(move |dyn_trait_id| hir_ty::all_super_traits(db.upcast(), dyn_trait_id))
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/hir_def/src/import_map.rs b/crates/hir_def/src/import_map.rs
index 960cabb5f..404e3e153 100644
--- a/crates/hir_def/src/import_map.rs
+++ b/crates/hir_def/src/import_map.rs
@@ -1,6 +1,6 @@
 //! A map of all publicly exported items in a crate.
 
-use std::{cmp::Ordering, fmt, hash::BuildHasherDefault, sync::Arc};
+use std::{fmt, hash::BuildHasherDefault, sync::Arc};
 
 use base_db::CrateId;
 use fst::{self, Streamer};
@@ -69,81 +69,11 @@ pub struct ImportMap {
 impl ImportMap {
     pub fn import_map_query(db: &dyn DefDatabase, krate: CrateId) -> Arc<Self> {
         let _p = profile::span("import_map_query");
-        let def_map = db.crate_def_map(krate);
-        let mut import_map = Self::default();
-
-        // We look only into modules that are public(ly reexported), starting with the crate root.
-        let empty = ImportPath { segments: vec![] };
-        let root = def_map.module_id(def_map.root());
-        let mut worklist = vec![(root, empty)];
-        while let Some((module, mod_path)) = worklist.pop() {
-            let ext_def_map;
-            let mod_data = if module.krate == krate {
-                &def_map[module.local_id]
-            } else {
-                // The crate might reexport a module defined in another crate.
-                ext_def_map = module.def_map(db);
-                &ext_def_map[module.local_id]
-            };
-
-            let visible_items = mod_data.scope.entries().filter_map(|(name, per_ns)| {
-                let per_ns = per_ns.filter_visibility(|vis| vis == Visibility::Public);
-                if per_ns.is_none() {
-                    None
-                } else {
-                    Some((name, per_ns))
-                }
-            });
-
-            for (name, per_ns) in visible_items {
-                let mk_path = || {
-                    let mut path = mod_path.clone();
-                    path.segments.push(name.clone());
-                    path
-                };
-
-                for item in per_ns.iter_items() {
-                    let path = mk_path();
-                    let path_len = path.len();
-                    let import_info =
-                        ImportInfo { path, container: module, is_trait_assoc_item: false };
-
-                    if let Some(ModuleDefId::TraitId(tr)) = item.as_module_def_id() {
-                        import_map.collect_trait_assoc_items(
-                            db,
-                            tr,
-                            matches!(item, ItemInNs::Types(_)),
-                            &import_info,
-                        );
-                    }
 
-                    match import_map.map.entry(item) {
-                        Entry::Vacant(entry) => {
-                            entry.insert(import_info);
-                        }
-                        Entry::Occupied(mut entry) => {
-                            // If the new path is shorter, prefer that one.
-                            if path_len < entry.get().path.len() {
-                                *entry.get_mut() = import_info;
-                            } else {
-                                continue;
-                            }
-                        }
-                    }
-
-                    // If we've just added a path to a module, descend into it. We might traverse
-                    // modules multiple times, but only if the new path to it is shorter than the
-                    // first (else we `continue` above).
-                    if let Some(ModuleDefId::ModuleId(mod_id)) = item.as_module_def_id() {
-                        worklist.push((mod_id, mk_path()));
-                    }
-                }
-            }
-        }
+        let mut import_map = collect_import_map(db, krate);
 
         let mut importables = import_map.map.iter().collect::<Vec<_>>();
-
-        importables.sort_by(cmp);
+        importables.sort_by_cached_key(|(_, import_info)| fst_path(&import_info.path));
 
         // Build the FST, taking care not to insert duplicate values.
 
@@ -151,13 +81,13 @@ impl ImportMap {
         let mut last_batch_start = 0;
 
         for idx in 0..importables.len() {
-            if let Some(next_item) = importables.get(idx + 1) {
-                if cmp(&importables[last_batch_start], next_item) == Ordering::Equal {
+            let key = fst_path(&importables[last_batch_start].1.path);
+            if let Some((_, next_import_info)) = importables.get(idx + 1) {
+                if key == fst_path(&next_import_info.path) {
                     continue;
                 }
             }
 
-            let key = fst_path(&importables[last_batch_start].1.path);
             builder.insert(key, last_batch_start as u64).unwrap();
 
             last_batch_start = idx + 1;
@@ -185,6 +115,7 @@ impl ImportMap {
         is_type_in_ns: bool,
         original_import_info: &ImportInfo,
     ) {
+        let _p = profile::span("collect_trait_assoc_items");
         for (assoc_item_name, item) in &db.trait_data(tr).items {
             let module_def_id = match item {
                 AssocItemId::FunctionId(f) => ModuleDefId::from(*f),
@@ -210,6 +141,84 @@ impl ImportMap {
     }
 }
 
+fn collect_import_map(db: &dyn DefDatabase, krate: CrateId) -> ImportMap {
+    let _p = profile::span("collect_import_map");
+
+    let def_map = db.crate_def_map(krate);
+    let mut import_map = ImportMap::default();
+
+    // We look only into modules that are public(ly reexported), starting with the crate root.
+    let empty = ImportPath { segments: vec![] };
+    let root = def_map.module_id(def_map.root());
+    let mut worklist = vec![(root, empty)];
+    while let Some((module, mod_path)) = worklist.pop() {
+        let ext_def_map;
+        let mod_data = if module.krate == krate {
+            &def_map[module.local_id]
+        } else {
+            // The crate might reexport a module defined in another crate.
+            ext_def_map = module.def_map(db);
+            &ext_def_map[module.local_id]
+        };
+
+        let visible_items = mod_data.scope.entries().filter_map(|(name, per_ns)| {
+            let per_ns = per_ns.filter_visibility(|vis| vis == Visibility::Public);
+            if per_ns.is_none() {
+                None
+            } else {
+                Some((name, per_ns))
+            }
+        });
+
+        for (name, per_ns) in visible_items {
+            let mk_path = || {
+                let mut path = mod_path.clone();
+                path.segments.push(name.clone());
+                path
+            };
+
+            for item in per_ns.iter_items() {
+                let path = mk_path();
+                let path_len = path.len();
+                let import_info =
+                    ImportInfo { path, container: module, is_trait_assoc_item: false };
+
+                if let Some(ModuleDefId::TraitId(tr)) = item.as_module_def_id() {
+                    import_map.collect_trait_assoc_items(
+                        db,
+                        tr,
+                        matches!(item, ItemInNs::Types(_)),
+                        &import_info,
+                    );
+                }
+
+                match import_map.map.entry(item) {
+                    Entry::Vacant(entry) => {
+                        entry.insert(import_info);
+                    }
+                    Entry::Occupied(mut entry) => {
+                        // If the new path is shorter, prefer that one.
+                        if path_len < entry.get().path.len() {
+                            *entry.get_mut() = import_info;
+                        } else {
+                            continue;
+                        }
+                    }
+                }
+
+                // If we've just added a path to a module, descend into it. We might traverse
+                // modules multiple times, but only if the new path to it is shorter than the
+                // first (else we `continue` above).
+                if let Some(ModuleDefId::ModuleId(mod_id)) = item.as_module_def_id() {
+                    worklist.push((mod_id, mk_path()));
+                }
+            }
+        }
+    }
+
+    import_map
+}
+
 impl PartialEq for ImportMap {
     fn eq(&self, other: &Self) -> bool {
         // `fst` and `importables` are built from `map`, so we don't need to compare them.
@@ -240,17 +249,12 @@ impl fmt::Debug for ImportMap {
 }
 
 fn fst_path(path: &ImportPath) -> String {
+    let _p = profile::span("fst_path");
     let mut s = path.to_string();
     s.make_ascii_lowercase();
     s
 }
 
-fn cmp((_, lhs): &(&ItemInNs, &ImportInfo), (_, rhs): &(&ItemInNs, &ImportInfo)) -> Ordering {
-    let lhs_str = fst_path(&lhs.path);
-    let rhs_str = fst_path(&rhs.path);
-    lhs_str.cmp(&rhs_str)
-}
-
 #[derive(Debug, Eq, PartialEq, Hash)]
 pub enum ImportKind {
     Module,
@@ -338,6 +342,7 @@ impl Query {
     }
 
     fn import_matches(&self, import: &ImportInfo, enforce_lowercase: bool) -> bool {
+        let _p = profile::span("import_map::Query::import_matches");
         if import.is_trait_assoc_item {
             if self.exclude_import_kinds.contains(&ImportKind::AssociatedItem) {
                 return false;
diff --git a/crates/hir_def/src/lang_item.rs b/crates/hir_def/src/lang_item.rs
index 9e90f745c..3a45cbfa1 100644
--- a/crates/hir_def/src/lang_item.rs
+++ b/crates/hir_def/src/lang_item.rs
@@ -141,6 +141,7 @@ impl LangItems {
     ) where
         T: Into<AttrDefId> + Copy,
     {
+        let _p = profile::span("collect_lang_item");
         if let Some(lang_item_name) = lang_attr(db, item) {
             self.items.entry(lang_item_name).or_insert_with(|| constructor(item));
         }
diff --git a/crates/hir_def/src/per_ns.rs b/crates/hir_def/src/per_ns.rs
index a594afce6..a9f13cb82 100644
--- a/crates/hir_def/src/per_ns.rs
+++ b/crates/hir_def/src/per_ns.rs
@@ -62,6 +62,7 @@ impl PerNs {
     }
 
     pub fn filter_visibility(self, mut f: impl FnMut(Visibility) -> bool) -> PerNs {
+        let _p = profile::span("PerNs::filter_visibility");
         PerNs {
             types: self.types.filter(|(_, v)| f(*v)),
             values: self.values.filter(|(_, v)| f(*v)),
@@ -86,6 +87,7 @@ impl PerNs {
     }
 
     pub fn iter_items(self) -> impl Iterator<Item = ItemInNs> {
+        let _p = profile::span("PerNs::iter_items");
         self.types
             .map(|it| ItemInNs::Types(it.0))
             .into_iter()
diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs
index 43356a94e..95fd39850 100644
--- a/crates/ide/src/goto_implementation.rs
+++ b/crates/ide/src/goto_implementation.rs
@@ -52,13 +52,13 @@ pub(crate) fn goto_implementation(
         hir::ModuleDef::Function(f) => {
             let assoc = f.as_assoc_item(sema.db)?;
             let name = assoc.name(sema.db)?;
-            let trait_ = assoc.containing_trait(sema.db)?;
+            let trait_ = assoc.containing_trait_or_trait_impl(sema.db)?;
             impls_for_trait_item(&sema, trait_, name)
         }
         hir::ModuleDef::Const(c) => {
             let assoc = c.as_assoc_item(sema.db)?;
             let name = assoc.name(sema.db)?;
-            let trait_ = assoc.containing_trait(sema.db)?;
+            let trait_ = assoc.containing_trait_or_trait_impl(sema.db)?;
             impls_for_trait_item(&sema, trait_, name)
         }
         _ => return None,
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/src/prime_caches.rs b/crates/ide/src/prime_caches.rs
index d912a01b8..36801c964 100644
--- a/crates/ide/src/prime_caches.rs
+++ b/crates/ide/src/prime_caches.rs
@@ -33,14 +33,15 @@ pub(crate) fn prime_caches(db: &RootDatabase, cb: &(dyn Fn(PrimeCachesProgress)
     // FIXME: This would be easy to parallelize, since it's in the ideal ordering for that.
     // Unfortunately rayon prevents panics from propagation out of a `scope`, which breaks
     // cancellation, so we cannot use rayon.
-    for (i, krate) in topo.iter().enumerate() {
-        let crate_name = graph[*krate].display_name.as_deref().unwrap_or_default().to_string();
+    for (i, &crate_id) in topo.iter().enumerate() {
+        let crate_name = graph[crate_id].display_name.as_deref().unwrap_or_default().to_string();
 
         cb(PrimeCachesProgress::StartedOnCrate {
             on_crate: crate_name,
             n_done: i,
             n_total: topo.len(),
         });
-        db.crate_def_map(*krate);
+        db.crate_def_map(crate_id);
+        db.import_map(crate_id);
     }
 }
diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs
index 2a4a1c3c8..7dfc5043e 100644
--- a/crates/ide/src/references/rename.rs
+++ b/crates/ide/src/references/rename.rs
@@ -239,7 +239,7 @@ fn rename_mod(
 
 fn rename_reference(
     sema: &Semantics<RootDatabase>,
-    def: Definition,
+    mut def: Definition,
     new_name: &str,
 ) -> RenameResult<SourceChange> {
     let ident_kind = check_identifier(new_name)?;
@@ -285,7 +285,38 @@ fn rename_reference(
         }
     }
 
+    def = match def {
+        // HACK: resolve trait impl items to the item def of the trait definition
+        // so that we properly resolve all trait item references
+        Definition::ModuleDef(mod_def) => mod_def
+            .as_assoc_item(sema.db)
+            .and_then(|it| it.containing_trait_impl(sema.db))
+            .and_then(|it| {
+                it.items(sema.db).into_iter().find_map(|it| match (it, mod_def) {
+                    (hir::AssocItem::Function(trait_func), ModuleDef::Function(func))
+                        if trait_func.name(sema.db) == func.name(sema.db) =>
+                    {
+                        Some(Definition::ModuleDef(ModuleDef::Function(trait_func)))
+                    }
+                    (hir::AssocItem::Const(trait_konst), ModuleDef::Const(konst))
+                        if trait_konst.name(sema.db) == konst.name(sema.db) =>
+                    {
+                        Some(Definition::ModuleDef(ModuleDef::Const(trait_konst)))
+                    }
+                    (
+                        hir::AssocItem::TypeAlias(trait_type_alias),
+                        ModuleDef::TypeAlias(type_alias),
+                    ) if trait_type_alias.name(sema.db) == type_alias.name(sema.db) => {
+                        Some(Definition::ModuleDef(ModuleDef::TypeAlias(trait_type_alias)))
+                    }
+                    _ => None,
+                })
+            })
+            .unwrap_or(def),
+        _ => def,
+    };
     let usages = def.usages(sema).all();
+
     if !usages.is_empty() && ident_kind == IdentifierKind::Underscore {
         cov_mark::hit!(rename_underscore_multiple);
         bail!("Cannot rename reference to `_` as it is being referenced multiple times");
@@ -1938,4 +1969,136 @@ use Bar$0;
             "error: Renaming aliases is currently unsupported",
         );
     }
+
+    #[test]
+    fn test_rename_trait_method() {
+        let res = r"
+trait Foo {
+    fn foo(&self) {
+        self.foo();
+    }
+}
+
+impl Foo for () {
+    fn foo(&self) {
+        self.foo();
+    }
+}";
+        check(
+            "foo",
+            r#"
+trait Foo {
+    fn bar$0(&self) {
+        self.bar();
+    }
+}
+
+impl Foo for () {
+    fn bar(&self) {
+        self.bar();
+    }
+}"#,
+            res,
+        );
+        check(
+            "foo",
+            r#"
+trait Foo {
+    fn bar(&self) {
+        self.bar$0();
+    }
+}
+
+impl Foo for () {
+    fn bar(&self) {
+        self.bar();
+    }
+}"#,
+            res,
+        );
+        check(
+            "foo",
+            r#"
+trait Foo {
+    fn bar(&self) {
+        self.bar();
+    }
+}
+
+impl Foo for () {
+    fn bar$0(&self) {
+        self.bar();
+    }
+}"#,
+            res,
+        );
+        check(
+            "foo",
+            r#"
+trait Foo {
+    fn bar(&self) {
+        self.bar();
+    }
+}
+
+impl Foo for () {
+    fn bar(&self) {
+        self.bar$0();
+    }
+}"#,
+            res,
+        );
+    }
+
+    #[test]
+    fn test_rename_trait_const() {
+        let res = r"
+trait Foo {
+    const FOO: ();
+}
+
+impl Foo for () {
+    const FOO: ();
+}
+fn f() { <()>::FOO; }";
+        check(
+            "FOO",
+            r#"
+trait Foo {
+    const BAR$0: ();
+}
+
+impl Foo for () {
+    const BAR: ();
+}
+fn f() { <()>::BAR; }"#,
+            res,
+        );
+        check(
+            "FOO",
+            r#"
+trait Foo {
+    const BAR: ();
+}
+
+impl Foo for () {
+    const BAR$0: ();
+}
+fn f() { <()>::BAR; }"#,
+            res,
+        );
+        check(
+            "FOO",
+            r#"
+trait Foo {
+    const BAR: ();
+}
+
+impl Foo for () {
+    const BAR: ();
+}
+fn f() { <()>::BAR$0; }"#,
+            res,
+        );
+    }
 }
diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs
index 9503c936d..84012227d 100644
--- a/crates/ide/src/syntax_highlighting/highlight.rs
+++ b/crates/ide/src/syntax_highlighting/highlight.rs
@@ -131,6 +131,9 @@ pub(super) fn element(
         }
         STRING | BYTE_STRING => HlTag::StringLiteral.into(),
         ATTR => HlTag::Attribute.into(),
+        INT_NUMBER if element.ancestors().nth(1).map_or(false, |it| it.kind() == FIELD_EXPR) => {
+            SymbolKind::Field.into()
+        }
         INT_NUMBER | FLOAT_NUMBER => HlTag::NumericLiteral.into(),
         BYTE => HlTag::ByteLiteral.into(),
         CHAR => HlTag::CharLiteral.into(),
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlighting.html b/crates/ide/src/syntax_highlighting/test_data/highlighting.html
index a7b5c3b89..59f1e8e4c 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlighting.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlighting.html
@@ -215,8 +215,8 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
     <span class="keyword">let</span> <span class="variable callable declaration">a</span> <span class="operator">=</span> <span class="punctuation">|</span><span class="value_param declaration">x</span><span class="punctuation">|</span> <span class="value_param">x</span><span class="semicolon">;</span>
     <span class="keyword">let</span> <span class="variable callable declaration">bar</span> <span class="operator">=</span> <span class="struct">Foo</span><span class="operator">::</span><span class="function associated">baz</span><span class="semicolon">;</span>
 
-    <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="numeric_literal">-</span><span class="numeric_literal">42</span><span class="semicolon">;</span>
-    <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="operator">-</span><span class="variable">baz</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="parenthesis">(</span><span class="numeric_literal">-</span><span class="numeric_literal">42</span><span class="comma">,</span><span class="parenthesis">)</span><span class="semicolon">;</span>
+    <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="operator">-</span><span class="variable">baz</span><span class="operator">.</span><span class="field">0</span><span class="semicolon">;</span>
 
     <span class="keyword">let</span> <span class="punctuation">_</span> <span class="operator">=</span> <span class="logical">!</span><span class="bool_literal">true</span><span class="semicolon">;</span>
 
diff --git a/crates/ide/src/syntax_highlighting/tests.rs b/crates/ide/src/syntax_highlighting/tests.rs
index 6ad2a362a..f7d8334a0 100644
--- a/crates/ide/src/syntax_highlighting/tests.rs
+++ b/crates/ide/src/syntax_highlighting/tests.rs
@@ -189,8 +189,8 @@ fn main() {
     let a = |x| x;
     let bar = Foo::baz;
 
-    let baz = -42;
-    let baz = -baz;
+    let baz = (-42,);
+    let baz = -baz.0;
 
     let _ = !true;
 
diff --git a/crates/ide_assists/src/handlers/change_visibility.rs b/crates/ide_assists/src/handlers/change_visibility.rs
index d7e39b2ae..ed936667f 100644
--- a/crates/ide_assists/src/handlers/change_visibility.rs
+++ b/crates/ide_assists/src/handlers/change_visibility.rs
@@ -1,7 +1,9 @@
 use syntax::{
     ast::{self, NameOwner, VisibilityOwner},
     AstNode,
-    SyntaxKind::{CONST, ENUM, FN, MODULE, STATIC, STRUCT, TRAIT, TYPE_ALIAS, VISIBILITY},
+    SyntaxKind::{
+        CONST, ENUM, FN, MACRO_DEF, MODULE, STATIC, STRUCT, TRAIT, TYPE_ALIAS, USE, VISIBILITY,
+    },
     T,
 };
 
@@ -37,12 +39,15 @@ fn add_vis(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
                 | T![enum]
                 | T![trait]
                 | T![type]
+                | T![use]
+                | T![macro]
         )
     });
 
     let (offset, target) = if let Some(keyword) = item_keyword {
         let parent = keyword.parent()?;
-        let def_kws = vec![CONST, STATIC, TYPE_ALIAS, FN, MODULE, STRUCT, ENUM, TRAIT];
+        let def_kws =
+            vec![CONST, STATIC, TYPE_ALIAS, FN, MODULE, STRUCT, ENUM, TRAIT, USE, MACRO_DEF];
         // Parent is not a definition, can't add visibility
         if !def_kws.iter().any(|&def_kw| def_kw == parent.kind()) {
             return None;
@@ -122,6 +127,8 @@ mod tests {
         check_assist(change_visibility, "$0trait Foo {}", "pub(crate) trait Foo {}");
         check_assist(change_visibility, "m$0od {}", "pub(crate) mod {}");
         check_assist(change_visibility, "unsafe f$0n foo() {}", "pub(crate) unsafe fn foo() {}");
+        check_assist(change_visibility, "$0macro foo() {}", "pub(crate) macro foo() {}");
+        check_assist(change_visibility, "$0use foo;", "pub(crate) use foo;");
     }
 
     #[test]
diff --git a/crates/ide_assists/src/handlers/remove_unused_param.rs b/crates/ide_assists/src/handlers/remove_unused_param.rs
index 2699d2861..fabfe7e93 100644
--- a/crates/ide_assists/src/handlers/remove_unused_param.rs
+++ b/crates/ide_assists/src/handlers/remove_unused_param.rs
@@ -37,8 +37,20 @@ pub(crate) fn remove_unused_param(acc: &mut Assists, ctx: &AssistContext) -> Opt
         _ => return None,
     };
     let func = param.syntax().ancestors().find_map(ast::Fn::cast)?;
-    let param_position = func.param_list()?.params().position(|it| it == param)?;
 
+    // check if fn is in impl Trait for ..
+    if func
+        .syntax()
+        .parent() // AssocItemList
+        .and_then(|x| x.parent())
+        .and_then(ast::Impl::cast)
+        .map_or(false, |imp| imp.trait_().is_some())
+    {
+        cov_mark::hit!(trait_impl);
+        return None;
+    }
+
+    let param_position = func.param_list()?.params().position(|it| it == param)?;
     let fn_def = {
         let func = ctx.sema.to_def(&func)?;
         Definition::ModuleDef(func.into())
@@ -254,6 +266,22 @@ fn main() { foo(9, 2) }
     }
 
     #[test]
+    fn trait_impl() {
+        cov_mark::check!(trait_impl);
+        check_assist_not_applicable(
+            remove_unused_param,
+            r#"
+trait Trait {
+    fn foo(x: i32);
+}
+impl Trait for () {
+    fn foo($0x: i32) {}
+}
+"#,
+        );
+    }
+
+    #[test]
     fn remove_across_files() {
         check_assist(
             remove_unused_param,
diff --git a/crates/ide_completion/src/completions.rs b/crates/ide_completion/src/completions.rs
index fbd499900..bd90cefb2 100644
--- a/crates/ide_completion/src/completions.rs
+++ b/crates/ide_completion/src/completions.rs
@@ -29,7 +29,7 @@ use crate::{
         macro_::render_macro,
         pattern::{render_struct_pat, render_variant_pat},
         render_field, render_resolution, render_tuple_field,
-        type_alias::render_type_alias,
+        type_alias::{render_type_alias, render_type_alias_with_eq},
         RenderContext,
     },
     CompletionContext, CompletionItem, CompletionItemKind,
@@ -188,6 +188,14 @@ impl Completions {
         self.add_opt(render_type_alias(RenderContext::new(ctx), type_alias));
     }
 
+    pub(crate) fn add_type_alias_with_eq(
+        &mut self,
+        ctx: &CompletionContext,
+        type_alias: hir::TypeAlias,
+    ) {
+        self.add_opt(render_type_alias_with_eq(RenderContext::new(ctx), type_alias));
+    }
+
     pub(crate) fn add_qualified_enum_variant(
         &mut self,
         ctx: &CompletionContext,
diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide_completion/src/completions/unqualified_path.rs
index b1e6b2b77..952f052a1 100644
--- a/crates/ide_completion/src/completions/unqualified_path.rs
+++ b/crates/ide_completion/src/completions/unqualified_path.rs
@@ -1,8 +1,9 @@
 //! Completion of names from the current scope, e.g. locals and imported items.
 
 use hir::ScopeDef;
+use syntax::{ast, AstNode};
 
-use crate::{CompletionContext, Completions};
+use crate::{patterns::ImmediateLocation, CompletionContext, Completions};
 
 pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionContext) {
     if ctx.is_path_disallowed() || !ctx.is_trivial_path() {
@@ -43,6 +44,20 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
         });
     }
 
+    if let Some(ImmediateLocation::GenericArgList(arg_list)) = &ctx.completion_location {
+        if let Some(path_seg) = arg_list.syntax().parent().and_then(ast::PathSegment::cast) {
+            if let Some(hir::PathResolution::Def(hir::ModuleDef::Trait(trait_))) =
+                ctx.sema.resolve_path(&path_seg.parent_path())
+            {
+                trait_.items(ctx.sema.db).into_iter().for_each(|it| {
+                    if let hir::AssocItem::TypeAlias(alias) = it {
+                        acc.add_type_alias_with_eq(ctx, alias)
+                    }
+                });
+            }
+        }
+    }
+
     ctx.scope.process_all_names(&mut |name, res| {
         if let ScopeDef::GenericParam(hir::GenericParam::LifetimeParam(_)) = res {
             cov_mark::hit!(skip_lifetime_completion);
@@ -777,4 +792,21 @@ $0
             "#]],
         )
     }
+
+    #[test]
+    fn completes_assoc_types_in_dynimpl_trait() {
+        check(
+            r#"
+trait Foo {
+    type Bar;
+}
+
+fn foo(_: impl Foo<B$0>) {}
+"#,
+            expect![[r#"
+                ta Bar =  type Bar;
+                tt Foo
+            "#]],
+        );
+    }
 }
diff --git a/crates/ide_completion/src/patterns.rs b/crates/ide_completion/src/patterns.rs
index ee87bf461..81d7a1a1d 100644
--- a/crates/ide_completion/src/patterns.rs
+++ b/crates/ide_completion/src/patterns.rs
@@ -47,6 +47,9 @@ pub(crate) enum ImmediateLocation {
         receiver_is_ambiguous_float_literal: bool,
     },
     // Original file ast node
+    // Only set from a type arg
+    GenericArgList(ast::GenericArgList),
+    // Original file ast node
     /// The record expr of the field name we are completing
     RecordExpr(ast::RecordExpr),
     // Original file ast node
@@ -159,7 +162,6 @@ pub(crate) fn determine_location(
             }
         }
     };
-
     let res = match_ast! {
         match parent {
             ast::IdentPat(_it) => ImmediateLocation::IdentPat,
@@ -174,6 +176,9 @@ pub(crate) fn determine_location(
                 Some(TRAIT) => ImmediateLocation::Trait,
                 _ => return None,
             },
+            ast::GenericArgList(_it) => sema
+                .find_node_at_offset_with_macros(original_file, offset)
+                .map(ImmediateLocation::GenericArgList)?,
             ast::Module(it) => {
                 if it.item_list().is_none() {
                     ImmediateLocation::ModDeclaration(it)
diff --git a/crates/ide_completion/src/render.rs b/crates/ide_completion/src/render.rs
index 902df46ca..d3db55c35 100644
--- a/crates/ide_completion/src/render.rs
+++ b/crates/ide_completion/src/render.rs
@@ -111,7 +111,10 @@ impl<'a> RenderContext<'a> {
             hir::AssocItem::TypeAlias(it) => self.is_deprecated(it),
         };
         is_assoc_deprecated
-            || assoc.containing_trait(db).map(|trait_| self.is_deprecated(trait_)).unwrap_or(false)
+            || assoc
+                .containing_trait_or_trait_impl(db)
+                .map(|trait_| self.is_deprecated(trait_))
+                .unwrap_or(false)
     }
 
     fn docs(&self, node: impl HasAttrs) -> Option<hir::Documentation> {
@@ -132,16 +135,17 @@ fn render_field_(
         ctx.source_range(),
         receiver.map_or_else(|| name.clone(), |receiver| format!("{}.{}", receiver, name)),
     );
-    item.kind(SymbolKind::Field)
-        .detail(ty.display(ctx.db()).to_string())
-        .set_documentation(field.docs(ctx.db()))
-        .set_deprecated(is_deprecated);
 
     item.set_relevance(CompletionRelevance {
         type_match: compute_type_match(ctx.completion, ty),
         exact_name_match: compute_exact_name_match(ctx.completion, &name),
         ..CompletionRelevance::default()
     });
+    item.kind(SymbolKind::Field)
+        .detail(ty.display(ctx.db()).to_string())
+        .set_documentation(field.docs(ctx.db()))
+        .set_deprecated(is_deprecated)
+        .lookup_by(name);
 
     if let Some(_ref_match) = compute_ref_match(ctx.completion, ty) {
         // FIXME
@@ -164,7 +168,9 @@ fn render_tuple_field_(
         receiver.map_or_else(|| field.to_string(), |receiver| format!("{}.{}", receiver, field)),
     );
 
-    item.kind(SymbolKind::Field).detail(ty.display(ctx.db()).to_string());
+    item.kind(SymbolKind::Field)
+        .detail(ty.display(ctx.db()).to_string())
+        .lookup_by(field.to_string());
 
     item.build()
 }
diff --git a/crates/ide_completion/src/render/function.rs b/crates/ide_completion/src/render/function.rs
index 1abeed96d..1357b9f4a 100644
--- a/crates/ide_completion/src/render/function.rs
+++ b/crates/ide_completion/src/render/function.rs
@@ -58,29 +58,29 @@ impl<'a> FunctionRender<'a> {
         Some(FunctionRender { ctx, name, receiver, func: fn_, ast_node, is_method })
     }
 
-    fn render(mut self, import_to_add: Option<ImportEdit>) -> CompletionItem {
+    fn render(self, import_to_add: Option<ImportEdit>) -> CompletionItem {
         let params = self.params();
-        if let Some(receiver) = &self.receiver {
-            self.name = format!("{}.{}", receiver, &self.name)
-        }
-        let mut item = CompletionItem::new(
-            CompletionKind::Reference,
-            self.ctx.source_range(),
-            self.name.clone(),
-        );
+        let call = if let Some(receiver) = &self.receiver {
+            format!("{}.{}", receiver, &self.name)
+        } else {
+            self.name.clone()
+        };
+        let mut item =
+            CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), call.clone());
         item.kind(self.kind())
             .set_documentation(self.ctx.docs(self.func))
             .set_deprecated(
                 self.ctx.is_deprecated(self.func) || self.ctx.is_deprecated_assoc_item(self.func),
             )
             .detail(self.detail())
-            .add_call_parens(self.ctx.completion, self.name.clone(), params)
-            .add_import(import_to_add);
+            .add_call_parens(self.ctx.completion, call.clone(), params)
+            .add_import(import_to_add)
+            .lookup_by(self.name);
 
         let ret_type = self.func.ret_type(self.ctx.db());
         item.set_relevance(CompletionRelevance {
             type_match: compute_type_match(self.ctx.completion, &ret_type),
-            exact_name_match: compute_exact_name_match(self.ctx.completion, &self.name),
+            exact_name_match: compute_exact_name_match(self.ctx.completion, &call),
             ..CompletionRelevance::default()
         });
 
@@ -263,7 +263,7 @@ fn bar(s: &S) {
         );
 
         check_edit(
-            "self.foo",
+            "foo",
             r#"
 struct S {}
 impl S {
diff --git a/crates/ide_completion/src/render/type_alias.rs b/crates/ide_completion/src/render/type_alias.rs
index e47b4c745..e0234171a 100644
--- a/crates/ide_completion/src/render/type_alias.rs
+++ b/crates/ide_completion/src/render/type_alias.rs
@@ -16,7 +16,14 @@ pub(crate) fn render_type_alias<'a>(
     ctx: RenderContext<'a>,
     type_alias: hir::TypeAlias,
 ) -> Option<CompletionItem> {
-    TypeAliasRender::new(ctx, type_alias)?.render()
+    TypeAliasRender::new(ctx, type_alias)?.render(false)
+}
+
+pub(crate) fn render_type_alias_with_eq<'a>(
+    ctx: RenderContext<'a>,
+    type_alias: hir::TypeAlias,
+) -> Option<CompletionItem> {
+    TypeAliasRender::new(ctx, type_alias)?.render(true)
 }
 
 #[derive(Debug)]
@@ -32,8 +39,14 @@ impl<'a> TypeAliasRender<'a> {
         Some(TypeAliasRender { ctx, type_alias, ast_node })
     }
 
-    fn render(self) -> Option<CompletionItem> {
-        let name = self.name()?;
+    fn render(self, with_eq: bool) -> Option<CompletionItem> {
+        let name = self.ast_node.name().map(|name| {
+            if with_eq {
+                format!("{} = ", name.text())
+            } else {
+                name.text().to_string()
+            }
+        })?;
         let detail = self.detail();
 
         let mut item =
@@ -49,10 +62,6 @@ impl<'a> TypeAliasRender<'a> {
         Some(item.build())
     }
 
-    fn name(&self) -> Option<String> {
-        self.ast_node.name().map(|name| name.text().to_string())
-    }
-
     fn detail(&self) -> String {
         type_label(&self.ast_node)
     }
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/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index 67840602b..8152630f5 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -8,7 +8,8 @@ use std::{convert::TryInto, mem};
 
 use base_db::{FileId, FileRange, SourceDatabase, SourceDatabaseExt};
 use hir::{
-    DefWithBody, HasAttrs, HasSource, InFile, ModuleDef, ModuleSource, Semantics, Visibility,
+    AsAssocItem, DefWithBody, HasAttrs, HasSource, InFile, ModuleDef, ModuleSource, Semantics,
+    Visibility,
 };
 use once_cell::unsync::Lazy;
 use rustc_hash::FxHashMap;
@@ -303,13 +304,13 @@ impl Definition {
         }
     }
 
-    pub fn usages<'a>(&'a self, sema: &'a Semantics<RootDatabase>) -> FindUsages<'a> {
+    pub fn usages<'a>(self, sema: &'a Semantics<RootDatabase>) -> FindUsages<'a> {
         FindUsages { def: self, sema, scope: None, include_self_kw_refs: None }
     }
 }
 
 pub struct FindUsages<'a> {
-    def: &'a Definition,
+    def: Definition,
     sema: &'a Semantics<'a, RootDatabase>,
     scope: Option<SearchScope>,
     include_self_kw_refs: Option<hir::Type>,
@@ -318,7 +319,7 @@ pub struct FindUsages<'a> {
 impl<'a> FindUsages<'a> {
     /// Enable searching for `Self` when the definition is a type.
     pub fn include_self_refs(mut self) -> FindUsages<'a> {
-        self.include_self_kw_refs = def_to_ty(self.sema, self.def);
+        self.include_self_kw_refs = def_to_ty(self.sema, &self.def);
         self
     }
 
@@ -445,7 +446,7 @@ impl<'a> FindUsages<'a> {
         sink: &mut dyn FnMut(FileId, FileReference) -> bool,
     ) -> bool {
         match NameRefClass::classify_lifetime(self.sema, lifetime) {
-            Some(NameRefClass::Definition(def)) if &def == self.def => {
+            Some(NameRefClass::Definition(def)) if def == self.def => {
                 let FileRange { file_id, range } = self.sema.original_range(lifetime.syntax());
                 let reference = FileReference {
                     range,
@@ -464,7 +465,7 @@ impl<'a> FindUsages<'a> {
         sink: &mut dyn FnMut(FileId, FileReference) -> bool,
     ) -> bool {
         match NameRefClass::classify(self.sema, &name_ref) {
-            Some(NameRefClass::Definition(def)) if &def == self.def => {
+            Some(NameRefClass::Definition(def)) if def == self.def => {
                 let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax());
                 let reference = FileReference {
                     range,
@@ -489,10 +490,10 @@ impl<'a> FindUsages<'a> {
             Some(NameRefClass::FieldShorthand { local_ref: local, field_ref: field }) => {
                 let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax());
                 let access = match self.def {
-                    Definition::Field(_) if &field == self.def => {
+                    Definition::Field(_) if field == self.def => {
                         reference_access(&field, &name_ref)
                     }
-                    Definition::Local(l) if &local == l => {
+                    Definition::Local(l) if local == l => {
                         reference_access(&Definition::Local(local), &name_ref)
                     }
                     _ => return false,
@@ -513,7 +514,7 @@ impl<'a> FindUsages<'a> {
         match NameClass::classify(self.sema, name) {
             Some(NameClass::PatFieldShorthand { local_def: _, field_ref })
                 if matches!(
-                    self.def, Definition::Field(_) if &field_ref == self.def
+                    self.def, Definition::Field(_) if field_ref == self.def
                 ) =>
             {
                 let FileRange { file_id, range } = self.sema.original_range(name.syntax());
@@ -525,12 +526,38 @@ impl<'a> FindUsages<'a> {
                 };
                 sink(file_id, reference)
             }
-            Some(NameClass::ConstReference(def)) if *self.def == def => {
+            Some(NameClass::ConstReference(def)) if self.def == def => {
                 let FileRange { file_id, range } = self.sema.original_range(name.syntax());
                 let reference =
                     FileReference { range, name: ast::NameLike::Name(name.clone()), access: None };
                 sink(file_id, reference)
             }
+            // Resolve trait impl function definitions to the trait definition's version if self.def is the trait definition's
+            Some(NameClass::Definition(Definition::ModuleDef(mod_def))) => {
+                /* poor man's try block */
+                (|| {
+                    let this = match self.def {
+                        Definition::ModuleDef(this) if this != mod_def => this,
+                        _ => return None,
+                    };
+                    let this_trait = this
+                        .as_assoc_item(self.sema.db)?
+                        .containing_trait_or_trait_impl(self.sema.db)?;
+                    let trait_ = mod_def
+                        .as_assoc_item(self.sema.db)?
+                        .containing_trait_or_trait_impl(self.sema.db)?;
+                    (trait_ == this_trait).then(|| {
+                        let FileRange { file_id, range } = self.sema.original_range(name.syntax());
+                        let reference = FileReference {
+                            range,
+                            name: ast::NameLike::Name(name.clone()),
+                            access: None,
+                        };
+                        sink(file_id, reference)
+                    })
+                })()
+                .unwrap_or(false)
+            }
             _ => false,
         }
     }
diff --git a/crates/ide_db/src/symbol_index.rs b/crates/ide_db/src/symbol_index.rs
index 5c372a7e5..000f87a85 100644
--- a/crates/ide_db/src/symbol_index.rs
+++ b/crates/ide_db/src/symbol_index.rs
@@ -197,6 +197,7 @@ pub fn world_symbols(db: &RootDatabase, query: Query) -> Vec<FileSymbol> {
 }
 
 pub fn crate_symbols(db: &RootDatabase, krate: CrateId, query: Query) -> Vec<FileSymbol> {
+    let _p = profile::span("crate_symbols").detail(|| format!("{:?}", query));
     // FIXME(#4842): This now depends on CrateDefMap, why not build the entire symbol index from
     // that instead?
 
@@ -321,6 +322,7 @@ impl SymbolIndex {
 
 impl Query {
     pub(crate) fn search(self, indices: &[&SymbolIndex]) -> Vec<FileSymbol> {
+        let _p = profile::span("symbol_index::Query::search");
         let mut op = fst::map::OpBuilder::new();
         for file_symbols in indices.iter() {
             let automaton = fst::automaton::Subsequence::new(&self.lowercased);
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/proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs
index cccc53220..5133e7c50 100644
--- a/crates/proc_macro_srv/src/dylib.rs
+++ b/crates/proc_macro_srv/src/dylib.rs
@@ -188,7 +188,9 @@ impl Expander {
 /// Copy the dylib to temp directory to prevent locking in Windows
 #[cfg(windows)]
 fn ensure_file_with_lock_free_access(path: &Path) -> io::Result<PathBuf> {
-    use std::{ffi::OsString, time::SystemTime};
+    use std::collections::hash_map::RandomState;
+    use std::ffi::OsString;
+    use std::hash::{BuildHasher, Hasher};
 
     let mut to = std::env::temp_dir();
 
@@ -199,10 +201,11 @@ fn ensure_file_with_lock_free_access(path: &Path) -> io::Result<PathBuf> {
         )
     })?;
 
-    // generate a time deps unique number
-    let t = SystemTime::now().duration_since(std::time::UNIX_EPOCH).expect("Time went backwards");
+    // Generate a unique number by abusing `HashMap`'s hasher.
+    // Maybe this will also "inspire" a libs team member to finally put `rand` in libstd.
+    let t = RandomState::new().build_hasher().finish();
 
-    let mut unique_name = OsString::from(t.as_millis().to_string());
+    let mut unique_name = OsString::from(t.to_string());
     unique_name.push(file_name);
 
     to.push(unique_name);
diff --git a/crates/proc_macro_srv/src/tests/utils.rs b/crates/proc_macro_srv/src/tests/utils.rs
index 2e950c113..2c093aa0a 100644
--- a/crates/proc_macro_srv/src/tests/utils.rs
+++ b/crates/proc_macro_srv/src/tests/utils.rs
@@ -7,35 +7,8 @@ use proc_macro_api::ListMacrosTask;
 use std::str::FromStr;
 
 pub mod fixtures {
-    use cargo_metadata::Message;
-    use std::path::PathBuf;
-    use std::process::Command;
-
-    // Use current project metadata to get the proc-macro dylib path
     pub fn proc_macro_test_dylib_path() -> std::path::PathBuf {
-        let name = "proc_macro_test";
-        let version = "0.0.0";
-        let command = Command::new(toolchain::cargo())
-            .args(&["check", "--tests", "--message-format", "json"])
-            .output()
-            .unwrap()
-            .stdout;
-
-        for message in Message::parse_stream(command.as_slice()) {
-            match message.unwrap() {
-                Message::CompilerArtifact(artifact) => {
-                    if artifact.target.kind.contains(&"proc-macro".to_string()) {
-                        let repr = format!("{} {}", name, version);
-                        if artifact.package_id.repr.starts_with(&repr) {
-                            return PathBuf::from(&artifact.filenames[0]);
-                        }
-                    }
-                }
-                _ => (), // Unknown message
-            }
-        }
-
-        panic!("No proc-macro dylib for {} found!", name);
+        proc_macro_test::PROC_MACRO_TEST_LOCATION.into()
     }
 }
 
diff --git a/crates/proc_macro_test/Cargo.toml b/crates/proc_macro_test/Cargo.toml
index 753443be2..1a88e361e 100644
--- a/crates/proc_macro_test/Cargo.toml
+++ b/crates/proc_macro_test/Cargo.toml
@@ -8,4 +8,8 @@ publish = false
 
 [lib]
 doctest = false
-proc-macro = true
+
+[build-dependencies]
+proc_macro_test_impl = { path = "imp", version = "0.0.0" }
+toolchain = { path = "../toolchain", version = "0.0.0" }
+cargo_metadata = "0.13"
diff --git a/crates/proc_macro_test/build.rs b/crates/proc_macro_test/build.rs
new file mode 100644
index 000000000..4653a93dd
--- /dev/null
+++ b/crates/proc_macro_test/build.rs
@@ -0,0 +1,48 @@
+//! This will build the proc macro in `imp`, and copy the resulting dylib artifact into the
+//! `OUT_DIR`.
+//!
+//! `proc_macro_test` itself contains only a path to that artifact.
+
+use std::{
+    env, fs,
+    path::{Path, PathBuf},
+    process::Command,
+};
+
+use cargo_metadata::Message;
+
+fn main() {
+    let out_dir = env::var_os("OUT_DIR").unwrap();
+    let out_dir = Path::new(&out_dir);
+
+    let name = "proc_macro_test_impl";
+    let version = "0.0.0";
+    let output = Command::new(toolchain::cargo())
+        .current_dir("imp")
+        .args(&["build", "-p", "proc_macro_test_impl", "--message-format", "json"])
+        .output()
+        .unwrap();
+    assert!(output.status.success());
+
+    let mut artifact_path = None;
+    for message in Message::parse_stream(output.stdout.as_slice()) {
+        match message.unwrap() {
+            Message::CompilerArtifact(artifact) => {
+                if artifact.target.kind.contains(&"proc-macro".to_string()) {
+                    let repr = format!("{} {}", name, version);
+                    if artifact.package_id.repr.starts_with(&repr) {
+                        artifact_path = Some(PathBuf::from(&artifact.filenames[0]));
+                    }
+                }
+            }
+            _ => (), // Unknown message
+        }
+    }
+
+    let src_path = artifact_path.expect("no dylib for proc_macro_test_impl found");
+    let dest_path = out_dir.join(src_path.file_name().unwrap());
+    fs::copy(src_path, &dest_path).unwrap();
+
+    let info_path = out_dir.join("proc_macro_test_location.txt");
+    fs::write(info_path, dest_path.to_str().unwrap()).unwrap();
+}
diff --git a/crates/proc_macro_test/imp/.gitignore b/crates/proc_macro_test/imp/.gitignore
new file mode 100644
index 000000000..2c96eb1b6
--- /dev/null
+++ b/crates/proc_macro_test/imp/.gitignore
@@ -0,0 +1,2 @@
+target/
+Cargo.lock
diff --git a/crates/proc_macro_test/imp/Cargo.toml b/crates/proc_macro_test/imp/Cargo.toml
new file mode 100644
index 000000000..1c2e75401
--- /dev/null
+++ b/crates/proc_macro_test/imp/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "proc_macro_test_impl"
+version = "0.0.0"
+license = "MIT OR Apache-2.0"
+authors = ["rust-analyzer developers"]
+edition = "2018"
+publish = false
+
+[lib]
+doctest = false
+proc-macro = true
+
+[workspace]
+
+[dependencies]
+# this crate should not have any dependencies, since it uses its own workspace,
+# and its own `Cargo.lock`
diff --git a/crates/proc_macro_test/imp/src/lib.rs b/crates/proc_macro_test/imp/src/lib.rs
new file mode 100644
index 000000000..4b26d2472
--- /dev/null
+++ b/crates/proc_macro_test/imp/src/lib.rs
@@ -0,0 +1,48 @@
+//! Exports a few trivial procedural macros for testing.
+
+use proc_macro::TokenStream;
+
+#[proc_macro]
+pub fn fn_like_noop(args: TokenStream) -> TokenStream {
+    args
+}
+
+#[proc_macro]
+pub fn fn_like_panic(args: TokenStream) -> TokenStream {
+    panic!("fn_like_panic!({})", args);
+}
+
+#[proc_macro]
+pub fn fn_like_error(args: TokenStream) -> TokenStream {
+    format!("compile_error!(\"fn_like_error!({})\");", args).parse().unwrap()
+}
+
+#[proc_macro_attribute]
+pub fn attr_noop(_args: TokenStream, item: TokenStream) -> TokenStream {
+    item
+}
+
+#[proc_macro_attribute]
+pub fn attr_panic(args: TokenStream, item: TokenStream) -> TokenStream {
+    panic!("#[attr_panic {}] {}", args, item);
+}
+
+#[proc_macro_attribute]
+pub fn attr_error(args: TokenStream, item: TokenStream) -> TokenStream {
+    format!("compile_error!(\"#[attr_error({})] {}\");", args, item).parse().unwrap()
+}
+
+#[proc_macro_derive(DeriveEmpty)]
+pub fn derive_empty(_item: TokenStream) -> TokenStream {
+    TokenStream::new()
+}
+
+#[proc_macro_derive(DerivePanic)]
+pub fn derive_panic(item: TokenStream) -> TokenStream {
+    panic!("#[derive(DerivePanic)] {}", item);
+}
+
+#[proc_macro_derive(DeriveError)]
+pub fn derive_error(item: TokenStream) -> TokenStream {
+    format!("compile_error!(\"#[derive(DeriveError)] {}\");", item).parse().unwrap()
+}
diff --git a/crates/proc_macro_test/src/lib.rs b/crates/proc_macro_test/src/lib.rs
index 4b26d2472..2edf23a63 100644
--- a/crates/proc_macro_test/src/lib.rs
+++ b/crates/proc_macro_test/src/lib.rs
@@ -1,48 +1,4 @@
 //! Exports a few trivial procedural macros for testing.
 
-use proc_macro::TokenStream;
-
-#[proc_macro]
-pub fn fn_like_noop(args: TokenStream) -> TokenStream {
-    args
-}
-
-#[proc_macro]
-pub fn fn_like_panic(args: TokenStream) -> TokenStream {
-    panic!("fn_like_panic!({})", args);
-}
-
-#[proc_macro]
-pub fn fn_like_error(args: TokenStream) -> TokenStream {
-    format!("compile_error!(\"fn_like_error!({})\");", args).parse().unwrap()
-}
-
-#[proc_macro_attribute]
-pub fn attr_noop(_args: TokenStream, item: TokenStream) -> TokenStream {
-    item
-}
-
-#[proc_macro_attribute]
-pub fn attr_panic(args: TokenStream, item: TokenStream) -> TokenStream {
-    panic!("#[attr_panic {}] {}", args, item);
-}
-
-#[proc_macro_attribute]
-pub fn attr_error(args: TokenStream, item: TokenStream) -> TokenStream {
-    format!("compile_error!(\"#[attr_error({})] {}\");", args, item).parse().unwrap()
-}
-
-#[proc_macro_derive(DeriveEmpty)]
-pub fn derive_empty(_item: TokenStream) -> TokenStream {
-    TokenStream::new()
-}
-
-#[proc_macro_derive(DerivePanic)]
-pub fn derive_panic(item: TokenStream) -> TokenStream {
-    panic!("#[derive(DerivePanic)] {}", item);
-}
-
-#[proc_macro_derive(DeriveError)]
-pub fn derive_error(item: TokenStream) -> TokenStream {
-    format!("compile_error!(\"#[derive(DeriveError)] {}\");", item).parse().unwrap()
-}
+pub static PROC_MACRO_TEST_LOCATION: &str =
+    include_str!(concat!(env!("OUT_DIR"), "/proc_macro_test_location.txt"));
diff --git a/crates/rust-analyzer/src/cli.rs b/crates/rust-analyzer/src/cli.rs
index 76b666dc2..25ebcc0ec 100644
--- a/crates/rust-analyzer/src/cli.rs
+++ b/crates/rust-analyzer/src/cli.rs
@@ -16,7 +16,6 @@ use vfs::Vfs;
 pub use self::{
     analysis_stats::AnalysisStatsCmd,
     diagnostics::diagnostics,
-    load_cargo::{load_workspace, load_workspace_at, LoadCargoConfig},
     ssr::{apply_ssr_rules, search_for_patterns},
 };
 
diff --git a/crates/rust-analyzer/src/cli/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs
index 5364e907c..843c0ca37 100644
--- a/crates/rust-analyzer/src/cli/analysis_stats.rs
+++ b/crates/rust-analyzer/src/cli/analysis_stats.rs
@@ -70,6 +70,7 @@ impl AnalysisStatsCmd {
             load_out_dirs_from_check: self.enable_build_scripts,
             wrap_rustc: false,
             with_proc_macro: self.enable_proc_macros,
+            prefill_caches: false,
         };
         let (host, vfs, _proc_macro) =
             load_workspace_at(&self.path, &cargo_config, &load_cargo_config, &|_| {})?;
diff --git a/crates/rust-analyzer/src/cli/diagnostics.rs b/crates/rust-analyzer/src/cli/diagnostics.rs
index c33c8179c..dc9a390fe 100644
--- a/crates/rust-analyzer/src/cli/diagnostics.rs
+++ b/crates/rust-analyzer/src/cli/diagnostics.rs
@@ -34,8 +34,12 @@ pub fn diagnostics(
     with_proc_macro: bool,
 ) -> Result<()> {
     let cargo_config = Default::default();
-    let load_cargo_config =
-        LoadCargoConfig { load_out_dirs_from_check, with_proc_macro, wrap_rustc: false };
+    let load_cargo_config = LoadCargoConfig {
+        load_out_dirs_from_check,
+        with_proc_macro,
+        wrap_rustc: false,
+        prefill_caches: false,
+    };
     let (host, _vfs, _proc_macro) =
         load_workspace_at(path, &cargo_config, &load_cargo_config, &|_| {})?;
     let db = host.raw_database();
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs
index 8cee65478..19cb1c046 100644
--- a/crates/rust-analyzer/src/cli/load_cargo.rs
+++ b/crates/rust-analyzer/src/cli/load_cargo.rs
@@ -14,13 +14,14 @@ use vfs::{loader::Handle, AbsPath, AbsPathBuf};
 
 use crate::reload::{ProjectFolders, SourceRootConfig};
 
-pub struct LoadCargoConfig {
-    pub load_out_dirs_from_check: bool,
-    pub wrap_rustc: bool,
-    pub with_proc_macro: bool,
+pub(crate) struct LoadCargoConfig {
+    pub(crate) load_out_dirs_from_check: bool,
+    pub(crate) wrap_rustc: bool,
+    pub(crate) with_proc_macro: bool,
+    pub(crate) prefill_caches: bool,
 }
 
-pub fn load_workspace_at(
+pub(crate) fn load_workspace_at(
     root: &Path,
     cargo_config: &CargoConfig,
     load_config: &LoadCargoConfig,
@@ -33,7 +34,7 @@ pub fn load_workspace_at(
     load_workspace(workspace, load_config, progress)
 }
 
-pub fn load_workspace(
+fn load_workspace(
     ws: ProjectWorkspace,
     config: &LoadCargoConfig,
     progress: &dyn Fn(String),
@@ -82,6 +83,10 @@ pub fn load_workspace(
     log::debug!("crate graph: {:?}", crate_graph);
     let host =
         load_crate_graph(crate_graph, project_folders.source_root_config, &mut vfs, &receiver);
+
+    if config.prefill_caches {
+        host.analysis().prime_caches(|_| {})?;
+    }
     Ok((host, vfs, proc_macro_client))
 }
 
@@ -144,6 +149,7 @@ mod tests {
             load_out_dirs_from_check: false,
             wrap_rustc: false,
             with_proc_macro: false,
+            prefill_caches: false,
         };
         let (host, _vfs, _proc_macro) =
             load_workspace_at(path, &cargo_config, &load_cargo_config, &|_| {})?;
diff --git a/crates/rust-analyzer/src/cli/ssr.rs b/crates/rust-analyzer/src/cli/ssr.rs
index 1fd9b5a9b..0b3475e09 100644
--- a/crates/rust-analyzer/src/cli/ssr.rs
+++ b/crates/rust-analyzer/src/cli/ssr.rs
@@ -13,6 +13,7 @@ pub fn apply_ssr_rules(rules: Vec<SsrRule>) -> Result<()> {
         load_out_dirs_from_check: true,
         wrap_rustc: false,
         with_proc_macro: true,
+        prefill_caches: false,
     };
     let (host, vfs, _proc_macro) =
         load_workspace_at(&std::env::current_dir()?, &cargo_config, &load_cargo_config, &|_| {})?;
@@ -39,8 +40,12 @@ pub fn search_for_patterns(patterns: Vec<SsrPattern>, debug_snippet: Option<Stri
     use ide_db::base_db::SourceDatabaseExt;
     use ide_db::symbol_index::SymbolsDatabase;
     let cargo_config = Default::default();
-    let load_cargo_config =
-        LoadCargoConfig { load_out_dirs_from_check: true, wrap_rustc: true, with_proc_macro: true };
+    let load_cargo_config = LoadCargoConfig {
+        load_out_dirs_from_check: true,
+        wrap_rustc: true,
+        with_proc_macro: true,
+        prefill_caches: false,
+    };
     let (host, _vfs, _proc_macro) =
         load_workspace_at(&std::env::current_dir()?, &cargo_config, &load_cargo_config, &|_| {})?;
     let db = host.raw_database();
diff --git a/crates/rust-analyzer/src/integrated_benchmarks.rs b/crates/rust-analyzer/src/integrated_benchmarks.rs
index ec36a5f5c..8ddeb59f7 100644
--- a/crates/rust-analyzer/src/integrated_benchmarks.rs
+++ b/crates/rust-analyzer/src/integrated_benchmarks.rs
@@ -37,6 +37,7 @@ fn integrated_highlighting_benchmark() {
         load_out_dirs_from_check: true,
         wrap_rustc: false,
         with_proc_macro: false,
+        prefill_caches: false,
     };
 
     let (mut host, vfs, _proc_macro) = {
@@ -91,6 +92,7 @@ fn integrated_completion_benchmark() {
         load_out_dirs_from_check: true,
         wrap_rustc: false,
         with_proc_macro: false,
+        prefill_caches: true,
     };
 
     let (mut host, vfs, _proc_macro) = {
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]