2 files changed, 40 insertions, 10 deletions

diff --git a/crates/ra_analysis/src/descriptors/mod.rs b/crates/ra_analysis/src/descriptors/mod.rs
index 98094d9ee..7a1bcf447 100644
--- a/crates/ra_analysis/src/descriptors/mod.rs
+++ b/crates/ra_analysis/src/descriptors/mod.rs
@@ -13,9 +13,12 @@ use crate::{
     FileId,
     db::SyntaxDatabase,
     descriptors::function::{resolve_local_name, FnId, FnScopes},
-    descriptors::module::{ModuleId, ModuleTree, ModuleSource, nameres::{ItemMap, InputModuleItems, FileItems}},
+    descriptors::module::{
+        ModuleId, ModuleTree, ModuleSource, ModuleDescriptor,
+        nameres::{ItemMap, InputModuleItems, FileItems}
+    },
     input::SourceRootId,
-    loc2id::IdDatabase,
+    loc2id::{IdDatabase, DefId, DefLoc},
     syntax_ptr::LocalSyntaxPtr,
     Cancelable,
 };
@@ -67,6 +70,25 @@ salsa::query_group! {
     }
 }
 
+pub(crate) enum Def {
+    Module(ModuleDescriptor),
+    Item,
+}
+
+impl DefId {
+    pub(crate) fn resolve(self, db: &impl DescriptorDatabase) -> Cancelable<Def> {
+        let loc = db.id_maps().def_loc(self);
+        let res = match loc {
+            DefLoc::Module { id, source_root } => {
+                let descr = ModuleDescriptor::new(db, source_root, id)?;
+                Def::Module(descr)
+            }
+            DefLoc::Item { .. } => Def::Item,
+        };
+        Ok(res)
+    }
+}
+
 #[derive(Debug)]
 pub struct ReferenceDescriptor {
     pub range: TextRange,
diff --git a/crates/ra_analysis/src/descriptors/module/mod.rs b/crates/ra_analysis/src/descriptors/module/mod.rs
index 764e19ce0..78911d5d9 100644
--- a/crates/ra_analysis/src/descriptors/module/mod.rs
+++ b/crates/ra_analysis/src/descriptors/module/mod.rs
@@ -77,7 +77,7 @@ impl ModuleDescriptor {
         Ok(res)
     }
 
-    fn new(
+    pub(super) fn new(
         db: &impl DescriptorDatabase,
         source_root_id: SourceRootId,
         module_id: ModuleId,
@@ -132,6 +132,14 @@ impl ModuleDescriptor {
         Some(link.name(&self.tree))
     }
 
+    pub fn def_id(&self, db: &impl DescriptorDatabase) -> DefId {
+        let def_loc = DefLoc::Module {
+            id: self.module_id,
+            source_root: self.source_root_id,
+        };
+        db.id_maps().def_id(def_loc)
+    }
+
     /// Finds a child module with the specified name.
     pub fn child(&self, name: &str) -> Option<ModuleDescriptor> {
         let child_id = self.module_id.child(&self.tree, name)?;
@@ -152,23 +160,23 @@ impl ModuleDescriptor {
         &self,
         db: &impl DescriptorDatabase,
         path: Path,
-    ) -> Cancelable<Option<ModuleDescriptor>> {
+    ) -> Cancelable<Option<DefId>> {
         let mut curr = match path.kind {
             PathKind::Crate => self.crate_root(),
             PathKind::Self_ | PathKind::Plain => self.clone(),
             PathKind::Super => ctry!(self.parent()),
-        };
+        }
+        .def_id(db);
 
         let segments = path.segments;
-        for name in segments {
-            let scope = curr.scope(db)?;
-            let def_id = ctry!(ctry!(scope.get(&name)).def_id);
-            curr = match db.id_maps().def_loc(def_id) {
+        for name in segments.iter() {
+            let module = match db.id_maps().def_loc(curr) {
                 DefLoc::Module { id, source_root } => ModuleDescriptor::new(db, source_root, id)?,
                 _ => return Ok(None),
             };
+            let scope = module.scope(db)?;
+            curr = ctry!(ctry!(scope.get(&name)).def_id);
         }
-
         Ok(Some(curr))
     }