mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-28 04:44:57 +00:00
Handle inner recursive macro rules cases
This commit is contained in:
parent
f7fbea509f
commit
13f30e9ef5
3 changed files with 34 additions and 0 deletions
|
@ -115,6 +115,10 @@ impl ItemTree {
|
||||||
// still need to collect inner items.
|
// still need to collect inner items.
|
||||||
ctx.lower_inner_items(stmt.syntax())
|
ctx.lower_inner_items(stmt.syntax())
|
||||||
},
|
},
|
||||||
|
ast::Item(item) => {
|
||||||
|
// Macros can expand to stmt and other item, and we add it as top level item
|
||||||
|
ctx.lower_single_item(item)
|
||||||
|
},
|
||||||
_ => {
|
_ => {
|
||||||
panic!("cannot create item tree from {:?} {}", syntax, syntax);
|
panic!("cannot create item tree from {:?} {}", syntax, syntax);
|
||||||
},
|
},
|
||||||
|
|
|
@ -87,6 +87,14 @@ impl Ctx {
|
||||||
self.tree
|
self.tree
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(super) fn lower_single_item(mut self, item: ast::Item) -> ItemTree {
|
||||||
|
self.tree.top_level = self
|
||||||
|
.lower_mod_item(&item, false)
|
||||||
|
.map(|item| item.0)
|
||||||
|
.unwrap_or_else(|| Default::default());
|
||||||
|
self.tree
|
||||||
|
}
|
||||||
|
|
||||||
pub(super) fn lower_inner_items(mut self, within: &SyntaxNode) -> ItemTree {
|
pub(super) fn lower_inner_items(mut self, within: &SyntaxNode) -> ItemTree {
|
||||||
self.collect_inner_items(within);
|
self.collect_inner_items(within);
|
||||||
self.tree
|
self.tree
|
||||||
|
|
|
@ -231,6 +231,28 @@ fn expr_macro_expanded_in_stmts() {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn recursive_inner_item_macro_rules() {
|
||||||
|
check_infer(
|
||||||
|
r#"
|
||||||
|
macro_rules! mac {
|
||||||
|
() => { mac!($)};
|
||||||
|
($x:tt) => { macro_rules! blub { () => { 1 }; } };
|
||||||
|
}
|
||||||
|
fn foo() {
|
||||||
|
mac!();
|
||||||
|
let a = blub!();
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
expect![[r#"
|
||||||
|
!0..1 '1': i32
|
||||||
|
!0..7 'mac!($)': {unknown}
|
||||||
|
107..143 '{ ...!(); }': ()
|
||||||
|
129..130 'a': i32
|
||||||
|
"#]],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn infer_type_value_macro_having_same_name() {
|
fn infer_type_value_macro_having_same_name() {
|
||||||
check_infer(
|
check_infer(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue