1 files changed, 62 insertions, 11 deletions
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs
index 624c25c4d..9e6170440 100644
--- a/crates/ra_hir/src/code_model_api.rs
+++ b/crates/ra_hir/src/code_model_api.rs
@@ -4,7 +4,7 @@ use ra_db::{CrateId, SourceRootId, Edition};
 use ra_syntax::{ast::self, TreeArc};
 use crate::{
-    Name, ScopesWithSourceMap, Ty, HirFileId,
+    Name, ScopesWithSourceMap, Ty, HirFileId, ImportSource,
    HirDatabase, DefDatabase,
    type_ref::TypeRef,
    nameres::{ModuleScope, Namespace, ImportId, CrateModuleId},
@@ -117,11 +117,7 @@ impl Module {
    }
    /// Returns the syntax of the last path segment corresponding to this import
-    pub fn import_source(
+    pub fn import_source(&self, db: &impl HirDatabase, import: ImportId) -> ImportSource {
-        &self,
-        db: &impl HirDatabase,
-        import: ImportId,
-    ) -> TreeArc<ast::PathSegment> {
        self.import_source_impl(db, import)
    }
@@ -433,6 +429,45 @@ impl Docs for EnumVariant {
    }
 }
+/// The defs which have a body.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum DefWithBody {
+    Function(Function),
+    Const(Const),
+    Static(Static),
+}
+impl_froms!(DefWithBody: Function, Const, Static);
+impl DefWithBody {
+    pub fn infer(&self, db: &impl HirDatabase) -> Arc<InferenceResult> {
+        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)
+    }
+    /// Builds a resolver for code inside this item.
+    pub 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)]
 pub struct Function {
    pub(crate) id: FunctionId,
@@ -483,11 +518,11 @@ impl Function {
    }
    pub fn body_source_map(&self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
-        db.body_with_source_map(*self).1
+        db.body_with_source_map((*self).into()).1
    }
    pub fn body(&self, db: &impl HirDatabase) -> Arc<Body> {
-        db.body_hir(*self)
+        db.body_hir((*self).into())
    }
    pub fn ty(&self, db: &impl HirDatabase) -> Ty {
@@ -495,8 +530,8 @@ impl Function {
    }
    pub fn scopes(&self, db: &impl HirDatabase) -> ScopesWithSourceMap {
-        let scopes = db.expr_scopes(*self);
+        let scopes = db.expr_scopes((*self).into());
-        let source_map = db.body_with_source_map(*self).1;
+        let source_map = db.body_with_source_map((*self).into()).1;
        ScopesWithSourceMap { scopes, source_map }
    }
@@ -505,7 +540,7 @@ impl Function {
    }
    pub fn infer(&self, db: &impl HirDatabase) -> Arc<InferenceResult> {
-        db.infer(*self)
+        db.infer((*self).into())
    }
    pub fn generic_params(&self, db: &impl DefDatabase) -> Arc<GenericParams> {
@@ -561,6 +596,14 @@ impl Const {
        db.const_signature(*self)
    }
+    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
+    }
    /// 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));
@@ -625,6 +668,14 @@ impl Static {
        // take the outer scope...
        self.module(db).resolver(db)
    }
+    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 {