squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #6698

Browse source 
6698: Attach macro expansion errors to the right file r=jonas-schievink a=jonas-schievink

Previously it attached them to the result of the macro expansion (or, if no result was produced, to the file containing the invocation). Always use the file containing the invocation.

This doesn't seem to have any observable difference, but seems better in theory.

bors r+

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
This commit is contained in:
bors[bot] 2020-12-02 13:25:54 +00:00 committed by GitHub
commit 3e1fb112af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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(),
},