2 files changed, 32 insertions, 1 deletions

diff --git a/crates/ra_analysis/src/descriptors/module/nameres.rs b/crates/ra_analysis/src/descriptors/module/nameres.rs
index b65b6adb7..8002656d6 100644
--- a/crates/ra_analysis/src/descriptors/module/nameres.rs
+++ b/crates/ra_analysis/src/descriptors/module/nameres.rs
@@ -7,6 +7,7 @@ use ra_syntax::{
 };
 
 use crate::{
+    loc2id::DefId,
     descriptors::module::ModuleId,
     syntax_ptr::LocalSyntaxPtr,
 };
@@ -45,7 +46,8 @@ struct ItemMap {
 
 #[derive(Debug)]
 struct ModuleItems {
-    items: FxHashMap<SmolStr, PerNs<ModuleItem>>,
+    items: FxHashMap<SmolStr, PerNs<DefId>>,
+    import_resolutions: FxHashMap<LocalSyntaxPtr, DefId>,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -197,3 +199,14 @@ impl ModuleItem {
         Some(res)
     }
 }
+
+struct Resolver {
+    input: FxHashMap<ModuleId, InputModuleItems>,
+    result: ModuleItems,
+}
+
+impl Resolver {
+    fn resolve(&mut self){
+
+    }
+}
diff --git a/crates/ra_analysis/src/loc2id.rs b/crates/ra_analysis/src/loc2id.rs
index 8c297156a..87417df94 100644
--- a/crates/ra_analysis/src/loc2id.rs
+++ b/crates/ra_analysis/src/loc2id.rs
@@ -8,7 +8,9 @@ use std::{
 use rustc_hash::FxHashMap;
 
 use crate::{
+    descriptors::module::ModuleId,
     syntax_ptr::SyntaxPtr,
+    input::SourceRootId,
 };
 
 /// There are two principle ways to refer to things:
@@ -89,6 +91,21 @@ macro_rules! impl_numeric_id {
 pub(crate) struct FnId(u32);
 impl_numeric_id!(FnId);
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub(crate) struct DefId(u32);
+impl_numeric_id!(DefId);
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+enum DefLoc {
+    Module {
+        id: ModuleId,
+        source_root: SourceRootId,
+    },
+    Item {
+        ptr: SyntaxPtr,
+    }
+}
+
 pub(crate) trait IdDatabase: salsa::Database {
     fn id_maps(&self) -> &IdMaps;
 }
@@ -110,4 +127,5 @@ impl IdMaps {
 #[derive(Debug, Default)]
 struct IdMapsInner {
     fns: Mutex<Loc2IdMap<SyntaxPtr, FnId>>,
+    defs: Mutex<Loc2IdMap<DefLoc, DefId>>,
 }