1 files changed, 34 insertions, 25 deletions

diff --git a/crates/ra_hir/src/nameres/per_ns.rs b/crates/ra_hir/src/nameres/per_ns.rs
index c40a3ff9d..d07cc08f4 100644
--- a/crates/ra_hir/src/nameres/per_ns.rs
+++ b/crates/ra_hir/src/nameres/per_ns.rs
@@ -1,78 +1,87 @@
+use crate::MacroDef;
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum Namespace {
     Types,
     Values,
+    // Note that only type inference uses this enum, and it doesn't care about macros.
+    // Macro,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub struct PerNs<T> {
     pub types: Option<T>,
     pub values: Option<T>,
+    /// Since macros has different type, many methods simply ignore it.
+    /// We can only use special method like `get_macros` to access it.
+    pub macros: Option<MacroDef>,
 }
 
 impl<T> Default for PerNs<T> {
     fn default() -> Self {
-        PerNs { types: None, values: None }
+        PerNs { types: None, values: None, macros: None }
     }
 }
 
 impl<T> PerNs<T> {
     pub fn none() -> PerNs<T> {
-        PerNs { types: None, values: None }
+        PerNs { types: None, values: None, macros: None }
     }
 
     pub fn values(t: T) -> PerNs<T> {
-        PerNs { types: None, values: Some(t) }
+        PerNs { types: None, values: Some(t), macros: None }
     }
 
     pub fn types(t: T) -> PerNs<T> {
-        PerNs { types: Some(t), values: None }
+        PerNs { types: Some(t), values: None, macros: None }
     }
 
     pub fn both(types: T, values: T) -> PerNs<T> {
-        PerNs { types: Some(types), values: Some(values) }
+        PerNs { types: Some(types), values: Some(values), macros: None }
     }
 
-    pub fn is_none(&self) -> bool {
-        self.types.is_none() && self.values.is_none()
+    pub fn macros(macro_: MacroDef) -> PerNs<T> {
+        PerNs { types: None, values: None, macros: Some(macro_) }
     }
 
-    pub fn is_both(&self) -> bool {
-        self.types.is_some() && self.values.is_some()
+    pub fn is_none(&self) -> bool {
+        self.types.is_none() && self.values.is_none() && self.macros.is_none()
     }
 
-    pub fn take(self, namespace: Namespace) -> Option<T> {
-        match namespace {
-            Namespace::Types => self.types,
-            Namespace::Values => self.values,
-        }
+    pub fn is_all(&self) -> bool {
+        self.types.is_some() && self.values.is_some() && self.macros.is_some()
     }
 
     pub fn take_types(self) -> Option<T> {
-        self.take(Namespace::Types)
+        self.types
     }
 
     pub fn take_values(self) -> Option<T> {
-        self.take(Namespace::Values)
+        self.values
     }
 
-    pub fn get(&self, namespace: Namespace) -> Option<&T> {
-        self.as_ref().take(namespace)
+    pub fn get_macros(&self) -> Option<MacroDef> {
+        self.macros
     }
 
-    pub fn as_ref(&self) -> PerNs<&T> {
-        PerNs { types: self.types.as_ref(), values: self.values.as_ref() }
+    pub fn only_macros(&self) -> PerNs<T> {
+        PerNs { types: None, values: None, macros: self.macros }
     }
 
-    pub fn or(self, other: PerNs<T>) -> PerNs<T> {
-        PerNs { types: self.types.or(other.types), values: self.values.or(other.values) }
+    pub fn as_ref(&self) -> PerNs<&T> {
+        PerNs { types: self.types.as_ref(), values: self.values.as_ref(), macros: self.macros }
     }
 
-    pub fn and_then<U>(self, f: impl Fn(T) -> Option<U>) -> PerNs<U> {
-        PerNs { types: self.types.and_then(&f), values: self.values.and_then(&f) }
+    pub fn or(self, other: PerNs<T>) -> PerNs<T> {
+        PerNs {
+            types: self.types.or(other.types),
+            values: self.values.or(other.values),
+            macros: self.macros.or(other.macros),
+        }
     }
 
+    /// Map types and values. Leave macros unchanged.
     pub fn map<U>(self, f: impl Fn(T) -> U) -> PerNs<U> {
-        PerNs { types: self.types.map(&f), values: self.values.map(&f) }
+        PerNs { types: self.types.map(&f), values: self.values.map(&f), macros: self.macros }
     }
 }