Skip to content

fix: Fix attribute macros on assoc items being discarded with disabled proc macros #12670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2022
Merged

fix: Fix attribute macros on assoc items being discarded with disabled proc macros #12670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 23 additions & 17 deletions crates/hir-def/src/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,6 @@ impl<'a> AssocItemCollector<'a> {
def_map: module_id.def_map(db),
container,
expander: Expander::new(db, file_id, module_id),

items: Vec::new(),
attr_calls: Vec::new(),
}
Expand All @@ -473,6 +472,7 @@ impl<'a> AssocItemCollector<'a> {
}
}

// FIXME: proc-macro diagnostics
fn collect(&mut self, tree_id: TreeId, assoc_items: &[AssocItem]) {
let item_tree = tree_id.item_tree(self.db);

Expand All @@ -482,7 +482,7 @@ impl<'a> AssocItemCollector<'a> {
continue;
}

for attr in &*attrs {
'attrs: for attr in &*attrs {
let ast_id =
AstId::new(self.expander.current_file_id(), item.ast_id(&item_tree).upcast());
let ast_id_with_path = AstIdWithPath { path: (*attr.path).clone(), ast_id };
Expand All @@ -494,9 +494,17 @@ impl<'a> AssocItemCollector<'a> {
attr,
) {
self.attr_calls.push((ast_id, call_id));
let res = self.expander.enter_expand_id(self.db, call_id);
self.collect_macro_items(res);
continue 'items;
// If proc attribute macro expansion is disabled, skip expanding it here
if !self.db.enable_proc_attr_macros() {
continue 'attrs;
}
match self.expander.enter_expand_id(self.db, call_id) {
ExpandResult { value: Some((mark, mac)), .. } => {
self.collect_macro_items(mark, mac);
continue 'items;
}
ExpandResult { .. } => {}
}
}
}

Expand Down Expand Up @@ -537,25 +545,23 @@ impl<'a> AssocItemCollector<'a> {
stdx::panic_context::enter(format!("collect_items MacroCall: {}", call));
let res = self.expander.enter_expand(self.db, call);

if let Ok(res) = res {
self.collect_macro_items(res);
if let Ok(ExpandResult { value: Some((mark, mac)), .. }) = res {
self.collect_macro_items(mark, mac);
}
}
}
}
}

fn collect_macro_items(&mut self, res: ExpandResult<Option<(Mark, ast::MacroItems)>>) {
if let Some((mark, mac)) = res.value {
let src: InFile<ast::MacroItems> = self.expander.to_source(mac);
let tree_id = item_tree::TreeId::new(src.file_id, None);
let item_tree = tree_id.item_tree(self.db);
let iter: Vec<_> =
item_tree.top_level_items().iter().filter_map(ModItem::as_assoc_item).collect();
fn collect_macro_items(&mut self, mark: Mark, mac: ast::MacroItems) {
let src: InFile<ast::MacroItems> = self.expander.to_source(mac);
let tree_id = item_tree::TreeId::new(src.file_id, None);
let item_tree = tree_id.item_tree(self.db);
let iter: Vec<_> =
item_tree.top_level_items().iter().filter_map(ModItem::as_assoc_item).collect();

self.collect(tree_id, &iter);
self.collect(tree_id, &iter);

self.expander.exit(self.db, mark);
}
self.expander.exit(self.db, mark);
}
}