Merge #7359

7359: ItemTree: store a mapping from blocks to inner items r=jonas-schievink a=jonas-schievink

To do name resolution within block expressions, we need to know which inner items are located inside each block expression. This adds such a mapping to `ItemTree`, replacing the previous one, which was seemingly unused other than to access all the inner items.

This also assigns `AstId`s to block expressions, which is needed to store the mapping in salsa.

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

1 files changed, 24 insertions, 9 deletions

diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs
index 5e71ca42c..56fe569ff 100644
--- a/crates/hir_def/src/item_tree/lower.rs
+++ b/crates/hir_def/src/item_tree/lower.rs
@@ -6,7 +6,7 @@ use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, name::known, HirFileId}
 use smallvec::SmallVec;
 use syntax::{
     ast::{self, ModuleItemOwner},
-    SyntaxNode,
+    SyntaxNode, WalkEvent,
 };
 
 use crate::{
@@ -150,14 +150,29 @@ impl Ctx {
 
     fn collect_inner_items(&mut self, container: &SyntaxNode) {
         let forced_vis = self.forced_visibility.take();
-        let mut inner_items = mem::take(&mut self.tree.inner_items);
-        inner_items.extend(container.descendants().skip(1).filter_map(ast::Item::cast).filter_map(
-            |item| {
-                let ast_id = self.source_ast_id_map.ast_id(&item);
-                Some((ast_id, self.lower_mod_item(&item, true)?.0))
-            },
-        ));
-        self.tree.inner_items = inner_items;
+
+        let mut current_block = None;
+        for event in container.preorder().skip(1) {
+            if let WalkEvent::Enter(node) = event {
+                match_ast! {
+                    match node {
+                        ast::BlockExpr(block) => {
+                            current_block = Some(self.source_ast_id_map.ast_id(&block));
+                        },
+                        ast::Item(item) => {
+                            let mod_items = self.lower_mod_item(&item, true);
+                            if let (Some(mod_items), Some(block)) = (mod_items, current_block) {
+                                if !mod_items.0.is_empty() {
+                                    self.data().inner_items.entry(block).or_default().extend(mod_items.0.iter().copied());
+                                }
+                            }
+                        },
+                        _ => {}
+                    }
+                }
+            }
+        }
+
         self.forced_visibility = forced_vis;
     }