diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-12 14:38:09 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-12 14:38:09 +0100 |
commit | 5c09c5949a94012b5ae95735dc8c086efd5039e4 (patch) | |
tree | 0e41c01279e70133587860f37afee8f47d435433 /crates/ra_hir/src | |
parent | a1261631a89f7169a3f84dec33aff61758c601e3 (diff) | |
parent | e6ee324b8529df86f330f5240cbb7bb9048fff57 (diff) |
Merge #1828
1828: add macros with local_inner_macros argument r=matklad a=JasperDeSutter
fixes #1816
Co-authored-by: JasperDeSutter <[email protected]>
Diffstat (limited to 'crates/ra_hir/src')
-rw-r--r-- | crates/ra_hir/src/nameres/raw.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir/src/nameres/tests/macros.rs | 37 |
2 files changed, 40 insertions, 1 deletions
diff --git a/crates/ra_hir/src/nameres/raw.rs b/crates/ra_hir/src/nameres/raw.rs index 04b97cb90..8bf883ac2 100644 --- a/crates/ra_hir/src/nameres/raw.rs +++ b/crates/ra_hir/src/nameres/raw.rs | |||
@@ -345,7 +345,9 @@ impl RawItemsCollector { | |||
345 | 345 | ||
346 | let name = m.name().map(|it| it.as_name()); | 346 | let name = m.name().map(|it| it.as_name()); |
347 | let ast_id = self.source_ast_id_map.ast_id(&m); | 347 | let ast_id = self.source_ast_id_map.ast_id(&m); |
348 | let export = m.has_atom_attr("macro_export"); | 348 | let export = m.has_atom_attr("macro_export") |
349 | || m.attrs().filter_map(|x| x.as_call()).any(|(name, _)| name == "macro_export"); | ||
350 | |||
349 | let m = self.raw_items.macros.alloc(MacroData { ast_id, path, name, export }); | 351 | let m = self.raw_items.macros.alloc(MacroData { ast_id, path, name, export }); |
350 | self.push_item(current_module, RawItem::Macro(m)); | 352 | self.push_item(current_module, RawItem::Macro(m)); |
351 | } | 353 | } |
diff --git a/crates/ra_hir/src/nameres/tests/macros.rs b/crates/ra_hir/src/nameres/tests/macros.rs index 6e0bc437e..bd60f4258 100644 --- a/crates/ra_hir/src/nameres/tests/macros.rs +++ b/crates/ra_hir/src/nameres/tests/macros.rs | |||
@@ -94,6 +94,43 @@ fn macro_rules_from_other_crates_are_visible() { | |||
94 | } | 94 | } |
95 | 95 | ||
96 | #[test] | 96 | #[test] |
97 | fn macro_rules_export_with_local_inner_macros_are_visible() { | ||
98 | let map = def_map_with_crate_graph( | ||
99 | " | ||
100 | //- /main.rs | ||
101 | foo::structs!(Foo, Bar) | ||
102 | mod bar; | ||
103 | |||
104 | //- /bar.rs | ||
105 | use crate::*; | ||
106 | |||
107 | //- /lib.rs | ||
108 | #[macro_export(local_inner_macros)] | ||
109 | macro_rules! structs { | ||
110 | ($($i:ident),*) => { | ||
111 | $(struct $i { field: u32 } )* | ||
112 | } | ||
113 | } | ||
114 | ", | ||
115 | crate_graph! { | ||
116 | "main": ("/main.rs", ["foo"]), | ||
117 | "foo": ("/lib.rs", []), | ||
118 | }, | ||
119 | ); | ||
120 | assert_snapshot!(map, @r###" | ||
121 | ⋮crate | ||
122 | ⋮Bar: t v | ||
123 | ⋮Foo: t v | ||
124 | ⋮bar: t | ||
125 | ⋮ | ||
126 | ⋮crate::bar | ||
127 | ⋮Bar: t v | ||
128 | ⋮Foo: t v | ||
129 | ⋮bar: t | ||
130 | "###); | ||
131 | } | ||
132 | |||
133 | #[test] | ||
97 | fn unexpanded_macro_should_expand_by_fixedpoint_loop() { | 134 | fn unexpanded_macro_should_expand_by_fixedpoint_loop() { |
98 | let map = def_map_with_crate_graph( | 135 | let map = def_map_with_crate_graph( |
99 | " | 136 | " |