From cf3b4f1e208247c9d171273dabff9c6b3c98a240 Mon Sep 17 00:00:00 2001
From: cynecx <me@cynecx.net>
Date: Sat, 10 Apr 2021 17:49:12 +0200
Subject: hir_ty: Expand macros at type position

---
 crates/hir_ty/src/lower.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'crates/hir_ty/src/lower.rs')

diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs
index a035686bc..95ca5bdb0 100644
--- a/crates/hir_ty/src/lower.rs
+++ b/crates/hir_ty/src/lower.rs
@@ -15,7 +15,7 @@ use hir_def::{
     generics::{TypeParamProvenance, WherePredicate, WherePredicateTypeTarget},
     path::{GenericArg, Path, PathSegment, PathSegments},
     resolver::{HasResolver, Resolver, TypeNs},
-    type_ref::{TraitRef as HirTraitRef, TypeBound, TypeRef},
+    type_ref::{expand_type_ref, TraitRef as HirTraitRef, TypeBound, TypeRef},
     AdtId, AssocContainerId, AssocItemId, ConstId, ConstParamId, EnumId, EnumVariantId, FunctionId,
     GenericDefId, HasModule, ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId,
     TypeAliasId, TypeParamId, UnionId, VariantId,
@@ -287,6 +287,16 @@ impl<'a> TyLoweringContext<'a> {
                     }
                 }
             }
+            mt @ TypeRef::Macro(_) => {
+                if let Some(module_id) = self.resolver.module() {
+                    match expand_type_ref(self.db.upcast(), module_id, mt) {
+                        Some(type_ref) => self.lower_ty(type_ref.as_ref()),
+                        None => TyKind::Error.intern(&Interner),
+                    }
+                } else {
+                    TyKind::Error.intern(&Interner)
+                }
+            }
             TypeRef::Error => TyKind::Error.intern(&Interner),
         };
         (ty, res)
-- 
cgit v1.2.3