From 5208c2aa930ae452e062dcdc2563c1bbb67d2e4a Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sat, 19 Jan 2019 21:23:26 +0100
Subject: Sketching the resolver API

---
 crates/ra_hir/src/nameres.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_hir/src/nameres.rs')

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index f8627acbe..e825ec089 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -30,7 +30,7 @@ use crate::{
     nameres::lower::{ImportId, LoweredModule, ImportData},
 };
 
-/// `ItemMap` is the result of name resolution. It contains, for each
+/// `ItemMap` is the result of module name resolution. It contains, for each
 /// module, the set of visible items.
 #[derive(Default, Debug, PartialEq, Eq)]
 pub struct ItemMap {
-- 
cgit v1.2.3


From 6b076f1931d7dc324d7bbbc4c1df9f7c1c1db8b7 Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sat, 26 Jan 2019 22:52:04 +0100
Subject: Use new Resolver API in type inference

---
 crates/ra_hir/src/nameres.rs | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'crates/ra_hir/src/nameres.rs')

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index e825ec089..193c6a977 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -24,8 +24,9 @@ use rustc_hash::{FxHashMap, FxHashSet};
 
 use crate::{
     Module, ModuleDef,
-    Path, PathKind, Crate,
-    Name, PersistentHirDatabase,
+    Path, PathKind, PersistentHirDatabase,
+    Crate,
+    Name,
     module_tree::{ModuleId, ModuleTree},
     nameres::lower::{ImportId, LoweredModule, ImportData},
 };
@@ -46,7 +47,7 @@ impl std::ops::Index<ModuleId> for ItemMap {
 
 #[derive(Debug, Default, PartialEq, Eq, Clone)]
 pub struct ModuleScope {
-    items: FxHashMap<Name, Resolution>,
+    pub(crate) items: FxHashMap<Name, Resolution>,
 }
 
 impl ModuleScope {
@@ -113,6 +114,10 @@ impl<T> PerNs<T> {
         self.types.is_none() && self.values.is_none()
     }
 
+    pub fn is_both(&self) -> bool {
+        self.types.is_some() && self.values.is_some()
+    }
+
     pub fn take(self, namespace: Namespace) -> Option<T> {
         match namespace {
             Namespace::Types => self.types,
@@ -139,6 +144,13 @@ impl<T> PerNs<T> {
         }
     }
 
+    pub fn combine(self, other: PerNs<T>) -> PerNs<T> {
+        PerNs {
+            types: self.types.or(other.types),
+            values: self.values.or(other.values),
+        }
+    }
+
     pub fn and_then<U>(self, f: impl Fn(T) -> Option<U>) -> PerNs<U> {
         PerNs {
             types: self.types.and_then(&f),
@@ -402,10 +414,11 @@ impl ItemMap {
                     if module.krate != original_module.krate {
                         let path = Path {
                             segments: path.segments[i..].iter().cloned().collect(),
-                            kind: PathKind::Crate,
+                            kind: PathKind::Self_,
                         };
                         log::debug!("resolving {:?} in other crate", path);
-                        let def = module.resolve_path(db, &path);
+                        let item_map = db.item_map(module.krate);
+                        let def = item_map.resolve_path(db, *module, &path);
                         return (def, ReachedFixedPoint::Yes);
                     }
 
-- 
cgit v1.2.3


From 33ff7b56ff353410e7bcb7aed27004d4f0a57d8e Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 27 Jan 2019 20:50:57 +0100
Subject: Use the new Resolver API in completion

---
 crates/ra_hir/src/nameres.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'crates/ra_hir/src/nameres.rs')

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 193c6a977..9b020db81 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -81,6 +81,15 @@ pub struct PerNs<T> {
     pub values: Option<T>,
 }
 
+impl<T> Default for PerNs<T> {
+    fn default() -> Self {
+        PerNs {
+            types: None,
+            values: None,
+        }
+    }
+}
+
 impl<T> PerNs<T> {
     pub fn none() -> PerNs<T> {
         PerNs {
-- 
cgit v1.2.3


From d3df80dfe41e4e3ab7644ae576119a264ba0e7f1 Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 27 Jan 2019 17:23:49 +0100
Subject: Cleanup

---
 crates/ra_hir/src/nameres.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'crates/ra_hir/src/nameres.rs')

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 9b020db81..7ec6512b6 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -25,8 +25,7 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use crate::{
     Module, ModuleDef,
     Path, PathKind, PersistentHirDatabase,
-    Crate,
-    Name,
+    Crate, Name,
     module_tree::{ModuleId, ModuleTree},
     nameres::lower::{ImportId, LoweredModule, ImportData},
 };
-- 
cgit v1.2.3