1 files changed, 78 insertions, 62 deletions
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs
index 9e6170440..8f1ed1086 100644
--- a/crates/ra_hir/src/code_model_api.rs
+++ b/crates/ra_hir/src/code_model_api.rs
@@ -4,14 +4,14 @@ use ra_db::{CrateId, SourceRootId, Edition};
 use ra_syntax::{ast::self, TreeArc};
 use crate::{
-    Name, ScopesWithSourceMap, Ty, HirFileId, ImportSource,
+    Name, Ty, HirFileId, Either,
    HirDatabase, DefDatabase,
    type_ref::TypeRef,
    nameres::{ModuleScope, Namespace, ImportId, CrateModuleId},
    expr::{Body, BodySourceMap},
    ty::InferenceResult,
    adt::{EnumVariantId, StructFieldId, VariantDef},
-    generics::GenericParams,
+    generics::HasGenericParams,
    docs::{Documentation, Docs, docs_from_ast},
    ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeAliasId},
    impl_block::ImplBlock,
@@ -117,8 +117,14 @@ impl Module {
    }
    /// Returns the syntax of the last path segment corresponding to this import
-    pub fn import_source(&self, db: &impl HirDatabase, import: ImportId) -> ImportSource {
+    pub fn import_source(
-        self.import_source_impl(db, import)
+        &self,
+        db: &impl HirDatabase,
+        import: ImportId,
+    ) -> Either<TreeArc<ast::UseTree>, TreeArc<ast::ExternCrateItem>> {
+        let (file_id, source) = self.definition_source(db);
+        let (_, source_map) = db.raw_items_with_source_map(file_id);
+        source_map.get(&source, import)
    }
    /// Returns the crate this module is part of.
@@ -183,12 +189,12 @@ impl Module {
        }
    }
-    pub 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)
    }
-    pub fn declarations(self, db: &impl HirDatabase) -> Vec<ModuleDef> {
+    pub fn declarations(self, db: &impl DefDatabase) -> Vec<ModuleDef> {
        let def_map = db.crate_def_map(self.krate);
        def_map[self.module_id]
            .scope
@@ -293,10 +299,6 @@ impl Struct {
            .map(|(id, _)| StructField { parent: (*self).into(), id })
    }
-    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
-        db.generic_params((*self).into())
-    }
    pub fn ty(&self, db: &impl HirDatabase) -> Ty {
        db.type_for_def((*self).into(), Namespace::Types)
    }
@@ -307,7 +309,7 @@ impl Struct {
    // FIXME move to a more general type
    /// Builds a resolver for type references inside this struct.
-    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+    pub(crate) fn resolver(&self, db: &impl HirDatabase) -> Resolver {
        // take the outer scope...
        let r = self.module(db).resolver(db);
        // ...and add generic params, if present
@@ -357,17 +359,13 @@ impl Enum {
            .map(|(id, _)| EnumVariant { parent: *self, id })
    }
-    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
-        db.generic_params((*self).into())
-    }
    pub fn ty(&self, db: &impl HirDatabase) -> Ty {
        db.type_for_def((*self).into(), Namespace::Types)
    }
    // FIXME: move to a more general type
    /// Builds a resolver for type references inside this struct.
-    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+    pub(crate) fn resolver(&self, db: &impl HirDatabase) -> Resolver {
        // take the outer scope...
        let r = self.module(db).resolver(db);
        // ...and add generic params, if present
@@ -444,28 +442,22 @@ impl DefWithBody {
        db.infer(*self)
    }
-    pub fn body_source_map(&self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
-        db.body_with_source_map(*self).1
-    }
    pub fn body(&self, db: &impl HirDatabase) -> Arc<Body> {
        db.body_hir(*self)
    }
+    pub fn body_source_map(&self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
+        db.body_with_source_map(*self).1
+    }
    /// Builds a resolver for code inside this item.
-    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+    pub(crate) fn resolver(&self, db: &impl HirDatabase) -> Resolver {
        match *self {
            DefWithBody::Const(ref c) => c.resolver(db),
            DefWithBody::Function(ref f) => f.resolver(db),
            DefWithBody::Static(ref s) => s.resolver(db),
        }
    }
-    pub fn scopes(&self, db: &impl HirDatabase) -> ScopesWithSourceMap {
-        let scopes = db.expr_scopes(*self);
-        let source_map = db.body_with_source_map(*self).1;
-        ScopesWithSourceMap { scopes, source_map }
-    }
 }
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -517,7 +509,7 @@ impl Function {
        self.signature(db).name.clone()
    }
-    pub fn body_source_map(&self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
+    pub(crate) fn body_source_map(&self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
        db.body_with_source_map((*self).into()).1
    }
@@ -529,12 +521,6 @@ impl Function {
        db.type_for_def((*self).into(), Namespace::Values)
    }
-    pub fn scopes(&self, db: &impl HirDatabase) -> ScopesWithSourceMap {
-        let scopes = db.expr_scopes((*self).into());
-        let source_map = db.body_with_source_map((*self).into()).1;
-        ScopesWithSourceMap { scopes, source_map }
-    }
    pub fn signature(&self, db: &impl HirDatabase) -> Arc<FnSignature> {
        db.fn_signature(*self)
    }
@@ -543,24 +529,32 @@ impl Function {
        db.infer((*self).into())
    }
-    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
-        db.generic_params((*self).into())
-    }
    /// The containing impl block, if this is a method.
    pub fn impl_block(&self, db: &impl DefDatabase) -> Option<ImplBlock> {
        let module_impls = db.impls_in_module(self.module(db));
        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
+        }
+    }
    // FIXME: move to a more general type for 'body-having' items
    /// Builds a resolver for code inside this item.
-    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+    pub(crate) fn resolver(&self, db: &impl HirDatabase) -> Resolver {
        // take the outer scope...
-        let r = self
+        let r = self.container(db).map_or_else(|| self.module(db).resolver(db), |c| c.resolver(db));
-            .impl_block(db)
-            .map(|ib| ib.resolver(db))
-            .unwrap_or_else(|| self.module(db).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 };
@@ -600,10 +594,6 @@ impl Const {
        db.infer((*self).into())
    }
-    pub fn body_source_map(&self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
-        db.body_with_source_map((*self).into()).1
-    }
    /// The containing impl block, if this is a method.
    pub fn impl_block(&self, db: &impl DefDatabase) -> Option<ImplBlock> {
        let module_impls = db.impls_in_module(self.module(db));
@@ -612,7 +602,7 @@ impl Const {
    // FIXME: move to a more general type for 'body-having' items
    /// Builds a resolver for code inside this item.
-    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+    pub(crate) fn resolver(&self, db: &impl HirDatabase) -> Resolver {
        // take the outer scope...
        let r = self
            .impl_block(db)
@@ -664,7 +654,7 @@ impl Static {
    }
    /// Builds a resolver for code inside this item.
-    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+    pub(crate) fn resolver(&self, db: &impl HirDatabase) -> Resolver {
        // take the outer scope...
        self.module(db).resolver(db)
    }
@@ -672,10 +662,6 @@ impl Static {
    pub fn infer(&self, db: &impl HirDatabase) -> Arc<InferenceResult> {
        db.infer((*self).into())
    }
-    pub fn body_source_map(&self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
-        db.body_with_source_map((*self).into()).1
-    }
 }
 impl Docs for Static {
@@ -698,10 +684,6 @@ impl Trait {
        self.id.module(db)
    }
-    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
-        db.generic_params((*self).into())
-    }
    pub fn name(self, db: &impl DefDatabase) -> Option<Name> {
        self.trait_data(db).name().clone()
    }
@@ -713,6 +695,14 @@ impl Trait {
    pub(crate) fn trait_data(self, db: &impl DefDatabase) -> Arc<TraitData> {
        db.trait_data(self)
    }
+    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);
+        let r = if !p.params.is_empty() { r.push_generic_params_scope(p) } else { r };
+        r
+    }
 }
 impl Docs for Trait {
@@ -731,10 +721,6 @@ impl TypeAlias {
        self.id.source(db)
    }
-    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
-        db.generic_params((*self).into())
-    }
    pub fn module(&self, db: &impl DefDatabase) -> Module {
        self.id.module(db)
    }
@@ -745,12 +731,27 @@ 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)
    }
    /// Builds a resolver for the type references in this type alias.
-    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+    pub(crate) fn resolver(&self, db: &impl HirDatabase) -> Resolver {
        // take the outer scope...
        let r = self
            .impl_block(db)
@@ -768,3 +769,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),
+        }
+    }
+}