language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Record attribute calls on assoc items in TraitData and ImplData

Browse source
This commit is contained in:
Lukas Wirth 2022-01-08 10:45:12 +01:00
parent 6cf0cadfaa
commit 6746ba5839
5 changed files with 79 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/hir_def/src/child_by_source.rs
View file

@ -30,20 +30,31 @@ pub trait ChildBySource {
impl ChildBySource for TraitId {
fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId) {
let data = db.trait_data(*self);
// FIXME attribute macros
for &(_, item) in data.items.iter() {
data.attribute_calls().filter(|(ast_id, _)| ast_id.file_id == file_id).for_each(
|(ast_id, call_id)| {
let item = ast_id.with_value(ast_id.to_node(db.upcast()));
res[keys::ATTR_MACRO_CALL].insert(item, call_id);
},
);
data.items.iter().for_each(|&(_, item)| {
child_by_source_assoc_items(db, res, file_id, item);
}
});
}
}
impl ChildBySource for ImplId {
fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId) {
let data = db.impl_data(*self);
// FIXME attribute macros
for &item in data.items.iter() {
data.attribute_calls().filter(|(ast_id, _)| ast_id.file_id == file_id).for_each(
|(ast_id, call_id)| {
let item = ast_id.with_value(ast_id.to_node(db.upcast()));
res[keys::ATTR_MACRO_CALL].insert(item, call_id);
},
);
data.items.iter().for_each(|&item| {
child_by_source_assoc_items(db, res, file_id, item);
}
});
}
}
@ -97,7 +108,7 @@ impl ChildBySource for ItemScope {
// FIXME: Do we need to add proc-macros into a PROCMACRO dynmap here?
Either::Right(_fn) => return,
};
res[keys::MACRO_CALL].insert(src, makro);
res[keys::MACRO].insert(src, makro);
}
});
self.unnamed_consts().for_each(|konst| {