Merge #2862

2862: Move from `from_source` to `SourceBinder` r=matklad a=matklad

bors r+

Co-authored-by: Aleksey Kladov <[email protected]>

3 files changed, 218 insertions, 301 deletions

diff --git a/crates/ra_hir/src/from_source.rs b/crates/ra_hir/src/from_source.rs
deleted file mode 100644
index 6314be8d4..000000000
--- a/crates/ra_hir/src/from_source.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-//! Finds a corresponding hir data structure for a syntax node in a specific
-//! file.
-
-use hir_def::{
-    child_by_source::ChildBySource, dyn_map::DynMap, keys, keys::Key, nameres::ModuleSource,
-    ConstId, DefWithBodyId, EnumId, EnumVariantId, FunctionId, GenericDefId, ImplId, ModuleId,
-    StaticId, StructId, TraitId, TypeAliasId, UnionId, VariantId,
-};
-use hir_expand::{name::AsName, AstId, MacroDefId, MacroDefKind};
-use ra_db::FileId;
-use ra_prof::profile;
-use ra_syntax::{
-    ast::{self, AstNode, NameOwner},
-    match_ast, SyntaxNode,
-};
-
-use crate::{
-    db::{DefDatabase, HirDatabase},
-    Const, DefWithBody, Enum, EnumVariant, FieldSource, Function, ImplBlock, InFile, Local,
-    MacroDef, Module, Static, Struct, StructField, Trait, TypeAlias, TypeParam, Union,
-};
-
-pub trait FromSource: Sized {
-    type Ast;
-    fn from_source(db: &impl DefDatabase, src: InFile<Self::Ast>) -> Option<Self>;
-}
-
-pub trait FromSourceByContainer: Sized {
-    type Ast: AstNode + 'static;
-    type Id: Copy + 'static;
-    const KEY: Key<Self::Ast, Self::Id>;
-}
-
-impl<T: FromSourceByContainer> FromSource for T
-where
-    T: From<<T as FromSourceByContainer>::Id>,
-{
-    type Ast = <T as FromSourceByContainer>::Ast;
-    fn from_source(db: &impl DefDatabase, src: InFile<Self::Ast>) -> Option<Self> {
-        analyze_container(db, src.as_ref().map(|it| it.syntax()))[T::KEY]
-            .get(&src)
-            .copied()
-            .map(Self::from)
-    }
-}
-
-macro_rules! from_source_by_container_impls {
-    ($(($hir:ident, $id:ident, $ast:path, $key:path)),* ,) => {$(
-        impl FromSourceByContainer for $hir {
-            type Ast = $ast;
-            type Id = $id;
-            const KEY: Key<Self::Ast, Self::Id> = $key;
-        }
-    )*}
-}
-
-from_source_by_container_impls![
-    (Struct, StructId, ast::StructDef, keys::STRUCT),
-    (Union, UnionId, ast::UnionDef, keys::UNION),
-    (Enum, EnumId, ast::EnumDef, keys::ENUM),
-    (Trait, TraitId, ast::TraitDef, keys::TRAIT),
-    (Function, FunctionId, ast::FnDef, keys::FUNCTION),
-    (Static, StaticId, ast::StaticDef, keys::STATIC),
-    (Const, ConstId, ast::ConstDef, keys::CONST),
-    (TypeAlias, TypeAliasId, ast::TypeAliasDef, keys::TYPE_ALIAS),
-    (ImplBlock, ImplId, ast::ImplBlock, keys::IMPL),
-];
-
-impl FromSource for MacroDef {
-    type Ast = ast::MacroCall;
-    fn from_source(db: &impl DefDatabase, src: InFile<Self::Ast>) -> Option<Self> {
-        let kind = MacroDefKind::Declarative;
-
-        let module_src = ModuleSource::from_child_node(db, src.as_ref().map(|it| it.syntax()));
-        let module = Module::from_definition(db, InFile::new(src.file_id, module_src))?;
-        let krate = Some(module.krate().id);
-
-        let ast_id = Some(AstId::new(src.file_id, db.ast_id_map(src.file_id).ast_id(&src.value)));
-
-        let id: MacroDefId = MacroDefId { krate, ast_id, kind };
-        Some(MacroDef { id })
-    }
-}
-
-impl FromSource for EnumVariant {
-    type Ast = ast::EnumVariant;
-    fn from_source(db: &impl DefDatabase, src: InFile<Self::Ast>) -> Option<Self> {
-        let parent_enum = src.value.parent_enum();
-        let src_enum = InFile { file_id: src.file_id, value: parent_enum };
-        let parent_enum = Enum::from_source(db, src_enum)?;
-        parent_enum.id.child_by_source(db)[keys::ENUM_VARIANT]
-            .get(&src)
-            .copied()
-            .map(EnumVariant::from)
-    }
-}
-
-impl FromSource for StructField {
-    type Ast = FieldSource;
-    fn from_source(db: &impl DefDatabase, src: InFile<Self::Ast>) -> Option<Self> {
-        let src = src.as_ref();
-
-        // FIXME this is buggy
-        let variant_id: VariantId = match src.value {
-            FieldSource::Named(field) => {
-                let value = field.syntax().ancestors().find_map(ast::StructDef::cast)?;
-                let src = InFile { file_id: src.file_id, value };
-                let def = Struct::from_source(db, src)?;
-                def.id.into()
-            }
-            FieldSource::Pos(field) => {
-                let value = field.syntax().ancestors().find_map(ast::EnumVariant::cast)?;
-                let src = InFile { file_id: src.file_id, value };
-                let def = EnumVariant::from_source(db, src)?;
-                EnumVariantId::from(def).into()
-            }
-        };
-
-        let dyn_map = variant_id.child_by_source(db);
-        match src.value {
-            FieldSource::Pos(it) => dyn_map[keys::TUPLE_FIELD].get(&src.with_value(it.clone())),
-            FieldSource::Named(it) => dyn_map[keys::RECORD_FIELD].get(&src.with_value(it.clone())),
-        }
-        .copied()
-        .map(StructField::from)
-    }
-}
-
-impl Local {
-    pub fn from_source(db: &impl HirDatabase, src: InFile<ast::BindPat>) -> Option<Self> {
-        let file_id = src.file_id;
-        let parent: DefWithBody = src.value.syntax().ancestors().find_map(|it| {
-            let res = match_ast! {
-                match it {
-                    ast::ConstDef(value) => { Const::from_source(db, InFile { value, file_id})?.into() },
-                    ast::StaticDef(value) => { Static::from_source(db, InFile { value, file_id})?.into() },
-                    ast::FnDef(value) => { Function::from_source(db, InFile { value, file_id})?.into() },
-                    _ => return None,
-                }
-            };
-            Some(res)
-        })?;
-        let (_body, source_map) = db.body_with_source_map(parent.into());
-        let src = src.map(ast::Pat::from);
-        let pat_id = source_map.node_pat(src.as_ref())?;
-        Some(Local { parent, pat_id })
-    }
-}
-
-impl TypeParam {
-    pub fn from_source(db: &impl HirDatabase, src: InFile<ast::TypeParam>) -> Option<Self> {
-        let file_id = src.file_id;
-        let parent: GenericDefId = src.value.syntax().ancestors().find_map(|it| {
-            let res = match_ast! {
-                match it {
-                    ast::FnDef(value) => { Function::from_source(db, InFile { value, file_id})?.id.into() },
-                    ast::StructDef(value) => { Struct::from_source(db, InFile { value, file_id})?.id.into() },
-                    ast::EnumDef(value) => { Enum::from_source(db, InFile { value, file_id})?.id.into() },
-                    ast::TraitDef(value) => { Trait::from_source(db, InFile { value, file_id})?.id.into() },
-                    ast::TypeAliasDef(value) => { TypeAlias::from_source(db, InFile { value, file_id})?.id.into() },
-                    ast::ImplBlock(value) => { ImplBlock::from_source(db, InFile { value, file_id})?.id.into() },
-                    _ => return None,
-                }
-            };
-            Some(res)
-        })?;
-        let &id = parent.child_by_source(db)[keys::TYPE_PARAM].get(&src)?;
-        Some(TypeParam { id })
-    }
-}
-
-impl Module {
-    pub fn from_declaration(db: &impl DefDatabase, src: InFile<ast::Module>) -> Option<Self> {
-        let _p = profile("Module::from_declaration");
-        let parent_declaration = src.value.syntax().ancestors().skip(1).find_map(ast::Module::cast);
-
-        let parent_module = match parent_declaration {
-            Some(parent_declaration) => {
-                let src_parent = InFile { file_id: src.file_id, value: parent_declaration };
-                Module::from_declaration(db, src_parent)
-            }
-            None => {
-                let source_file = db.parse(src.file_id.original_file(db)).tree();
-                let src_parent =
-                    InFile { file_id: src.file_id, value: ModuleSource::SourceFile(source_file) };
-                Module::from_definition(db, src_parent)
-            }
-        }?;
-
-        let child_name = src.value.name()?.as_name();
-        let def_map = db.crate_def_map(parent_module.id.krate);
-        let child_id = def_map[parent_module.id.local_id].children.get(&child_name)?;
-        Some(parent_module.with_module_id(*child_id))
-    }
-
-    pub fn from_definition(db: &impl DefDatabase, src: InFile<ModuleSource>) -> Option<Self> {
-        let _p = profile("Module::from_definition");
-        match src.value {
-            ModuleSource::Module(ref module) => {
-                assert!(!module.has_semi());
-                return Module::from_declaration(
-                    db,
-                    InFile { file_id: src.file_id, value: module.clone() },
-                );
-            }
-            ModuleSource::SourceFile(_) => (),
-        };
-
-        let original_file = src.file_id.original_file(db);
-        Module::from_file(db, original_file)
-    }
-
-    fn from_file(db: &impl DefDatabase, file: FileId) -> Option<Self> {
-        let _p = profile("Module::from_file");
-        let (krate, local_id) = db.relevant_crates(file).iter().find_map(|&crate_id| {
-            let crate_def_map = db.crate_def_map(crate_id);
-            let local_id = crate_def_map.modules_for_file(file).next()?;
-            Some((crate_id, local_id))
-        })?;
-        Some(Module { id: ModuleId { krate, local_id } })
-    }
-}
-
-fn analyze_container(db: &impl DefDatabase, src: InFile<&SyntaxNode>) -> DynMap {
-    let _p = profile("analyze_container");
-    return child_by_source(db, src).unwrap_or_default();
-
-    fn child_by_source(db: &impl DefDatabase, src: InFile<&SyntaxNode>) -> Option<DynMap> {
-        for container in src.value.ancestors().skip(1) {
-            let res = match_ast! {
-                match container {
-                    ast::TraitDef(it) => {
-                        let def = Trait::from_source(db, src.with_value(it))?;
-                        def.id.child_by_source(db)
-                    },
-                    ast::ImplBlock(it) => {
-                        let def = ImplBlock::from_source(db, src.with_value(it))?;
-                        def.id.child_by_source(db)
-                    },
-                    ast::FnDef(it) => {
-                        let def = Function::from_source(db, src.with_value(it))?;
-                        DefWithBodyId::from(def.id)
-                            .child_by_source(db)
-                    },
-                    ast::StaticDef(it) => {
-                        let def = Static::from_source(db, src.with_value(it))?;
-                        DefWithBodyId::from(def.id)
-                            .child_by_source(db)
-                    },
-                    ast::ConstDef(it) => {
-                        let def = Const::from_source(db, src.with_value(it))?;
-                        DefWithBodyId::from(def.id)
-                            .child_by_source(db)
-                    },
-                    _ => { continue },
-                }
-            };
-            return Some(res);
-        }
-
-        let module_source = ModuleSource::from_child_node(db, src);
-        let c = Module::from_definition(db, src.with_value(module_source))?;
-        Some(c.id.child_by_source(db))
-    }
-}
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index a2350573c..e1c7b7a20 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -36,7 +36,6 @@ mod from_id;
 mod code_model;
 
 mod has_source;
-mod from_source;
 
 pub use crate::{
     code_model::{
@@ -45,7 +44,6 @@ pub use crate::{
         MacroDef, Module, ModuleDef, ScopeDef, Static, Struct, StructField, Trait, Type, TypeAlias,
         TypeParam, Union, VariantDef,
     },
-    from_source::FromSource,
     has_source::HasSource,
     source_analyzer::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer},
     source_binder::SourceBinder,
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 00541dbe1..f3150f578 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -1,22 +1,24 @@
-//! `SourceBinder` should be the main entry point for getting info about source code.
+//! `SourceBinder` is the main entry point for getting info about source code.
 //! It's main task is to map source syntax trees to hir-level IDs.
-//!
-//! It is intended to subsume `FromSource` and `SourceAnalyzer`.
 
 use hir_def::{
     child_by_source::ChildBySource,
     dyn_map::DynMap,
     keys::{self, Key},
     resolver::{HasResolver, Resolver},
-    ConstId, DefWithBodyId, EnumId, EnumVariantId, FunctionId, ImplId, ModuleId, StaticId,
-    StructFieldId, StructId, TraitId, TypeAliasId, UnionId, VariantId,
+    ConstId, DefWithBodyId, EnumId, EnumVariantId, FunctionId, GenericDefId, ImplId, ModuleId,
+    StaticId, StructFieldId, StructId, TraitId, TypeAliasId, UnionId, VariantId,
 };
-use hir_expand::InFile;
+use hir_expand::{name::AsName, AstId, InFile, MacroDefId, MacroDefKind};
 use ra_prof::profile;
-use ra_syntax::{ast, match_ast, AstNode, SyntaxNode, TextUnit};
+use ra_syntax::{
+    ast::{self, NameOwner},
+    match_ast, AstNode, SyntaxNode, TextUnit,
+};
 use rustc_hash::FxHashMap;
 
-use crate::{db::HirDatabase, ModuleSource, SourceAnalyzer};
+use crate::{db::HirDatabase, Local, Module, SourceAnalyzer, TypeParam};
+use ra_db::FileId;
 
 pub struct SourceBinder<'a, DB> {
     pub db: &'a DB,
@@ -48,32 +50,27 @@ impl<DB: HirDatabase> SourceBinder<'_, DB> {
             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)
     }
 
-    pub fn to_def<D, T>(&mut self, src: InFile<T>) -> Option<D>
-    where
-        D: From<T::ID>,
-        T: ToId,
-    {
-        let id: T::ID = self.to_id(src)?;
-        Some(id.into())
+    pub fn to_def<T: ToDef>(&mut self, src: InFile<T>) -> Option<T::Def> {
+        T::to_def(self, src)
+    }
+
+    pub fn to_module_def(&mut self, file: FileId) -> Option<Module> {
+        let _p = profile("SourceBinder::to_module_def");
+        let (krate, local_id) = self.db.relevant_crates(file).iter().find_map(|&crate_id| {
+            let crate_def_map = self.db.crate_def_map(crate_id);
+            let local_id = crate_def_map.modules_for_file(file).next()?;
+            Some((crate_id, local_id))
+        })?;
+        Some(Module { id: ModuleId { krate, local_id } })
     }
 
     fn to_id<T: ToId>(&mut self, src: InFile<T>) -> Option<T::ID> {
-        let container = self.find_container(src.as_ref().map(|it| it.syntax()))?;
-        let db = self.db;
-        let dyn_map =
-            &*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),
-            });
-        dyn_map[T::KEY].get(&src).copied()
+        T::to_id(self, src)
     }
 
     fn find_container(&mut self, src: InFile<&SyntaxNode>) -> Option<ChildContainer> {
@@ -112,19 +109,75 @@ impl<DB: HirDatabase> SourceBinder<'_, DB> {
                         let def: UnionId = self.to_id(container.with_value(it))?;
                         VariantId::from(def).into()
                     },
-                    // FIXME: handle out-of-line modules here
+                    ast::Module(it) => {
+                        let def: ModuleId = self.to_id(container.with_value(it))?;
+                        def.into()
+                    },
                     _ => { continue },
                 }
             };
             return Some(res);
         }
 
-        let module_source = ModuleSource::from_child_node(self.db, src);
-        let c = crate::Module::from_definition(self.db, src.with_value(module_source))?;
+        let c = self.to_module_def(src.file_id.original_file(self.db))?;
         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 {
+    type ID: Sized + Copy + 'static;
+    fn to_id<DB: HirDatabase>(sb: &mut SourceBinder<'_, DB>, src: InFile<Self>)
+        -> Option<Self::ID>;
+}
+
+pub trait ToDef: Sized + AstNode + 'static {
+    type Def;
+    fn to_def<DB: HirDatabase>(
+        sb: &mut SourceBinder<'_, DB>,
+        src: InFile<Self>,
+    ) -> Option<Self::Def>;
+}
+
+macro_rules! to_def_impls {
+    ($(($def:path, $ast:path)),* ,) => {$(
+        impl ToDef for $ast {
+            type Def = $def;
+            fn to_def<DB: HirDatabase>(sb: &mut SourceBinder<'_, DB>, src: InFile<Self>)
+                -> Option<Self::Def>
+            { sb.to_id(src).map(Into::into) }
+        }
+    )*}
+}
+
+to_def_impls![
+    (crate::Module, ast::Module),
+    (crate::Struct, ast::StructDef),
+    (crate::Enum, ast::EnumDef),
+    (crate::Union, ast::UnionDef),
+    (crate::Trait, ast::TraitDef),
+    (crate::ImplBlock, ast::ImplBlock),
+    (crate::TypeAlias, ast::TypeAliasDef),
+    (crate::Const, ast::ConstDef),
+    (crate::Static, ast::StaticDef),
+    (crate::Function, ast::FnDef),
+    (crate::StructField, ast::RecordFieldDef),
+    (crate::EnumVariant, ast::EnumVariant),
+    (crate::MacroDef, ast::MacroCall), // this one is dubious, not all calls are macros
+];
+
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
 enum ChildContainer {
     DefWithBodyId(DefWithBodyId),
@@ -133,6 +186,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:
@@ -142,23 +198,46 @@ impl_froms! {
     ImplId,
     EnumId,
     VariantId,
+    GenericDefId
 }
 
-pub trait ToId: Sized + AstNode + 'static {
+pub trait ToIdByKey: Sized + AstNode + 'static {
     type ID: Sized + Copy + 'static;
     const KEY: Key<Self, Self::ID>;
 }
 
-macro_rules! to_id_impls {
+impl<T: ToIdByKey> ToId for T {
+    type ID = <T as ToIdByKey>::ID;
+    fn to_id<DB: HirDatabase>(
+        sb: &mut SourceBinder<'_, DB>,
+        src: InFile<Self>,
+    ) -> Option<Self::ID> {
+        let container = sb.find_container(src.as_ref().map(|it| it.syntax()))?;
+        let db = sb.db;
+        let dyn_map =
+            &*sb.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),
+            });
+        dyn_map[T::KEY].get(&src).copied()
+    }
+}
+
+macro_rules! to_id_key_impls {
     ($(($id:ident, $ast:path, $key:path)),* ,) => {$(
-        impl ToId for $ast {
+        impl ToIdByKey for $ast {
             type ID = $id;
             const KEY: Key<Self, Self::ID> = $key;
         }
     )*}
 }
 
-to_id_impls![
+to_id_key_impls![
     (StructId, ast::StructDef, keys::STRUCT),
     (UnionId, ast::UnionDef, keys::UNION),
     (EnumId, ast::EnumDef, keys::ENUM),
@@ -171,3 +250,108 @@ to_id_impls![
     (StructFieldId, ast::RecordFieldDef, keys::RECORD_FIELD),
     (EnumVariantId, ast::EnumVariant, keys::ENUM_VARIANT),
 ];
+
+// FIXME: use DynMap as well?
+impl ToId for ast::MacroCall {
+    type ID = MacroDefId;
+    fn to_id<DB: HirDatabase>(
+        sb: &mut SourceBinder<'_, DB>,
+        src: InFile<Self>,
+    ) -> Option<Self::ID> {
+        let kind = MacroDefKind::Declarative;
+
+        let krate = sb.to_module_def(src.file_id.original_file(sb.db))?.id.krate;
+
+        let ast_id =
+            Some(AstId::new(src.file_id, sb.db.ast_id_map(src.file_id).ast_id(&src.value)));
+
+        Some(MacroDefId { krate: Some(krate), ast_id, kind })
+    }
+}
+
+impl ToDef for ast::BindPat {
+    type Def = Local;
+
+    fn to_def<DB: HirDatabase>(sb: &mut SourceBinder<'_, DB>, src: InFile<Self>) -> Option<Local> {
+        let file_id = src.file_id;
+        let parent: DefWithBodyId = src.value.syntax().ancestors().find_map(|it| {
+            let res = match_ast! {
+                match it {
+                    ast::ConstDef(value) => { sb.to_id(InFile { value, file_id})?.into() },
+                    ast::StaticDef(value) => { sb.to_id(InFile { value, file_id})?.into() },
+                    ast::FnDef(value) => { sb.to_id(InFile { value, file_id})?.into() },
+                    _ => return None,
+                }
+            };
+            Some(res)
+        })?;
+        let (_body, source_map) = sb.db.body_with_source_map(parent);
+        let src = src.map(ast::Pat::from);
+        let pat_id = source_map.node_pat(src.as_ref())?;
+        Some(Local { parent: parent.into(), pat_id })
+    }
+}
+
+impl ToDef for ast::TypeParam {
+    type Def = TypeParam;
+
+    fn to_def<DB: HirDatabase>(
+        sb: &mut SourceBinder<'_, DB>,
+        src: InFile<ast::TypeParam>,
+    ) -> Option<TypeParam> {
+        let mut sb = SourceBinder::new(sb.db);
+        let file_id = src.file_id;
+        let parent: GenericDefId = src.value.syntax().ancestors().find_map(|it| {
+            let res = match_ast! {
+                match it {
+                    ast::FnDef(value) => { sb.to_id(InFile { value, file_id})?.into() },
+                    ast::StructDef(value) => { sb.to_id(InFile { value, file_id})?.into() },
+                    ast::EnumDef(value) => { sb.to_id(InFile { value, file_id})?.into() },
+                    ast::TraitDef(value) => { sb.to_id(InFile { value, file_id})?.into() },
+                    ast::TypeAliasDef(value) => { sb.to_id(InFile { value, file_id})?.into() },
+                    ast::ImplBlock(value) => { sb.to_id(InFile { value, file_id})?.into() },
+                    _ => return None,
+                }
+            };
+            Some(res)
+        })?;
+        let &id = sb.child_by_source(parent.into())[keys::TYPE_PARAM].get(&src)?;
+        Some(TypeParam { id })
+    }
+}
+
+impl ToId for ast::Module {
+    type ID = ModuleId;
+
+    fn to_id<DB: HirDatabase>(
+        sb: &mut SourceBinder<'_, DB>,
+        src: InFile<ast::Module>,
+    ) -> Option<ModuleId> {
+        {
+            let _p = profile("ast::Module::to_def");
+            let parent_declaration = src
+                .as_ref()
+                .map(|it| it.syntax())
+                .cloned()
+                .ancestors_with_macros(sb.db)
+                .skip(1)
+                .find_map(|it| {
+                    let m = ast::Module::cast(it.value.clone())?;
+                    Some(it.with_value(m))
+                });
+
+            let parent_module = match parent_declaration {
+                Some(parent_declaration) => sb.to_id(parent_declaration)?,
+                None => {
+                    let file_id = src.file_id.original_file(sb.db);
+                    sb.to_module_def(file_id)?.id
+                }
+            };
+
+            let child_name = src.value.name()?.as_name();
+            let def_map = sb.db.crate_def_map(parent_module.krate);
+            let child_id = *def_map[parent_module.local_id].children.get(&child_name)?;
+            Some(ModuleId { krate: parent_module.krate, local_id: child_id })
+        }
+    }
+}