diff options
Diffstat (limited to 'crates/hir_def/src/body/lower.rs')
-rw-r--r-- | crates/hir_def/src/body/lower.rs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/crates/hir_def/src/body/lower.rs b/crates/hir_def/src/body/lower.rs index 7052058f2..60b25db56 100644 --- a/crates/hir_def/src/body/lower.rs +++ b/crates/hir_def/src/body/lower.rs | |||
@@ -24,7 +24,7 @@ use crate::{ | |||
24 | body::{Body, BodySourceMap, Expander, LabelSource, PatPtr, SyntheticSyntax}, | 24 | body::{Body, BodySourceMap, Expander, LabelSource, PatPtr, SyntheticSyntax}, |
25 | builtin_type::{BuiltinFloat, BuiltinInt, BuiltinUint}, | 25 | builtin_type::{BuiltinFloat, BuiltinInt, BuiltinUint}, |
26 | db::DefDatabase, | 26 | db::DefDatabase, |
27 | diagnostics::{InactiveCode, MacroError, UnresolvedProcMacro}, | 27 | diagnostics::{InactiveCode, MacroError, UnresolvedMacroCall, UnresolvedProcMacro}, |
28 | expr::{ | 28 | expr::{ |
29 | dummy_expr_id, ArithOp, Array, BinaryOp, BindingAnnotation, CmpOp, Expr, ExprId, Label, | 29 | dummy_expr_id, ArithOp, Array, BinaryOp, BindingAnnotation, CmpOp, Expr, ExprId, Label, |
30 | LabelId, Literal, LogicOp, MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, | 30 | LabelId, Literal, LogicOp, MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, |
@@ -33,7 +33,7 @@ use crate::{ | |||
33 | item_scope::BuiltinShadowMode, | 33 | item_scope::BuiltinShadowMode, |
34 | path::{GenericArgs, Path}, | 34 | path::{GenericArgs, Path}, |
35 | type_ref::{Mutability, Rawness, TypeRef}, | 35 | type_ref::{Mutability, Rawness, TypeRef}, |
36 | AdtId, BlockLoc, ModuleDefId, | 36 | AdtId, BlockLoc, ModuleDefId, UnresolvedMacro, |
37 | }; | 37 | }; |
38 | 38 | ||
39 | use super::{diagnostics::BodyDiagnostic, ExprSource, PatSource}; | 39 | use super::{diagnostics::BodyDiagnostic, ExprSource, PatSource}; |
@@ -554,6 +554,17 @@ impl ExprCollector<'_> { | |||
554 | let macro_call = self.expander.to_source(AstPtr::new(&e)); | 554 | let macro_call = self.expander.to_source(AstPtr::new(&e)); |
555 | let res = self.expander.enter_expand(self.db, e); | 555 | let res = self.expander.enter_expand(self.db, e); |
556 | 556 | ||
557 | let res = match res { | ||
558 | Ok(res) => res, | ||
559 | Err(UnresolvedMacro) => { | ||
560 | self.source_map.diagnostics.push(BodyDiagnostic::UnresolvedMacroCall( | ||
561 | UnresolvedMacroCall { file: outer_file, node: syntax_ptr.cast().unwrap() }, | ||
562 | )); | ||
563 | collector(self, None); | ||
564 | return; | ||
565 | } | ||
566 | }; | ||
567 | |||
557 | match &res.err { | 568 | match &res.err { |
558 | Some(ExpandError::UnresolvedProcMacro) => { | 569 | Some(ExpandError::UnresolvedProcMacro) => { |
559 | self.source_map.diagnostics.push(BodyDiagnostic::UnresolvedProcMacro( | 570 | self.source_map.diagnostics.push(BodyDiagnostic::UnresolvedProcMacro( |