25 files changed, 324 insertions, 449 deletions
diff --git a/crates/ra_assists/src/add_missing_impl_members.rs b/crates/ra_assists/src/add_missing_impl_members.rs
index 23c01e747..0e49b0401 100644
--- a/crates/ra_assists/src/add_missing_impl_members.rs
+++ b/crates/ra_assists/src/add_missing_impl_members.rs
@@ -1,6 +1,6 @@
 use crate::{Assist, AssistId, AssistCtx, ast_editor::{AstEditor, AstBuilder}};
-use hir::db::HirDatabase;
+use hir::{HasSource, db::HirDatabase};
 use ra_syntax::{SmolStr, TreeArc};
 use ra_syntax::ast::{self, AstNode, FnDef, ImplItem, ImplItemKind, NameOwner};
 use ra_db::FilePosition;
@@ -110,7 +110,7 @@ fn resolve_target_trait_def(
        impl_block.target_trait().map(AstNode::syntax).and_then(ast::PathType::cast)?.path()?;
    match analyzer.resolve_path(db, &ast_path) {
-        Some(hir::PathResolution::Def(hir::ModuleDef::Trait(def))) => Some(def.source(db).1),
+        Some(hir::PathResolution::Def(hir::ModuleDef::Trait(def))) => Some(def.source(db).ast),
        _ => None,
    }
 }
diff --git a/crates/ra_assists/src/fill_match_arms.rs b/crates/ra_assists/src/fill_match_arms.rs
index 45e327cd4..a7de6ae9f 100644
--- a/crates/ra_assists/src/fill_match_arms.rs
+++ b/crates/ra_assists/src/fill_match_arms.rs
@@ -1,7 +1,7 @@
 use std::fmt::Write;
 use hir::{
-    AdtDef, FieldSource,
+    AdtDef, FieldSource, HasSource,
    db::HirDatabase,
 };
 use ra_syntax::ast::{self, AstNode};
@@ -44,8 +44,8 @@ pub(crate) fn fill_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<As
                .into_iter()
                .map(|field| {
                    let name = field.name(db).to_string();
-                    let (_, source) = field.source(db);
+                    let src = field.source(db);
-                    match source {
+                    match src.ast {
                        FieldSource::Named(_) => name,
                        FieldSource::Pos(_) => "_".to_string(),
                    }
diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs
index 8bb524ce3..c19976bd2 100644
--- a/crates/ra_cli/src/analysis_stats.rs
+++ b/crates/ra_cli/src/analysis_stats.rs
@@ -2,7 +2,7 @@ use std::{collections::HashSet, time::Instant, fmt::Write};
 use ra_db::SourceDatabase;
 use ra_batch::BatchDatabase;
-use ra_hir::{Crate, ModuleDef, Ty, ImplItem};
+use ra_hir::{Crate, ModuleDef, Ty, ImplItem, HasSource};
 use ra_syntax::AstNode;
 use crate::Result;
@@ -64,10 +64,10 @@ pub fn run(verbose: bool, path: &str, only: Option<&str>) -> Result<()> {
        let name = f.name(&db);
        let mut msg = format!("processing: {}", name);
        if verbose {
-            let (file_id, source) = f.source(&db);
+            let src = f.source(&db);
-            let original_file = file_id.original_file(&db);
+            let original_file = src.file_id.original_file(&db);
            let path = db.file_relative_path(original_file);
-            let syntax_range = source.syntax().range();
+            let syntax_range = src.ast.syntax().range();
            write!(msg, " ({:?} {})", path, syntax_range).unwrap();
        }
        bar.set_message(&msg);
diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs
index 38ff1d6f6..b3843b35c 100644
--- a/crates/ra_hir/src/adt.rs
+++ b/crates/ra_hir/src/adt.rs
@@ -11,7 +11,7 @@ use ra_syntax::{
 use crate::{
    Name, AsName, Struct, Union, Enum, EnumVariant, Crate, AstDatabase,
-    HirDatabase, HirFileId, StructField, FieldSource,
+    HirDatabase, StructField, FieldSource, Source, HasSource,
    type_ref::TypeRef, DefDatabase,
 };
@@ -59,8 +59,8 @@ impl StructData {
        db: &(impl DefDatabase + AstDatabase),
        struct_: Struct,
    ) -> Arc<StructData> {
-        let (_, struct_def) = struct_.source(db);
+        let src = struct_.source(db);
-        Arc::new(StructData::new(&*struct_def))
+        Arc::new(StructData::new(&*src.ast))
    }
 }
@@ -72,15 +72,15 @@ impl EnumVariant {
    pub(crate) fn source_impl(
        &self,
        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::EnumVariant>) {
+    ) -> Source<TreeArc<ast::EnumVariant>> {
-        let (file_id, enum_def) = self.parent.source(db);
+        let src = self.parent.source(db);
-        let var = variants(&*enum_def)
+        let ast = variants(&*src.ast)
            .zip(db.enum_data(self.parent).variants.iter())
            .find(|(_syntax, (id, _))| *id == self.id)
            .unwrap()
            .0
            .to_owned();
-        (file_id, var)
+        Source { file_id: src.file_id, ast }
    }
    pub(crate) fn variant_data(&self, db: &impl DefDatabase) -> Arc<VariantData> {
        db.enum_data(self.parent).variants[self.id].variant_data.clone()
@@ -95,9 +95,9 @@ pub struct EnumData {
 impl EnumData {
    pub(crate) fn enum_data_query(db: &(impl DefDatabase + AstDatabase), e: Enum) -> Arc<EnumData> {
-        let (_file_id, enum_def) = e.source(db);
+        let src = e.source(db);
-        let name = enum_def.name().map(|n| n.as_name());
+        let name = src.ast.name().map(|n| n.as_name());
-        let variants = variants(&*enum_def)
+        let variants = variants(&*src.ast)
            .map(|var| EnumVariantData {
                name: var.name().map(|it| it.as_name()),
                variant_data: Arc::new(VariantData::new(var.kind())),
@@ -201,24 +201,19 @@ impl VariantDef {
 }
 impl StructField {
-    pub(crate) fn source_impl(
+    pub(crate) fn source_impl(&self, db: &(impl DefDatabase + AstDatabase)) -> Source<FieldSource> {
-        &self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, FieldSource) {
        let var_data = self.parent.variant_data(db);
        let fields = var_data.fields().unwrap();
        let ss;
        let es;
        let (file_id, struct_kind) = match self.parent {
            VariantDef::Struct(s) => {
-                let (file_id, source) = s.source(db);
+                ss = s.source(db);
-                ss = source;
+                (ss.file_id, ss.ast.kind())
-                (file_id, ss.kind())
            }
            VariantDef::EnumVariant(e) => {
-                let (file_id, source) = e.source(db);
+                es = e.source(db);
-                es = source;
+                (es.file_id, es.ast.kind())
-                (file_id, es.kind())
            }
        };
@@ -231,12 +226,12 @@ impl StructField {
            }
            ast::StructKind::Unit => Vec::new(),
        };
-        let field = field_sources
+        let ast = field_sources
            .into_iter()
            .zip(fields.iter())
            .find(|(_syntax, (id, _))| *id == self.id)
            .unwrap()
            .0;
-        (file_id, field)
+        Source { file_id, ast }
    }
 }
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 27850028b..830aea1f3 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -1,10 +1,13 @@
+pub(crate) mod src;
+pub(crate) mod docs;
 use std::sync::Arc;
 use ra_db::{CrateId, SourceRootId, Edition, FileId};
 use ra_syntax::{ast::{self, NameOwner, TypeAscriptionOwner}, TreeArc};
 use crate::{
-    Name, AsName, AstId, Ty, HirFileId, Either, KnownName,
+    Name, AsName, AstId, Ty, Either, KnownName, HasSource,
    HirDatabase, DefDatabase, AstDatabase,
    type_ref::TypeRef,
    nameres::{ModuleScope, Namespace, ImportId, CrateModuleId},
@@ -179,40 +182,15 @@ impl Module {
        })
    }
-    /// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.
-    pub fn definition_source(
-        self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, ModuleSource) {
-        let def_map = db.crate_def_map(self.krate);
-        let decl_id = def_map[self.module_id].declaration;
-        let file_id = def_map[self.module_id].definition;
-        let module_source = ModuleSource::new(db, file_id, decl_id);
-        let file_id = file_id.map(HirFileId::from).unwrap_or_else(|| decl_id.unwrap().file_id());
-        (file_id, module_source)
-    }
-    /// Returns a node which declares this module, either a `mod foo;` or a `mod foo {}`.
-    /// `None` for the crate root.
-    pub fn declaration_source(
-        self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> Option<(HirFileId, TreeArc<ast::Module>)> {
-        let def_map = db.crate_def_map(self.krate);
-        let decl = def_map[self.module_id].declaration?;
-        let ast = decl.to_node(db);
-        Some((decl.file_id(), ast))
-    }
    /// Returns the syntax of the last path segment corresponding to this import
    pub fn import_source(
        self,
        db: &impl HirDatabase,
        import: ImportId,
    ) -> Either<TreeArc<ast::UseTree>, TreeArc<ast::ExternCrateItem>> {
-        let (file_id, source) = self.definition_source(db);
+        let src = self.definition_source(db);
-        let (_, source_map) = db.raw_items_with_source_map(file_id);
+        let (_, source_map) = db.raw_items_with_source_map(src.file_id);
-        source_map.get(&source, import)
+        source_map.get(&src.ast, import)
    }
    /// Returns the crate this module is part of.
@@ -335,10 +313,6 @@ impl StructField {
        self.parent.variant_data(db).fields().unwrap()[self.id].name.clone()
    }
-    pub fn source(&self, db: &(impl DefDatabase + AstDatabase)) -> (HirFileId, FieldSource) {
-        self.source_impl(db)
-    }
    pub fn ty(&self, db: &impl HirDatabase) -> Ty {
        db.type_for_field(*self)
    }
@@ -354,13 +328,6 @@ pub struct Struct {
 }
 impl Struct {
-    pub fn source(
-        self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::StructDef>) {
-        self.id.source(db)
-    }
    pub fn module(self, db: &impl HirDatabase) -> Module {
        self.id.module(db)
    }
@@ -415,13 +382,6 @@ pub struct Union {
 }
 impl Union {
-    pub fn source(
-        self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::StructDef>) {
-        self.id.source(db)
-    }
    pub fn name(self, db: &impl DefDatabase) -> Option<Name> {
        db.struct_data(Struct { id: self.id }).name.clone()
    }
@@ -448,13 +408,6 @@ pub struct Enum {
 }
 impl Enum {
-    pub fn source(
-        self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::EnumDef>) {
-        self.id.source(db)
-    }
    pub fn module(self, db: &impl HirDatabase) -> Module {
        self.id.module(db)
    }
@@ -498,12 +451,6 @@ pub struct EnumVariant {
 }
 impl EnumVariant {
-    pub fn source(
-        &self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::EnumVariant>) {
-        self.source_impl(db)
-    }
    pub fn module(&self, db: &impl HirDatabase) -> Module {
        self.parent.module(db)
    }
@@ -588,11 +535,11 @@ impl FnSignature {
        db: &(impl DefDatabase + AstDatabase),
        func: Function,
    ) -> Arc<FnSignature> {
-        let (_, node) = func.source(db);
+        let src = func.source(db);
-        let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
+        let name = src.ast.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
        let mut params = Vec::new();
        let mut has_self_param = false;
-        if let Some(param_list) = node.param_list() {
+        if let Some(param_list) = src.ast.param_list() {
            if let Some(self_param) = param_list.self_param() {
                let self_type = if let Some(type_ref) = self_param.ascribed_type() {
                    TypeRef::from_ast(type_ref)
@@ -616,7 +563,7 @@ impl FnSignature {
                params.push(type_ref);
            }
        }
-        let ret_type = if let Some(type_ref) = node.ret_type().and_then(|rt| rt.type_ref()) {
+        let ret_type = if let Some(type_ref) = src.ast.ret_type().and_then(|rt| rt.type_ref()) {
            TypeRef::from_ast(type_ref)
        } else {
            TypeRef::unit()
@@ -645,10 +592,6 @@ impl FnSignature {
 }
 impl Function {
-    pub fn source(self, db: &(impl DefDatabase + AstDatabase)) -> (HirFileId, TreeArc<ast::FnDef>) {
-        self.id.source(db)
-    }
    pub fn module(self, db: &impl DefDatabase) -> Module {
        self.id.module(db)
    }
@@ -723,13 +666,6 @@ pub struct Const {
 }
 impl Const {
-    pub fn source(
-        self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::ConstDef>) {
-        self.id.source(db)
-    }
    pub fn module(self, db: &impl DefDatabase) -> Module {
        self.id.module(db)
    }
@@ -780,7 +716,7 @@ impl ConstSignature {
        db: &(impl DefDatabase + AstDatabase),
        konst: Const,
    ) -> Arc<ConstSignature> {
-        let (_, node) = konst.source(db);
+        let node = konst.source(db).ast;
        const_signature_for(&*node)
    }
@@ -788,7 +724,7 @@ impl ConstSignature {
        db: &(impl DefDatabase + AstDatabase),
        konst: Static,
    ) -> Arc<ConstSignature> {
-        let (_, node) = konst.source(db);
+        let node = konst.source(db).ast;
        const_signature_for(&*node)
    }
 }
@@ -806,13 +742,6 @@ pub struct Static {
 }
 impl Static {
-    pub fn source(
-        self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::StaticDef>) {
-        self.id.source(db)
-    }
    pub fn module(self, db: &impl DefDatabase) -> Module {
        self.id.module(db)
    }
@@ -838,13 +767,6 @@ pub struct Trait {
 }
 impl Trait {
-    pub fn source(
-        self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::TraitDef>) {
-        self.id.source(db)
-    }
    pub fn module(self, db: &impl DefDatabase) -> Module {
        self.id.module(db)
    }
@@ -884,13 +806,6 @@ pub struct TypeAlias {
 }
 impl TypeAlias {
-    pub fn source(
-        self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::TypeAliasDef>) {
-        self.id.source(db)
-    }
    pub fn module(self, db: &impl DefDatabase) -> Module {
        self.id.module(db)
    }
@@ -939,14 +854,7 @@ pub struct MacroDef {
    pub(crate) id: MacroDefId,
 }
-impl MacroDef {
+impl MacroDef {}
-    pub fn source(
-        &self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::MacroCall>) {
-        (self.id.0.file_id(), self.id.0.to_node(db))
-    }
-}
 pub enum Container {
    Trait(Trait),
diff --git a/crates/ra_hir/src/docs.rs b/crates/ra_hir/src/code_model/docs.rs
index 1b0f84de5..da2b9b854 100644
--- a/crates/ra_hir/src/docs.rs
+++ b/crates/ra_hir/src/code_model/docs.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use ra_syntax::ast;
 use crate::{
-    HirDatabase, DefDatabase, AstDatabase,
+    HirDatabase, DefDatabase, AstDatabase, HasSource,
    Module, StructField, Struct, Enum, EnumVariant, Static, Const, Function, Union, Trait, TypeAlias, FieldSource, MacroDef,
 };
@@ -71,21 +71,21 @@ pub(crate) fn documentation_query(
    def: DocDef,
 ) -> Option<Documentation> {
    match def {
-        DocDef::Module(it) => docs_from_ast(&*it.declaration_source(db)?.1),
+        DocDef::Module(it) => docs_from_ast(&*it.declaration_source(db)?.ast),
-        DocDef::StructField(it) => match it.source(db).1 {
+        DocDef::StructField(it) => match it.source(db).ast {
            FieldSource::Named(named) => docs_from_ast(&*named),
            FieldSource::Pos(..) => return None,
        },
-        DocDef::Struct(it) => docs_from_ast(&*it.source(db).1),
+        DocDef::Struct(it) => docs_from_ast(&*it.source(db).ast),
-        DocDef::Enum(it) => docs_from_ast(&*it.source(db).1),
+        DocDef::Enum(it) => docs_from_ast(&*it.source(db).ast),
-        DocDef::EnumVariant(it) => docs_from_ast(&*it.source(db).1),
+        DocDef::EnumVariant(it) => docs_from_ast(&*it.source(db).ast),
-        DocDef::Static(it) => docs_from_ast(&*it.source(db).1),
+        DocDef::Static(it) => docs_from_ast(&*it.source(db).ast),
-        DocDef::Const(it) => docs_from_ast(&*it.source(db).1),
+        DocDef::Const(it) => docs_from_ast(&*it.source(db).ast),
-        DocDef::Function(it) => docs_from_ast(&*it.source(db).1),
+        DocDef::Function(it) => docs_from_ast(&*it.source(db).ast),
-        DocDef::Union(it) => docs_from_ast(&*it.source(db).1),
+        DocDef::Union(it) => docs_from_ast(&*it.source(db).ast),
-        DocDef::Trait(it) => docs_from_ast(&*it.source(db).1),
+        DocDef::Trait(it) => docs_from_ast(&*it.source(db).ast),
-        DocDef::TypeAlias(it) => docs_from_ast(&*it.source(db).1),
+        DocDef::TypeAlias(it) => docs_from_ast(&*it.source(db).ast),
-        DocDef::MacroDef(it) => docs_from_ast(&*it.source(db).1),
+        DocDef::MacroDef(it) => docs_from_ast(&*it.source(db).ast),
    }
 }
diff --git a/crates/ra_hir/src/code_model/src.rs b/crates/ra_hir/src/code_model/src.rs
new file mode 100644
index 000000000..5785d3b26
--- /dev/null
+++ b/crates/ra_hir/src/code_model/src.rs
@@ -0,0 +1,110 @@
+use ra_syntax::{TreeArc, ast};
+use crate::{
+    HirFileId, DefDatabase, AstDatabase, Module, ModuleSource,
+    StructField, Struct, Enum, Union, EnumVariant, Function, Static, Trait, Const, TypeAlias,
+    FieldSource, MacroDef, ids::AstItemDef,
+};
+pub struct Source<T> {
+    pub file_id: HirFileId,
+    pub ast: T,
+}
+pub trait HasSource {
+    type Ast;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<Self::Ast>;
+}
+/// NB: Module is !HasSource, because it has two source nodes at the same time:
+/// definition and declaration.
+impl Module {
+    /// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.
+    pub fn definition_source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ModuleSource> {
+        let def_map = db.crate_def_map(self.krate);
+        let decl_id = def_map[self.module_id].declaration;
+        let file_id = def_map[self.module_id].definition;
+        let ast = ModuleSource::new(db, file_id, decl_id);
+        let file_id = file_id.map(HirFileId::from).unwrap_or_else(|| decl_id.unwrap().file_id());
+        Source { file_id, ast }
+    }
+    /// Returns a node which declares this module, either a `mod foo;` or a `mod foo {}`.
+    /// `None` for the crate root.
+    pub fn declaration_source(
+        self,
+        db: &(impl DefDatabase + AstDatabase),
+    ) -> Option<Source<TreeArc<ast::Module>>> {
+        let def_map = db.crate_def_map(self.krate);
+        let decl = def_map[self.module_id].declaration?;
+        let ast = decl.to_node(db);
+        Some(Source { file_id: decl.file_id(), ast })
+    }
+}
+impl HasSource for StructField {
+    type Ast = FieldSource;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<FieldSource> {
+        self.source_impl(db)
+    }
+}
+impl HasSource for Struct {
+    type Ast = TreeArc<ast::StructDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::StructDef>> {
+        self.id.source(db)
+    }
+}
+impl HasSource for Union {
+    type Ast = TreeArc<ast::StructDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::StructDef>> {
+        self.id.source(db)
+    }
+}
+impl HasSource for Enum {
+    type Ast = TreeArc<ast::EnumDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::EnumDef>> {
+        self.id.source(db)
+    }
+}
+impl HasSource for EnumVariant {
+    type Ast = TreeArc<ast::EnumVariant>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::EnumVariant>> {
+        self.source_impl(db)
+    }
+}
+impl HasSource for Function {
+    type Ast = TreeArc<ast::FnDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::FnDef>> {
+        self.id.source(db)
+    }
+}
+impl HasSource for Const {
+    type Ast = TreeArc<ast::ConstDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::ConstDef>> {
+        self.id.source(db)
+    }
+}
+impl HasSource for Static {
+    type Ast = TreeArc<ast::StaticDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::StaticDef>> {
+        self.id.source(db)
+    }
+}
+impl HasSource for Trait {
+    type Ast = TreeArc<ast::TraitDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::TraitDef>> {
+        self.id.source(db)
+    }
+}
+impl HasSource for TypeAlias {
+    type Ast = TreeArc<ast::TypeAliasDef>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::TypeAliasDef>> {
+        self.id.source(db)
+    }
+}
+impl HasSource for MacroDef {
+    type Ast = TreeArc<ast::MacroCall>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::MacroCall>> {
+        Source { file_id: self.id.0.file_id(), ast: self.id.0.to_node(db) }
+    }
+}
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index d2a372f3b..d2d6f95b7 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -128,8 +128,8 @@ pub trait DefDatabase: SourceDatabase {
    #[salsa::invoke(crate::lang_item::LangItems::lang_item_query)]
    fn lang_item(&self, start_crate: Crate, item: SmolStr) -> Option<LangItemTarget>;
-    #[salsa::invoke(crate::docs::documentation_query)]
+    #[salsa::invoke(crate::code_model::docs::documentation_query)]
-    fn documentation(&self, def: crate::docs::DocDef) -> Option<crate::docs::Documentation>;
+    fn documentation(&self, def: crate::DocDef) -> Option<crate::Documentation>;
 }
 #[salsa::query_group(HirDatabaseStorage)]
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
index 012f374ec..b1973d19d 100644
--- a/crates/ra_hir/src/expr.rs
+++ b/crates/ra_hir/src/expr.rs
@@ -11,6 +11,7 @@ use ra_syntax::{
 use crate::{
    Path, Name, HirDatabase, Resolver,DefWithBody, Either, HirFileId, MacroCallLoc, MacroFileKind,
+    HasSource,
    name::AsName,
    type_ref::{Mutability, TypeRef},
 };
@@ -1018,19 +1019,19 @@ pub(crate) fn body_with_source_map_query(
    match def {
        DefWithBody::Const(ref c) => {
-            let (file_id, src) = c.source(db);
+            let src = c.source(db);
-            collector = ExprCollector::new(def, file_id, def.resolver(db), db);
+            collector = ExprCollector::new(def, src.file_id, def.resolver(db), db);
-            collector.collect_const_body(&src)
+            collector.collect_const_body(&src.ast)
        }
        DefWithBody::Function(ref f) => {
-            let (file_id, src) = f.source(db);
+            let src = f.source(db);
-            collector = ExprCollector::new(def, file_id, def.resolver(db), db);
+            collector = ExprCollector::new(def, src.file_id, def.resolver(db), db);
-            collector.collect_fn_body(&src)
+            collector.collect_fn_body(&src.ast)
        }
        DefWithBody::Static(ref s) => {
-            let (file_id, src) = s.source(db);
+            let src = s.source(db);
-            collector = ExprCollector::new(def, file_id, def.resolver(db), db);
+            collector = ExprCollector::new(def, src.file_id, def.resolver(db), db);
-            collector.collect_static_body(&src)
+            collector.collect_static_body(&src.ast)
        }
    }
diff --git a/crates/ra_hir/src/expr/validation.rs b/crates/ra_hir/src/expr/validation.rs
index a1b2641da..534fd482b 100644
--- a/crates/ra_hir/src/expr/validation.rs
+++ b/crates/ra_hir/src/expr/validation.rs
@@ -5,7 +5,7 @@ use ra_syntax::ast::{AstNode, StructLit};
 use crate::{
    expr::AstPtr,
-    HirDatabase, Function, Name,
+    HirDatabase, Function, Name, HasSource,
    diagnostics::{DiagnosticSink, MissingFields},
    adt::AdtDef,
    Path,
@@ -71,7 +71,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
            return;
        }
        let source_map = self.func.body_source_map(db);
-        let file_id = self.func.source(db).0;
+        let file_id = self.func.source(db).file_id;
        let source_file = db.parse(file_id.original_file(db)).tree;
        if let Some(field_list_node) = source_map
            .expr_syntax(id)
diff --git a/crates/ra_hir/src/generics.rs b/crates/ra_hir/src/generics.rs
index b6c5e18d3..462b136b7 100644
--- a/crates/ra_hir/src/generics.rs
+++ b/crates/ra_hir/src/generics.rs
@@ -8,8 +8,10 @@ use std::sync::Arc;
 use ra_syntax::ast::{self, NameOwner, TypeParamsOwner, TypeBoundsOwner, DefaultTypeParamOwner};
 use crate::{
+    HasSource,
+    Name, AsName, Function, Struct, Union, Enum, Trait, TypeAlias, ImplBlock, Container, AdtDef,
    db::{HirDatabase, DefDatabase, AstDatabase},
-    Name, AsName, Function, Struct, Union, Enum, Trait, TypeAlias, ImplBlock, Container, path::Path, type_ref::TypeRef, AdtDef
+    path::Path, type_ref::TypeRef,
 };
 /// Data about a generic parameter (to a function, struct, impl, ...).
@@ -68,10 +70,10 @@ impl GenericParams {
        generics.parent_params = parent.map(|p| db.generic_params(p));
        let start = generics.parent_params.as_ref().map(|p| p.params.len()).unwrap_or(0) as u32;
        match def {
-            GenericDef::Function(it) => generics.fill(&*it.source(db).1, start),
+            GenericDef::Function(it) => generics.fill(&*it.source(db).ast, start),
-            GenericDef::Struct(it) => generics.fill(&*it.source(db).1, start),
+            GenericDef::Struct(it) => generics.fill(&*it.source(db).ast, start),
-            GenericDef::Union(it) => generics.fill(&*it.source(db).1, start),
+            GenericDef::Union(it) => generics.fill(&*it.source(db).ast, start),
-            GenericDef::Enum(it) => generics.fill(&*it.source(db).1, start),
+            GenericDef::Enum(it) => generics.fill(&*it.source(db).ast, start),
            GenericDef::Trait(it) => {
                // traits get the Self type as an implicit first type parameter
                generics.params.push(GenericParam {
@@ -79,10 +81,10 @@ impl GenericParams {
                    name: Name::self_type(),
                    default: None,
                });
-                generics.fill(&*it.source(db).1, start + 1);
+                generics.fill(&*it.source(db).ast, start + 1);
            }
-            GenericDef::TypeAlias(it) => generics.fill(&*it.source(db).1, start),
+            GenericDef::TypeAlias(it) => generics.fill(&*it.source(db).ast, start),
-            GenericDef::ImplBlock(it) => generics.fill(&*it.source(db).1, start),
+            GenericDef::ImplBlock(it) => generics.fill(&*it.source(db).ast, start),
        }
        Arc::new(generics)
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index a95561812..352f9ffd9 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -9,7 +9,7 @@ use ra_prof::profile;
 use mbe::MacroRules;
 use crate::{
-    Module, DefDatabase, AstId, FileAstId, AstDatabase,
+    Module, DefDatabase, AstId, FileAstId, AstDatabase, Source,
 };
 /// hir makes heavy use of ids: integer (u32) handlers to various things. You
@@ -265,10 +265,10 @@ pub(crate) trait AstItemDef<N: AstNode>: salsa::InternKey + Clone {
        let loc = ItemLoc { module: ctx.module, ast_id: ast_id.with_file_id(ctx.file_id) };
        Self::intern(ctx.db, loc)
    }
-    fn source(self, db: &(impl AstDatabase + DefDatabase)) -> (HirFileId, TreeArc<N>) {
+    fn source(self, db: &(impl AstDatabase + DefDatabase)) -> Source<TreeArc<N>> {
        let loc = self.lookup_intern(db);
        let ast = loc.ast_id.to_node(db);
-        (loc.ast_id.file_id(), ast)
+        Source { file_id: loc.ast_id.file_id(), ast }
    }
    fn module(self, db: &impl DefDatabase) -> Module {
        let loc = self.lookup_intern(db);
diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs
index a0d3b33fe..fb9daf1bf 100644
--- a/crates/ra_hir/src/impl_block.rs
+++ b/crates/ra_hir/src/impl_block.rs
@@ -8,7 +8,7 @@ use ra_syntax::{
 };
 use crate::{
-    Const, TypeAlias, Function, HirFileId, AstDatabase,
+    Const, TypeAlias, Function, HirFileId, AstDatabase, HasSource, Source,
    HirDatabase, DefDatabase, TraitRef,
    type_ref::TypeRef,
    ids::LocationCtx,
@@ -44,6 +44,15 @@ pub struct ImplBlock {
    impl_id: ImplId,
 }
+impl HasSource for ImplBlock {
+    type Ast = TreeArc<ast::ImplBlock>;
+    fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<TreeArc<ast::ImplBlock>> {
+        let source_map = db.impls_in_module_with_source_map(self.module).1;
+        let src = self.module.definition_source(db);
+        Source { file_id: src.file_id, ast: source_map.get(&src.ast, self.impl_id) }
+    }
+}
 impl ImplBlock {
    pub(crate) fn containing(
        module_impl_blocks: Arc<ModuleImplBlocks>,
@@ -57,16 +66,6 @@ impl ImplBlock {
        ImplBlock { module, impl_id }
    }
-    /// Returns the syntax of the impl block
-    pub fn source(
-        &self,
-        db: &(impl DefDatabase + AstDatabase),
-    ) -> (HirFileId, TreeArc<ast::ImplBlock>) {
-        let source_map = db.impls_in_module_with_source_map(self.module).1;
-        let (file_id, source) = self.module.definition_source(db);
-        (file_id, source_map.get(&source, self.impl_id))
-    }
    pub fn id(&self) -> ImplId {
        self.impl_id
    }
@@ -201,8 +200,8 @@ impl ModuleImplBlocks {
            impls_by_def: FxHashMap::default(),
        };
-        let (file_id, module_source) = m.module.definition_source(db);
+        let src = m.module.definition_source(db);
-        let node = match &module_source {
+        let node = match &src.ast {
            ModuleSource::SourceFile(node) => node.syntax(),
            ModuleSource::Module(node) => {
                node.item_list().expect("inline module should have item list").syntax()
@@ -210,7 +209,7 @@ impl ModuleImplBlocks {
        };
        for impl_block_ast in node.children().filter_map(ast::ImplBlock::cast) {
-            let impl_block = ImplData::from_ast(db, file_id, m.module, impl_block_ast);
+            let impl_block = ImplData::from_ast(db, src.file_id, m.module, impl_block_ast);
            let id = m.impls.alloc(impl_block);
            for &impl_item in &m.impls[id].items {
                m.impls_by_def.insert(impl_item, id);
diff --git a/crates/ra_hir/src/lang_item.rs b/crates/ra_hir/src/lang_item.rs
index 684fbc068..cdc9182d6 100644
--- a/crates/ra_hir/src/lang_item.rs
+++ b/crates/ra_hir/src/lang_item.rs
@@ -84,7 +84,7 @@ impl LangItems {
    ) {
        // Look for impl targets
        let (impl_blocks, source_map) = db.impls_in_module_with_source_map(module.clone());
-        let source = module.definition_source(db).1;
+        let source = module.definition_source(db).ast;
        for (impl_id, _) in impl_blocks.impls.iter() {
            let impl_block = source_map.get(&source, impl_id);
            let lang_item_name = impl_block
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 0e4aaf678..2e99bdac8 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -38,7 +38,6 @@ mod impl_block;
 mod expr;
 mod lang_item;
 mod generics;
-mod docs;
 mod resolve;
 pub mod diagnostics;
@@ -64,7 +63,6 @@ pub use self::{
    nameres::{PerNs, Namespace, ImportId},
    ty::{Ty, ApplicationTy, TypeCtor, TraitRef, Substs, display::HirDisplay, CallableDef},
    impl_block::{ImplBlock, ImplItem},
-    docs::{Docs, Documentation},
    adt::AdtDef,
    expr::ExprScopes,
    resolve::Resolution,
@@ -82,4 +80,6 @@ pub use self::code_model::{
    Static, Const, ConstSignature,
    Trait, TypeAlias, MacroDef, Container,
    BuiltinType,
+    src::{Source, HasSource},
+    docs::{Docs, Documentation, DocDef},
 };
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 876ebe0e3..4f9e8c5a9 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -97,13 +97,13 @@ pub fn struct_from_module(
    module: Module,
    struct_def: &ast::StructDef,
 ) -> Struct {
-    let (file_id, _) = module.definition_source(db);
+    let file_id = module.definition_source(db).file_id;
    let ctx = LocationCtx::new(db, module, file_id);
    Struct { id: ctx.to_def(struct_def) }
 }
 pub fn enum_from_module(db: &impl HirDatabase, module: Module, enum_def: &ast::EnumDef) -> Enum {
-    let (file_id, _) = module.definition_source(db);
+    let file_id = module.definition_source(db).file_id;
    let ctx = LocationCtx::new(db, module, file_id);
    Enum { id: ctx.to_def(enum_def) }
 }
@@ -113,7 +113,7 @@ pub fn trait_from_module(
    module: Module,
    trait_def: &ast::TraitDef,
 ) -> Trait {
-    let (file_id, _) = module.definition_source(db);
+    let file_id = module.definition_source(db).file_id;
    let ctx = LocationCtx::new(db, module, file_id);
    Trait { id: ctx.to_def(trait_def) }
 }
diff --git a/crates/ra_hir/src/traits.rs b/crates/ra_hir/src/traits.rs
index 967654e97..f2950e1b2 100644
--- a/crates/ra_hir/src/traits.rs
+++ b/crates/ra_hir/src/traits.rs
@@ -6,7 +6,7 @@ use rustc_hash::FxHashMap;
 use ra_syntax::ast::{self, NameOwner};
 use crate::{
-    Function, Const, TypeAlias, Name, DefDatabase, Trait, AstDatabase, Module,
+    Function, Const, TypeAlias, Name, DefDatabase, Trait, AstDatabase, Module, HasSource,
    ids::LocationCtx, name::AsName,
 };
@@ -22,12 +22,12 @@ impl TraitData {
        db: &(impl DefDatabase + AstDatabase),
        tr: Trait,
    ) -> Arc<TraitData> {
-        let (file_id, node) = tr.source(db);
+        let src = tr.source(db);
-        let name = node.name().map(|n| n.as_name());
+        let name = src.ast.name().map(|n| n.as_name());
        let module = tr.module(db);
-        let ctx = LocationCtx::new(db, module, file_id);
+        let ctx = LocationCtx::new(db, module, src.file_id);
-        let auto = node.is_auto();
+        let auto = src.ast.is_auto();
-        let items = if let Some(item_list) = node.item_list() {
+        let items = if let Some(item_list) = src.ast.item_list() {
            item_list
                .impl_items()
                .map(|item_node| match item_node.kind() {
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index 6aa727ea1..fef0f1d24 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -1415,7 +1415,7 @@ mod diagnostics {
    use crate::{
        expr::ExprId,
        diagnostics::{DiagnosticSink, NoSuchField},
-        HirDatabase, Function,
+        HirDatabase, Function, HasSource,
 };
    #[derive(Debug, PartialEq, Eq, Clone)]
@@ -1432,7 +1432,7 @@ mod diagnostics {
        ) {
            match self {
                InferenceDiagnostic::NoSuchField { expr, field } => {
-                    let (file, _) = owner.source(db);
+                    let file = owner.source(db).file_id;
                    let field = owner.body_source_map(db).field_syntax(*expr, *field);
                    sink.push(NoSuchField { file, field })
                }
diff --git a/crates/ra_hir/src/type_alias.rs b/crates/ra_hir/src/type_alias.rs
index 970468e3c..87b9caa8a 100644
--- a/crates/ra_hir/src/type_alias.rs
+++ b/crates/ra_hir/src/type_alias.rs
@@ -2,12 +2,12 @@
 use std::sync::Arc;
-use crate::{TypeAlias, DefDatabase, AstDatabase, type_ref::TypeRef};
+use crate::{TypeAlias, DefDatabase, AstDatabase, HasSource, type_ref::TypeRef};
 pub(crate) fn type_alias_ref_query(
    db: &(impl DefDatabase + AstDatabase),
    typ: TypeAlias,
 ) -> Arc<TypeRef> {
-    let (_, node) = typ.source(db);
+    let node = typ.source(db).ast;
    Arc::new(TypeRef::from_ast_opt(node.type_ref()))
 }
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index d405161d6..f4ff4404b 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -1,7 +1,7 @@
 //! This modules takes care of rendering various defenitions as completion items.
 use join_to_string::join;
 use test_utils::tested_by;
-use hir::{Docs, PerNs, Resolution, HirDisplay};
+use hir::{Docs, PerNs, Resolution, HirDisplay, HasSource};
 use ra_syntax::ast::NameOwner;
 use crate::completion::{
@@ -100,7 +100,7 @@ impl Completions {
    ) {
        let sig = func.signature(ctx.db);
        let name = name.unwrap_or_else(|| sig.name().to_string());
-        let (_, ast_node) = func.source(ctx.db);
+        let ast_node = func.source(ctx.db).ast;
        let detail = function_label(&ast_node);
        let mut builder = CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name)
@@ -126,12 +126,11 @@ impl Completions {
    }
    pub(crate) fn add_const(&mut self, ctx: &CompletionContext, constant: hir::Const) {
-        let (_file_id, ast_node) = constant.source(ctx.db);
+        let ast_node = constant.source(ctx.db).ast;
        let name = match ast_node.name() {
            Some(name) => name,
            _ => return,
        };
-        let (_, ast_node) = constant.source(ctx.db);
        let detail = const_label(&ast_node);
        CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.text().to_string())
@@ -142,13 +141,12 @@ impl Completions {
    }
    pub(crate) fn add_type_alias(&mut self, ctx: &CompletionContext, type_alias: hir::TypeAlias) {
-        let (_file_id, type_def) = type_alias.source(ctx.db);
+        let type_def = type_alias.source(ctx.db).ast;
        let name = match type_def.name() {
            Some(name) => name,
            _ => return,
        };
-        let (_, ast_node) = type_alias.source(ctx.db);
+        let detail = type_label(&type_def);
-        let detail = type_label(&ast_node);
        CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.text().to_string())
            .kind(CompletionItemKind::TypeAlias)
diff --git a/crates/ra_ide_api/src/display/function_signature.rs b/crates/ra_ide_api/src/display/function_signature.rs
index d09950bce..b0b0c7122 100644
--- a/crates/ra_ide_api/src/display/function_signature.rs
+++ b/crates/ra_ide_api/src/display/function_signature.rs
@@ -1,10 +1,11 @@
-use super::{where_predicates, generic_parameters};
-use crate::db;
 use std::fmt::{self, Display};
 use join_to_string::join;
 use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
 use std::convert::From;
-use hir::{Docs, Documentation};
+use hir::{Docs, Documentation, HasSource};
+use crate::{db, display::{where_predicates, generic_parameters}};
 /// Contains information about a function signature
 #[derive(Debug)]
@@ -33,7 +34,7 @@ impl FunctionSignature {
    pub(crate) fn from_hir(db: &db::RootDatabase, function: hir::Function) -> Self {
        let doc = function.docs(db);
-        let (_, ast_node) = function.source(db);
+        let ast_node = function.source(db).ast;
        FunctionSignature::from(&*ast_node).with_doc_opt(doc)
    }
 }
diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs
index cfd3f5478..823cdaaf3 100644
--- a/crates/ra_ide_api/src/display/navigation_target.rs
+++ b/crates/ra_ide_api/src/display/navigation_target.rs
@@ -1,11 +1,11 @@
 use ra_db::{FileId, SourceDatabase};
 use ra_syntax::{
-    SyntaxNode, AstNode, SmolStr, TextRange, AstPtr,
+    SyntaxNode, AstNode, SmolStr, TextRange, AstPtr, TreeArc,
    SyntaxKind::{self, NAME},
    ast::{self, DocCommentsOwner},
    algo::visit::{visitor, Visitor},
 };
-use hir::{ModuleSource, FieldSource, ImplItem};
+use hir::{ModuleSource, FieldSource, ImplItem, HasSource};
 use crate::{FileSymbol, db::RootDatabase};
 use super::short_label::ShortLabel;
@@ -129,10 +129,10 @@ impl NavigationTarget {
    }
    pub(crate) fn from_module(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
-        let (file_id, source) = module.definition_source(db);
+        let src = module.definition_source(db);
-        let file_id = file_id.as_original_file();
+        let file_id = src.file_id.as_original_file();
        let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
-        match source {
+        match src.ast {
            ModuleSource::SourceFile(node) => {
                NavigationTarget::from_syntax(file_id, name, None, node.syntax(), None, None)
            }
@@ -149,34 +149,24 @@ impl NavigationTarget {
    pub(crate) fn from_module_to_decl(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
        let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
-        if let Some((file_id, source)) = module.declaration_source(db) {
+        if let Some(src) = module.declaration_source(db) {
-            let file_id = file_id.as_original_file();
+            let file_id = src.file_id.as_original_file();
            return NavigationTarget::from_syntax(
                file_id,
                name,
                None,
-                source.syntax(),
+                src.ast.syntax(),
-                source.doc_comment_text(),
+                src.ast.doc_comment_text(),
-                source.short_label(),
+                src.ast.short_label(),
            );
        }
        NavigationTarget::from_module(db, module)
    }
-    pub(crate) fn from_function(db: &RootDatabase, func: hir::Function) -> NavigationTarget {
-        let (file_id, fn_def) = func.source(db);
-        NavigationTarget::from_named(
-            file_id.original_file(db),
-            &*fn_def,
-            fn_def.doc_comment_text(),
-            fn_def.short_label(),
-        )
-    }
    pub(crate) fn from_field(db: &RootDatabase, field: hir::StructField) -> NavigationTarget {
-        let (file_id, field) = field.source(db);
+        let src = field.source(db);
-        let file_id = file_id.original_file(db);
+        let file_id = src.file_id.original_file(db);
-        match field {
+        match src.ast {
            FieldSource::Named(it) => {
                NavigationTarget::from_named(file_id, &*it, it.doc_comment_text(), it.short_label())
            }
@@ -186,35 +176,25 @@ impl NavigationTarget {
        }
    }
+    pub(crate) fn from_def_source<A, D>(db: &RootDatabase, def: D) -> NavigationTarget
+    where
+        D: HasSource<Ast = TreeArc<A>>,
+        A: ast::DocCommentsOwner + ast::NameOwner + ShortLabel,
+    {
+        let src = def.source(db);
+        NavigationTarget::from_named(
+            src.file_id.original_file(db),
+            &*src.ast,
+            src.ast.doc_comment_text(),
+            src.ast.short_label(),
+        )
+    }
    pub(crate) fn from_adt_def(db: &RootDatabase, adt_def: hir::AdtDef) -> NavigationTarget {
        match adt_def {
-            hir::AdtDef::Struct(s) => {
+            hir::AdtDef::Struct(it) => NavigationTarget::from_def_source(db, it),
-                let (file_id, node) = s.source(db);
+            hir::AdtDef::Union(it) => NavigationTarget::from_def_source(db, it),
-                NavigationTarget::from_named(
+            hir::AdtDef::Enum(it) => NavigationTarget::from_def_source(db, it),
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
-            hir::AdtDef::Union(s) => {
-                let (file_id, node) = s.source(db);
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
-            hir::AdtDef::Enum(s) => {
-                let (file_id, node) = s.source(db);
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
        }
    }
@@ -224,79 +204,15 @@ impl NavigationTarget {
    ) -> Option<NavigationTarget> {
        let nav = match module_def {
            hir::ModuleDef::Module(module) => NavigationTarget::from_module(db, module),
-            hir::ModuleDef::Function(func) => NavigationTarget::from_function(db, func),
+            hir::ModuleDef::Function(func) => NavigationTarget::from_def_source(db, func),
-            hir::ModuleDef::Struct(s) => {
+            hir::ModuleDef::Struct(it) => NavigationTarget::from_adt_def(db, it.into()),
-                let (file_id, node) = s.source(db);
+            hir::ModuleDef::Enum(it) => NavigationTarget::from_adt_def(db, it.into()),
-                NavigationTarget::from_named(
+            hir::ModuleDef::Union(it) => NavigationTarget::from_adt_def(db, it.into()),
-                    file_id.original_file(db),
+            hir::ModuleDef::Const(it) => NavigationTarget::from_def_source(db, it),
-                    &*node,
+            hir::ModuleDef::Static(it) => NavigationTarget::from_def_source(db, it),
-                    node.doc_comment_text(),
+            hir::ModuleDef::EnumVariant(it) => NavigationTarget::from_def_source(db, it),
-                    node.short_label(),
+            hir::ModuleDef::Trait(it) => NavigationTarget::from_def_source(db, it),
-                )
+            hir::ModuleDef::TypeAlias(it) => NavigationTarget::from_def_source(db, it),
-            }
-            hir::ModuleDef::Union(s) => {
-                let (file_id, node) = s.source(db);
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
-            hir::ModuleDef::Const(s) => {
-                let (file_id, node) = s.source(db);
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
-            hir::ModuleDef::Static(s) => {
-                let (file_id, node) = s.source(db);
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
-            hir::ModuleDef::Enum(e) => {
-                let (file_id, node) = e.source(db);
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
-            hir::ModuleDef::EnumVariant(var) => {
-                let (file_id, node) = var.source(db);
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
-            hir::ModuleDef::Trait(e) => {
-                let (file_id, node) = e.source(db);
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
-            hir::ModuleDef::TypeAlias(e) => {
-                let (file_id, node) = e.source(db);
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
            hir::ModuleDef::BuiltinType(..) => {
                return None;
            }
@@ -308,12 +224,12 @@ impl NavigationTarget {
        db: &RootDatabase,
        impl_block: hir::ImplBlock,
    ) -> NavigationTarget {
-        let (file_id, node) = impl_block.source(db);
+        let src = impl_block.source(db);
        NavigationTarget::from_syntax(
-            file_id.as_original_file(),
+            src.file_id.as_original_file(),
            "impl".into(),
            None,
-            node.syntax(),
+            src.ast.syntax(),
            None,
            None,
        )
@@ -321,35 +237,19 @@ impl NavigationTarget {
    pub(crate) fn from_impl_item(db: &RootDatabase, impl_item: hir::ImplItem) -> NavigationTarget {
        match impl_item {
-            ImplItem::Method(f) => NavigationTarget::from_function(db, f),
+            ImplItem::Method(it) => NavigationTarget::from_def_source(db, it),
-            ImplItem::Const(c) => {
+            ImplItem::Const(it) => NavigationTarget::from_def_source(db, it),
-                let (file_id, node) = c.source(db);
+            ImplItem::TypeAlias(it) => NavigationTarget::from_def_source(db, it),
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
-            ImplItem::TypeAlias(a) => {
-                let (file_id, node) = a.source(db);
-                NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
-                )
-            }
        }
    }
    pub(crate) fn from_macro_def(db: &RootDatabase, macro_call: hir::MacroDef) -> NavigationTarget {
-        let (file_id, node) = macro_call.source(db);
+        let src = macro_call.source(db);
-        log::debug!("nav target {}", node.syntax().debug_dump());
+        log::debug!("nav target {}", src.ast.syntax().debug_dump());
        NavigationTarget::from_named(
-            file_id.original_file(db),
+            src.file_id.original_file(db),
-            &*node,
+            &*src.ast,
-            node.doc_comment_text(),
+            src.ast.doc_comment_text(),
            None,
        )
    }
diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs
index 325a5a4f3..63ba6cf9d 100644
--- a/crates/ra_ide_api/src/goto_definition.rs
+++ b/crates/ra_ide_api/src/goto_definition.rs
@@ -59,10 +59,10 @@ pub(crate) fn reference_definition(
    let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
    match classify_name_ref(db, &analyzer, name_ref) {
-        Some(Method(func)) => return Exact(NavigationTarget::from_function(db, func)),
        Some(Macro(mac)) => return Exact(NavigationTarget::from_macro_def(db, mac)),
        Some(FieldAccess(field)) => return Exact(NavigationTarget::from_field(db, field)),
        Some(AssocItem(assoc)) => return Exact(NavigationTarget::from_impl_item(db, assoc)),
+        Some(Method(func)) => return Exact(NavigationTarget::from_def_source(db, func)),
        Some(Def(def)) => match NavigationTarget::from_def(db, def) {
            Some(nav) => return Exact(nav),
            None => return Approximate(vec![]),
@@ -253,12 +253,12 @@ mod tests {
            //- /foo/lib.rs
            #[macro_export]
            macro_rules! foo {
-                () => {             
+                () => {
                    {}
                };
-            }            
+            }
            ",
-            "foo MACRO_CALL FileId(2) [0; 79) [29; 32)",
+            "foo MACRO_CALL FileId(2) [0; 66) [29; 32)",
        );
    }
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index fbabeb194..ad00abe49 100644
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -1,9 +1,10 @@
 use ra_db::SourceDatabase;
 use ra_syntax::{
-    AstNode, ast::{self, DocCommentsOwner},
+    AstNode, TreeArc,
+    ast::{self, DocCommentsOwner},
    algo::{find_covering_element, find_node_at_offset, ancestors_at_offset, visit::{visitor, Visitor}},
 };
-use hir::HirDisplay;
+use hir::{HirDisplay, HasSource};
 use crate::{
    db::RootDatabase,
@@ -95,78 +96,38 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
        let analyzer = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax(), None);
        match classify_name_ref(db, &analyzer, name_ref) {
-            Some(Method(it)) => {
+            Some(Method(it)) => res.extend(from_def_source(db, it)),
-                let it = it.source(db).1;
-                res.extend(hover_text(it.doc_comment_text(), it.short_label()));
-            }
            Some(Macro(it)) => {
-                let it = it.source(db).1;
+                let src = it.source(db);
-                res.extend(hover_text(it.doc_comment_text(), None));
+                res.extend(hover_text(src.ast.doc_comment_text(), None));
            }
            Some(FieldAccess(it)) => {
-                let it = it.source(db).1;
+                let src = it.source(db);
-                if let hir::FieldSource::Named(it) = it {
+                if let hir::FieldSource::Named(it) = src.ast {
                    res.extend(hover_text(it.doc_comment_text(), it.short_label()));
                }
            }
-            Some(AssocItem(it)) => match it {
+            Some(AssocItem(it)) => res.extend(match it {
-                hir::ImplItem::Method(it) => {
+                hir::ImplItem::Method(it) => from_def_source(db, it),
-                    let it = it.source(db).1;
+                hir::ImplItem::Const(it) => from_def_source(db, it),
-                    res.extend(hover_text(it.doc_comment_text(), it.short_label()))
+                hir::ImplItem::TypeAlias(it) => from_def_source(db, it),
-                }
+            }),
-                hir::ImplItem::Const(it) => {
-                    let it = it.source(db).1;
-                    res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                }
-                hir::ImplItem::TypeAlias(it) => {
-                    let it = it.source(db).1;
-                    res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                }
-            },
            Some(Def(it)) => {
                match it {
                    hir::ModuleDef::Module(it) => {
-                        let it = it.definition_source(db).1;
+                        if let hir::ModuleSource::Module(it) = it.definition_source(db).ast {
-                        if let hir::ModuleSource::Module(it) = it {
                            res.extend(hover_text(it.doc_comment_text(), it.short_label()))
                        }
                    }
-                    hir::ModuleDef::Function(it) => {
+                    hir::ModuleDef::Function(it) => res.extend(from_def_source(db, it)),
-                        let it = it.source(db).1;
+                    hir::ModuleDef::Struct(it) => res.extend(from_def_source(db, it)),
-                        res.extend(hover_text(it.doc_comment_text(), it.short_label()))
+                    hir::ModuleDef::Union(it) => res.extend(from_def_source(db, it)),
-                    }
+                    hir::ModuleDef::Enum(it) => res.extend(from_def_source(db, it)),
-                    hir::ModuleDef::Struct(it) => {
+                    hir::ModuleDef::EnumVariant(it) => res.extend(from_def_source(db, it)),
-                        let it = it.source(db).1;
+                    hir::ModuleDef::Const(it) => res.extend(from_def_source(db, it)),
-                        res.extend(hover_text(it.doc_comment_text(), it.short_label()))
+                    hir::ModuleDef::Static(it) => res.extend(from_def_source(db, it)),
-                    }
+                    hir::ModuleDef::Trait(it) => res.extend(from_def_source(db, it)),
-                    hir::ModuleDef::Union(it) => {
+                    hir::ModuleDef::TypeAlias(it) => res.extend(from_def_source(db, it)),
-                        let it = it.source(db).1;
-                        res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                    }
-                    hir::ModuleDef::Enum(it) => {
-                        let it = it.source(db).1;
-                        res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                    }
-                    hir::ModuleDef::EnumVariant(it) => {
-                        let it = it.source(db).1;
-                        res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                    }
-                    hir::ModuleDef::Const(it) => {
-                        let it = it.source(db).1;
-                        res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                    }
-                    hir::ModuleDef::Static(it) => {
-                        let it = it.source(db).1;
-                        res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                    }
-                    hir::ModuleDef::Trait(it) => {
-                        let it = it.source(db).1;
-                        res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                    }
-                    hir::ModuleDef::TypeAlias(it) => {
-                        let it = it.source(db).1;
-                        res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                    }
                    hir::ModuleDef::BuiltinType(_) => {
                        // FIXME: hover for builtin Type ?
                    }
@@ -174,20 +135,11 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
            }
            Some(SelfType(ty)) => {
                if let Some((adt_def, _)) = ty.as_adt() {
-                    match adt_def {
+                    res.extend(match adt_def {
-                        hir::AdtDef::Struct(it) => {
+                        hir::AdtDef::Struct(it) => from_def_source(db, it),
-                            let it = it.source(db).1;
+                        hir::AdtDef::Union(it) => from_def_source(db, it),
-                            res.extend(hover_text(it.doc_comment_text(), it.short_label()))
+                        hir::AdtDef::Enum(it) => from_def_source(db, it),
-                        }
+                    })
-                        hir::AdtDef::Union(it) => {
-                            let it = it.source(db).1;
-                            res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                        }
-                        hir::AdtDef::Enum(it) => {
-                            let it = it.source(db).1;
-                            res.extend(hover_text(it.doc_comment_text(), it.short_label()))
-                        }
-                    }
                }
            }
            Some(Pat(_)) => {
@@ -270,7 +222,16 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
        return None;
    }
    let res = RangeInfo::new(range, res);
-    Some(res)
+    return Some(res);
+    fn from_def_source<A, D>(db: &RootDatabase, def: D) -> Option<String>
+    where
+        D: HasSource<Ast = TreeArc<A>>,
+        A: ast::DocCommentsOwner + ast::NameOwner + ShortLabel,
+    {
+        let src = def.source(db);
+        hover_text(src.ast.doc_comment_text(), src.ast.short_label())
+    }
 }
 pub(crate) fn type_of(db: &RootDatabase, frange: FileRange) -> Option<String> {
diff --git a/crates/ra_ide_api/src/references.rs b/crates/ra_ide_api/src/references.rs
index a75042b76..12cdc6a6d 100644
--- a/crates/ra_ide_api/src/references.rs
+++ b/crates/ra_ide_api/src/references.rs
@@ -148,9 +148,9 @@ fn rename_mod(
    let mut file_system_edits = Vec::new();
    if let Some(module) = source_binder::module_from_declaration(db, position.file_id, &ast_module)
    {
-        let (file_id, module_source) = module.definition_source(db);
+        let src = module.definition_source(db);
-        let file_id = file_id.as_original_file();
+        let file_id = src.file_id.as_original_file();
-        match module_source {
+        match src.ast {
            ModuleSource::SourceFile(..) => {
                let mod_path: RelativePathBuf = db.file_relative_path(file_id);
                // mod is defined in path/to/dir/mod.rs