mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #12584 - Veykril:attr-diag, r=Veykril

Browse Source 
fix: attribute macros not being properly diagnosed

Closes https://github.com/rust-lang/rust-analyzer/issues/12582
This commit is contained in:
bors 2022-06-18 22:38:04 +00:00
commit eb9b360752
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crates/hir-def/src/nameres/collector.rs
View File

@ -436,6 +436,17 @@ fn reseed_with_unresolved_attribute(&mut self) -> ReachedFixedPoint {
let mut unresolved_macros = mem::take(&mut self.unresolved_macros); let mut unresolved_macros = mem::take(&mut self.unresolved_macros);
let pos = unresolved_macros.iter().position(|directive| { let pos = unresolved_macros.iter().position(|directive| {
if let MacroDirectiveKind::Attr { ast_id, mod_item, attr, tree } = &directive.kind { if let MacroDirectiveKind::Attr { ast_id, mod_item, attr, tree } = &directive.kind {
self.def_map.diagnostics.push(DefDiagnostic::unresolved_proc_macro(
directive.module_id,
MacroCallKind::Attr {
ast_id: ast_id.ast_id,
attr_args: Default::default(),
invoc_attr_index: attr.id.ast_index,
is_derive: false,
},
None,
));
self.skip_attrs.insert(ast_id.ast_id.with_value(*mod_item), attr.id); self.skip_attrs.insert(ast_id.ast_id.with_value(*mod_item), attr.id);
let item_tree = tree.item_tree(self.db); let item_tree = tree.item_tree(self.db);
@ -1135,19 +1146,7 @@ fn resolve_macros(&mut self) -> ReachedFixedPoint {
let def = match resolver(path.clone()) { let def = match resolver(path.clone()) {
Some(def) if def.is_attribute() => def, Some(def) if def.is_attribute() => def,
_ => { _ => return true,
self.def_map.diagnostics.push(DefDiagnostic::unresolved_proc_macro(
directive.module_id,
MacroCallKind::Attr {
ast_id,
attr_args: Default::default(),
invoc_attr_index: attr.id.ast_index,
is_derive: false,
},
None,
));
return true;
}
}; };
if matches!( if matches!(
def, def,
@ -1389,9 +1388,8 @@ fn finish(mut self) -> DefMap {
ast_id.path.clone(), ast_id.path.clone(),
)); ));
} }
MacroDirectiveKind::Attr { .. } => { // These are diagnosed by `reseed_with_unresolved_attribute`, as that function consumes them
// FIXME: these should get diagnosed by `reseed_with_unresolved_attribute` MacroDirectiveKind::Attr { .. } => {}
}
} }
} }