hir_ty: Expand macros at type position

1 files changed, 10 insertions, 6 deletions

diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs
index 45b099cf3..2975786dd 100644
--- a/crates/hir_def/src/item_tree/lower.rs
+++ b/crates/hir_def/src/item_tree/lower.rs
@@ -189,12 +189,16 @@ impl Ctx {
                                 block_stack.push(self.source_ast_id_map.ast_id(&block));
                             },
                             ast::Item(item) => {
-                                // FIXME: This triggers for macro calls in expression/pattern/type position
-                                let mod_items = self.lower_mod_item(&item, true);
-                                let current_block = block_stack.last();
-                                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());
+                                // FIXME: This triggers for macro calls in expression/pattern
+                                if let Some(SyntaxKind::MACRO_TYPE) = node.parent().map(|p| p.kind()) {
+                                    // Ignore macros at type position
+                                } else {
+                                    let mod_items = self.lower_mod_item(&item, true);
+                                    let current_block = block_stack.last();
+                                    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());
+                                        }
                                     }
                                 }
                             },