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

Add Container enum to handle both kinds of container (impl/trait)

Browse source
This commit is contained in:
Florian Diebold 2019-04-14 11:15:11 +02:00
parent 7650a44640
commit 4497e1d3ea
4 changed files with 58 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

51
crates/ra_hir/src/code_model_api.rs
View file

@ -189,7 +189,7 @@ impl Module {
}
}
pub(crate) fn resolver(&self, db: &impl HirDatabase) -> Resolver {
pub(crate) fn resolver(&self, db: &impl DefDatabase) -> Resolver {
let def_map = db.crate_def_map(self.krate);
Resolver::default().push_module_scope(def_map, self.module_id)
}
@ -552,16 +552,21 @@ impl Function {
db.trait_items_index(self.module(db)).get_parent_trait((*self).into())
}
pub fn container(&self, db: &impl DefDatabase) -> Option<Container> {
if let Some(impl_block) = self.impl_block(db) {
Some(impl_block.into())
} else if let Some(trait_) = self.parent_trait(db) {
Some(trait_.into())
} else {
None
}
}
// FIXME: move to a more general type for 'body-having' items
/// Builds a resolver for code inside this item.
pub(crate) fn resolver(&self, db: &impl HirDatabase) -> Resolver {
// take the outer scope...
// FIXME abstract over containers (trait/impl)
let r = self
.impl_block(db)
.map(|ib| ib.resolver(db))
.or_else(|| self.parent_trait(db).map(|tr| tr.resolver(db)))
.unwrap_or_else(|| self.module(db).resolver(db));
let r = self.container(db).map_or_else(|| self.module(db).resolver(db), |c| c.resolver(db));
// ...and add generic params, if present
let p = self.generic_params(db);
let r = if !p.params.is_empty() { r.push_generic_params_scope(p) } else { r };
@ -707,7 +712,7 @@ impl Trait {
db.trait_data(self)
}
pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
pub(crate) fn resolver(&self, db: &impl DefDatabase) -> Resolver {
let r = self.module(db).resolver(db);
// add generic params, if present
let p = self.generic_params(db);
@ -746,6 +751,21 @@ impl TypeAlias {
ImplBlock::containing(module_impls, (*self).into())
}
/// The containing trait, if this is a trait method definition.
pub fn parent_trait(&self, db: &impl DefDatabase) -> Option<Trait> {
db.trait_items_index(self.module(db)).get_parent_trait((*self).into())
}
pub fn container(&self, db: &impl DefDatabase) -> Option<Container> {
if let Some(impl_block) = self.impl_block(db) {
Some(impl_block.into())
} else if let Some(trait_) = self.parent_trait(db) {
Some(trait_.into())
} else {
None
}
}
pub fn type_ref(self, db: &impl DefDatabase) -> Arc<TypeRef> {
db.type_alias_ref(self)
}
@ -769,3 +789,18 @@ impl Docs for TypeAlias {
docs_from_ast(&*self.source(db).1)
}
}
pub enum Container {
Trait(Trait),
ImplBlock(ImplBlock),
}
impl_froms!(Container: Trait, ImplBlock);
impl Container {
pub(crate) fn resolver(&self, db: &impl DefDatabase) -> Resolver {
match self {
Container::Trait(trait_) => trait_.resolver(db),
Container::ImplBlock(impl_block) => impl_block.resolver(db),
}
}
}