diff options
author | Lenard Pratt <[email protected]> | 2019-04-18 19:35:47 +0100 |
---|---|---|
committer | Lenard Pratt <[email protected]> | 2019-04-23 10:17:31 +0100 |
commit | 1ab7066e32ab482c70ea5c9bba7585eba275476a (patch) | |
tree | a754785d91783b713e54b70058f2f16984d25074 /crates/ra_hir/src/nameres/collector.rs | |
parent | ce211434a6501e88cb83462f2443db085f1557d3 (diff) |
Introduced resolve_macro_call on resolver
changed to manual expansion
fix for nested macros
Diffstat (limited to 'crates/ra_hir/src/nameres/collector.rs')
-rw-r--r-- | crates/ra_hir/src/nameres/collector.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index 762a61604..b34c9b8e6 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs | |||
@@ -524,7 +524,7 @@ where | |||
524 | { | 524 | { |
525 | let macro_call_id = MacroCallLoc { def: *macro_id, ast_id }.id(self.def_collector.db); | 525 | let macro_call_id = MacroCallLoc { def: *macro_id, ast_id }.id(self.def_collector.db); |
526 | 526 | ||
527 | self.def_collector.collect_macro_expansion(self.module_id, macro_call_id, macro_id); | 527 | self.def_collector.collect_macro_expansion(self.module_id, macro_call_id, *macro_id); |
528 | return; | 528 | return; |
529 | } | 529 | } |
530 | 530 | ||
@@ -616,6 +616,7 @@ mod tests { | |||
616 | modules, | 616 | modules, |
617 | public_macros: FxHashMap::default(), | 617 | public_macros: FxHashMap::default(), |
618 | poison_macros: FxHashSet::default(), | 618 | poison_macros: FxHashSet::default(), |
619 | local_macros: FxHashMap::default(), | ||
619 | diagnostics: Vec::new(), | 620 | diagnostics: Vec::new(), |
620 | } | 621 | } |
621 | }; | 622 | }; |