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

Cache source for generics

Browse Source
This commit is contained in:
Aleksey Kladov 2020-01-16 16:44:25 +01:00
parent 7aa627fe58
commit 16cfc8d50c
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/ra_hir/src/source_binder.rs
View File

@ -48,6 +48,7 @@ pub fn analyze(
ChildContainer::ModuleId(it) => it.resolver(self.db),
ChildContainer::EnumId(it) => it.resolver(self.db),
ChildContainer::VariantId(it) => it.resolver(self.db),
ChildContainer::GenericDefId(it) => it.resolver(self.db),
};
SourceAnalyzer::new_for_resolver(resolver, src)
}
@ -107,6 +108,19 @@ fn find_container(&mut self, src: InFile<&SyntaxNode>) -> Option<ChildContainer>
let c = crate::Module::from_definition(self.db, src.with_value(module_source))?;
Some(c.id.into())
}
fn child_by_source(&mut self, container: ChildContainer) -> &DynMap {
let db = self.db;
self.child_by_source_cache.entry(container).or_insert_with(|| match container {
ChildContainer::DefWithBodyId(it) => it.child_by_source(db),
ChildContainer::ModuleId(it) => it.child_by_source(db),
ChildContainer::TraitId(it) => it.child_by_source(db),
ChildContainer::ImplId(it) => it.child_by_source(db),
ChildContainer::EnumId(it) => it.child_by_source(db),
ChildContainer::VariantId(it) => it.child_by_source(db),
ChildContainer::GenericDefId(it) => it.child_by_source(db),
})
}
}
pub trait ToId: Sized {
@ -157,6 +171,9 @@ enum ChildContainer {
ImplId(ImplId),
EnumId(EnumId),
VariantId(VariantId),
/// XXX: this might be the same def as, for example an `EnumId`. However,
/// here the children generic parameters, and not, eg enum variants.
GenericDefId(GenericDefId),
}
impl_froms! {
ChildContainer:
@ -166,6 +183,7 @@ enum ChildContainer {
ImplId,
EnumId,
VariantId,
GenericDefId
}
pub trait ToIdByKey: Sized + AstNode + 'static {
@ -189,6 +207,7 @@ fn to_id<DB: HirDatabase>(
ChildContainer::ImplId(it) => it.child_by_source(db),
ChildContainer::EnumId(it) => it.child_by_source(db),
ChildContainer::VariantId(it) => it.child_by_source(db),
ChildContainer::GenericDefId(it) => it.child_by_source(db),
});
dyn_map[T::KEY].get(&src).copied()
}
@ -283,7 +302,7 @@ fn to_def<DB: HirDatabase>(
};
Some(res)
})?;
let &id = parent.child_by_source(sb.db)[keys::TYPE_PARAM].get(&src)?;
let &id = sb.child_by_source(parent.into())[keys::TYPE_PARAM].get(&src)?;
Some(TypeParam { id })
}
}