mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Attach macro expansion errors to the right file

Browse source
This commit is contained in:
Jonas Schievink 2020-12-02 14:23:51 +01:00
parent bb697727a2
commit 319fcd01ac
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/hir_def/src/body/lower.rs
View file

@ -560,6 +560,9 @@ impl ExprCollector<'_> {
// FIXME: do we still need to allocate this as missing ?
self.alloc_expr(Expr::Missing, syntax_ptr)
} else {
// File containing the macro call. Expansion errors will be attached here.
let outer_file = self.expander.current_file_id;
let macro_call = self.expander.to_source(AstPtr::new(&e));
let res = self.expander.enter_expand(self.db, Some(&self.body.item_scope), e);
@ -567,7 +570,7 @@ impl ExprCollector<'_> {
Some(ExpandError::UnresolvedProcMacro) => {
self.source_map.diagnostics.push(BodyDiagnostic::UnresolvedProcMacro(
UnresolvedProcMacro {
file: self.expander.current_file_id,
file: outer_file,
node: syntax_ptr.clone().into(),
precise_location: None,
macro_name: None,
@ -577,7 +580,7 @@ impl ExprCollector<'_> {
Some(err) => {
self.source_map.diagnostics.push(BodyDiagnostic::MacroError(
MacroError {
file: self.expander.current_file_id,
file: outer_file,
node: syntax_ptr.clone().into(),
message: err.to_string(),
},