diff options
author | Jonas Schievink <[email protected]> | 2020-12-02 15:52:14 +0000 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2020-12-03 14:48:29 +0000 |
commit | a6342436343e01b32d4482a48994b8c22bcbe659 (patch) | |
tree | 1fd4c71c6b203417c64b9ffb31221242d6f1a270 /crates/hir_def/src | |
parent | 5a1306a43652d914035b2cf0b703f4bfd3451a33 (diff) |
Propagate eager expansion errors
Diffstat (limited to 'crates/hir_def/src')
-rw-r--r-- | crates/hir_def/src/body.rs | 20 | ||||
-rw-r--r-- | crates/hir_def/src/lib.rs | 51 |
2 files changed, 54 insertions, 17 deletions
diff --git a/crates/hir_def/src/body.rs b/crates/hir_def/src/body.rs index 33eb5e78c..92bcc1705 100644 --- a/crates/hir_def/src/body.rs +++ b/crates/hir_def/src/body.rs | |||
@@ -120,18 +120,24 @@ impl Expander { | |||
120 | self.resolve_path_as_macro(db, &path) | 120 | self.resolve_path_as_macro(db, &path) |
121 | }; | 121 | }; |
122 | 122 | ||
123 | let call_id = match macro_call.as_call_id(db, self.crate_def_map.krate, resolver) { | 123 | let mut err = None; |
124 | let call_id = | ||
125 | macro_call.as_call_id_with_errors(db, self.crate_def_map.krate, resolver, &mut |e| { | ||
126 | err.get_or_insert(e); | ||
127 | }); | ||
128 | let call_id = match call_id { | ||
124 | Some(it) => it, | 129 | Some(it) => it, |
125 | None => { | 130 | None => { |
126 | // FIXME: this can mean other things too, but `as_call_id` doesn't provide enough | 131 | if err.is_none() { |
127 | // info. | 132 | eprintln!("no error despite `as_call_id_with_errors` returning `None`"); |
128 | return ExpandResult::only_err(mbe::ExpandError::Other( | 133 | } |
129 | "failed to parse or resolve macro invocation".into(), | 134 | return ExpandResult { value: None, err }; |
130 | )); | ||
131 | } | 135 | } |
132 | }; | 136 | }; |
133 | 137 | ||
134 | let err = db.macro_expand_error(call_id); | 138 | if err.is_none() { |
139 | err = db.macro_expand_error(call_id); | ||
140 | } | ||
135 | 141 | ||
136 | let file_id = call_id.as_file(); | 142 | let file_id = call_id.as_file(); |
137 | 143 | ||
diff --git a/crates/hir_def/src/lib.rs b/crates/hir_def/src/lib.rs index 1b22d1eec..ce2be8e2b 100644 --- a/crates/hir_def/src/lib.rs +++ b/crates/hir_def/src/lib.rs | |||
@@ -465,21 +465,37 @@ pub trait AsMacroCall { | |||
465 | db: &dyn db::DefDatabase, | 465 | db: &dyn db::DefDatabase, |
466 | krate: CrateId, | 466 | krate: CrateId, |
467 | resolver: impl Fn(path::ModPath) -> Option<MacroDefId>, | 467 | resolver: impl Fn(path::ModPath) -> Option<MacroDefId>, |
468 | ) -> Option<MacroCallId> { | ||
469 | self.as_call_id_with_errors(db, krate, resolver, &mut |_| ()) | ||
470 | } | ||
471 | |||
472 | fn as_call_id_with_errors( | ||
473 | &self, | ||
474 | db: &dyn db::DefDatabase, | ||
475 | krate: CrateId, | ||
476 | resolver: impl Fn(path::ModPath) -> Option<MacroDefId>, | ||
477 | error_sink: &mut dyn FnMut(mbe::ExpandError), | ||
468 | ) -> Option<MacroCallId>; | 478 | ) -> Option<MacroCallId>; |
469 | } | 479 | } |
470 | 480 | ||
471 | impl AsMacroCall for InFile<&ast::MacroCall> { | 481 | impl AsMacroCall for InFile<&ast::MacroCall> { |
472 | fn as_call_id( | 482 | fn as_call_id_with_errors( |
473 | &self, | 483 | &self, |
474 | db: &dyn db::DefDatabase, | 484 | db: &dyn db::DefDatabase, |
475 | krate: CrateId, | 485 | krate: CrateId, |
476 | resolver: impl Fn(path::ModPath) -> Option<MacroDefId>, | 486 | resolver: impl Fn(path::ModPath) -> Option<MacroDefId>, |
487 | error_sink: &mut dyn FnMut(mbe::ExpandError), | ||
477 | ) -> Option<MacroCallId> { | 488 | ) -> Option<MacroCallId> { |
478 | let ast_id = AstId::new(self.file_id, db.ast_id_map(self.file_id).ast_id(self.value)); | 489 | let ast_id = AstId::new(self.file_id, db.ast_id_map(self.file_id).ast_id(self.value)); |
479 | let h = Hygiene::new(db.upcast(), self.file_id); | 490 | let h = Hygiene::new(db.upcast(), self.file_id); |
480 | let path = path::ModPath::from_src(self.value.path()?, &h)?; | 491 | let path = self.value.path().and_then(|path| path::ModPath::from_src(path, &h)); |
492 | |||
493 | if path.is_none() { | ||
494 | error_sink(mbe::ExpandError::Other("malformed macro invocation".into())); | ||
495 | } | ||
481 | 496 | ||
482 | AstIdWithPath::new(ast_id.file_id, ast_id.value, path).as_call_id(db, krate, resolver) | 497 | AstIdWithPath::new(ast_id.file_id, ast_id.value, path?) |
498 | .as_call_id_with_errors(db, krate, resolver, error_sink) | ||
483 | } | 499 | } |
484 | } | 500 | } |
485 | 501 | ||
@@ -497,22 +513,32 @@ impl<T: ast::AstNode> AstIdWithPath<T> { | |||
497 | } | 513 | } |
498 | 514 | ||
499 | impl AsMacroCall for AstIdWithPath<ast::MacroCall> { | 515 | impl AsMacroCall for AstIdWithPath<ast::MacroCall> { |
500 | fn as_call_id( | 516 | fn as_call_id_with_errors( |
501 | &self, | 517 | &self, |
502 | db: &dyn db::DefDatabase, | 518 | db: &dyn db::DefDatabase, |
503 | krate: CrateId, | 519 | krate: CrateId, |
504 | resolver: impl Fn(path::ModPath) -> Option<MacroDefId>, | 520 | resolver: impl Fn(path::ModPath) -> Option<MacroDefId>, |
521 | error_sink: &mut dyn FnMut(mbe::ExpandError), | ||
505 | ) -> Option<MacroCallId> { | 522 | ) -> Option<MacroCallId> { |
506 | let def: MacroDefId = resolver(self.path.clone())?; | 523 | let def: MacroDefId = resolver(self.path.clone()).or_else(|| { |
524 | error_sink(mbe::ExpandError::Other("could not resolve macro".into())); | ||
525 | None | ||
526 | })?; | ||
507 | 527 | ||
508 | if let MacroDefKind::BuiltInEager(_) = def.kind { | 528 | if let MacroDefKind::BuiltInEager(_) = def.kind { |
509 | let macro_call = InFile::new(self.ast_id.file_id, self.ast_id.to_node(db.upcast())); | 529 | let macro_call = InFile::new(self.ast_id.file_id, self.ast_id.to_node(db.upcast())); |
510 | let hygiene = Hygiene::new(db.upcast(), self.ast_id.file_id); | 530 | let hygiene = Hygiene::new(db.upcast(), self.ast_id.file_id); |
511 | 531 | ||
512 | Some( | 532 | Some( |
513 | expand_eager_macro(db.upcast(), krate, macro_call, def, &|path: ast::Path| { | 533 | expand_eager_macro( |
514 | resolver(path::ModPath::from_src(path, &hygiene)?) | 534 | db.upcast(), |
515 | })? | 535 | krate, |
536 | macro_call, | ||
537 | def, | ||
538 | &|path: ast::Path| resolver(path::ModPath::from_src(path, &hygiene)?), | ||
539 | error_sink, | ||
540 | ) | ||
541 | .ok()? | ||
516 | .into(), | 542 | .into(), |
517 | ) | 543 | ) |
518 | } else { | 544 | } else { |
@@ -522,13 +548,18 @@ impl AsMacroCall for AstIdWithPath<ast::MacroCall> { | |||
522 | } | 548 | } |
523 | 549 | ||
524 | impl AsMacroCall for AstIdWithPath<ast::Item> { | 550 | impl AsMacroCall for AstIdWithPath<ast::Item> { |
525 | fn as_call_id( | 551 | fn as_call_id_with_errors( |
526 | &self, | 552 | &self, |
527 | db: &dyn db::DefDatabase, | 553 | db: &dyn db::DefDatabase, |
528 | krate: CrateId, | 554 | krate: CrateId, |
529 | resolver: impl Fn(path::ModPath) -> Option<MacroDefId>, | 555 | resolver: impl Fn(path::ModPath) -> Option<MacroDefId>, |
556 | error_sink: &mut dyn FnMut(mbe::ExpandError), | ||
530 | ) -> Option<MacroCallId> { | 557 | ) -> Option<MacroCallId> { |
531 | let def = resolver(self.path.clone())?; | 558 | let def: MacroDefId = resolver(self.path.clone()).or_else(|| { |
559 | error_sink(mbe::ExpandError::Other("could not resolve macro".into())); | ||
560 | None | ||
561 | })?; | ||
562 | |||
532 | Some( | 563 | Some( |
533 | def.as_lazy_macro( | 564 | def.as_lazy_macro( |
534 | db.upcast(), | 565 | db.upcast(), |