language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify

Browse source
This commit is contained in:
Lukas Wirth 2022-01-07 21:51:59 +01:00
parent 0c9268c1ee
commit 6cf0cadfaa
1 changed files with 33 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,30 +31,8 @@ impl ChildBySource for TraitId {
fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId) { fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId) {
let data = db.trait_data(*self); let data = db.trait_data(*self);
// FIXME attribute macros // FIXME attribute macros
for (_name, item) in data.items.iter() { for &(_, item) in data.items.iter() {
match *item { child_by_source_assoc_items(db, res, file_id, item);
AssocItemId::FunctionId(func) => {
let loc = func.lookup(db);
if loc.id.file_id() == file_id {
let src = loc.source(db);
res[keys::FUNCTION].insert(src, func)
}
}
AssocItemId::ConstId(konst) => {
let loc = konst.lookup(db);
if loc.id.file_id() == file_id {
let src = loc.source(db);
res[keys::CONST].insert(src, konst)
}
}
AssocItemId::TypeAliasId(ty) => {
let loc = ty.lookup(db);
if loc.id.file_id() == file_id {
let src = loc.source(db);
res[keys::TYPE_ALIAS].insert(src, ty)
}
}
}
} }
} }
} }
@ -64,6 +42,17 @@ impl ChildBySource for ImplId {
let data = db.impl_data(*self); let data = db.impl_data(*self);
// FIXME attribute macros // FIXME attribute macros
for &item in data.items.iter() { for &item in data.items.iter() {
child_by_source_assoc_items(db, res, file_id, item);
}
}
}
fn child_by_source_assoc_items(
db: &dyn DefDatabase,
res: &mut DynMap,
file_id: HirFileId,
item: AssocItemId,
) {
match item { match item {
AssocItemId::FunctionId(func) => { AssocItemId::FunctionId(func) => {
let loc = func.lookup(db); let loc = func.lookup(db);
@ -88,8 +77,6 @@ impl ChildBySource for ImplId {
} }
} }
} }
}
}
impl ChildBySource for ModuleId { impl ChildBySource for ModuleId {
fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId) { fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId) {