From 7ec351ec7caa66ed4ef141f670dd4795692fd1c1 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Wed, 28 May 2025 07:06:03 +0200
Subject: [PATCH] Back out "Fix IDE resolution of item macros"

This backs out commit 3e0ab7219a5464999652beca22698cd46e1e48e8.
---
 src/tools/rust-analyzer/crates/hir-def/src/db.rs       | 3 ---
 src/tools/rust-analyzer/crates/hir-def/src/resolver.rs | 9 ---------
 src/tools/rust-analyzer/crates/hir-expand/src/lib.rs   | 2 --
 3 files changed, 14 deletions(-)

diff --git a/src/tools/rust-analyzer/crates/hir-def/src/db.rs b/src/tools/rust-analyzer/crates/hir-def/src/db.rs
index 6f9340a0e4d0..4a9a3b12cfab 100644
--- a/src/tools/rust-analyzer/crates/hir-def/src/db.rs
+++ b/src/tools/rust-analyzer/crates/hir-def/src/db.rs
@@ -422,7 +422,6 @@ fn macro_def(db: &dyn DefDatabase, id: MacroId) -> MacroDefId {
             let makro = &item_tree[loc.id.value];
             MacroDefId {
                 krate: loc.container.krate,
-                block: loc.container.block.map(|block| salsa::plumbing::AsId::as_id(&block)),
                 kind: kind(loc.expander, loc.id.file_id(), makro.ast_id.upcast()),
                 local_inner: false,
                 allow_internal_unsafe: loc.allow_internal_unsafe,
@@ -436,7 +435,6 @@ fn macro_def(db: &dyn DefDatabase, id: MacroId) -> MacroDefId {
             let makro = &item_tree[loc.id.value];
             MacroDefId {
                 krate: loc.container.krate,
-                block: loc.container.block.map(|block| salsa::plumbing::AsId::as_id(&block)),
                 kind: kind(loc.expander, loc.id.file_id(), makro.ast_id.upcast()),
                 local_inner: loc.flags.contains(MacroRulesLocFlags::LOCAL_INNER),
                 allow_internal_unsafe: loc
@@ -452,7 +450,6 @@ fn macro_def(db: &dyn DefDatabase, id: MacroId) -> MacroDefId {
             let makro = &item_tree[loc.id.value];
             MacroDefId {
                 krate: loc.container.krate,
-                block: None,
                 kind: MacroDefKind::ProcMacro(
                     InFile::new(loc.id.file_id(), makro.ast_id),
                     loc.expander,
diff --git a/src/tools/rust-analyzer/crates/hir-def/src/resolver.rs b/src/tools/rust-analyzer/crates/hir-def/src/resolver.rs
index 416bcbb096bd..16988ddf04b2 100644
--- a/src/tools/rust-analyzer/crates/hir-def/src/resolver.rs
+++ b/src/tools/rust-analyzer/crates/hir-def/src/resolver.rs
@@ -696,15 +696,6 @@ impl<'db> Resolver<'db> {
         &def_map[local_id].scope
     }
 
-    pub fn item_scopes(&self) -> impl Iterator<Item = &ItemScope> {
-        self.scopes()
-            .filter_map(move |scope| match scope {
-                Scope::BlockScope(m) => Some(&m.def_map[m.module_id].scope),
-                _ => None,
-            })
-            .chain(std::iter::once(&self.module_scope.def_map[self.module_scope.module_id].scope))
-    }
-
     pub fn krate(&self) -> Crate {
         self.module_scope.def_map.krate()
     }
diff --git a/src/tools/rust-analyzer/crates/hir-expand/src/lib.rs b/src/tools/rust-analyzer/crates/hir-expand/src/lib.rs
index 19cd0298e93d..d844d8f41eef 100644
--- a/src/tools/rust-analyzer/crates/hir-expand/src/lib.rs
+++ b/src/tools/rust-analyzer/crates/hir-expand/src/lib.rs
@@ -258,8 +258,6 @@ pub struct MacroCallLoc {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct MacroDefId {
     pub krate: Crate,
-    // FIXME: In `hir-expand` we can't refer to `BlockId`.
-    pub block: Option<salsa::Id>,
     pub edition: Edition,
     pub kind: MacroDefKind,
     pub local_inner: bool,