4 files changed, 31 insertions, 8 deletions

diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
index 9618236e5..51913d37b 100644
--- a/crates/ra_hir/src/expr.rs
+++ b/crates/ra_hir/src/expr.rs
@@ -828,7 +828,7 @@ where
                     .ast_id(e)
                     .with_file_id(self.current_file_id);
 
-                if let Some(def) = self.resolver.resolve_macro_call(path) {
+                if let Some(def) = self.resolver.resolve_macro_call(self.db, path) {
                     let call_id = MacroCallLoc { def, ast_id }.id(self.db);
                     let file_id = call_id.as_file(MacroFileKind::Expr);
                     if let Some(node) = self.db.parse_or_expand(file_id) {
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index aa26345b2..6b1160aa7 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -320,8 +320,22 @@ impl CrateDefMap {
         (res.resolved_def, res.segment_index)
     }
 
-    pub(crate) fn find_macro(&self, name: &Name) -> Option<MacroDefId> {
-        self.public_macros.get(name).or(self.local_macros.get(name)).map(|it| *it)
+    pub(crate) fn find_macro(
+        &self,
+        db: &impl DefDatabase,
+        original_module: CrateModuleId,
+        path: &Path,
+    ) -> Option<MacroDefId> {
+        let name = path.expand_macro_expr()?;
+        // search local first
+        // FIXME: Remove public_macros check when we have a correct local_macors implementation
+        let local = self.public_macros.get(&name).or(self.local_macros.get(&name)).map(|it| *it);
+        if local.is_some() {
+            return local;
+        }
+
+        let res = self.resolve_path_fp_with_macro(db, ResolveMode::Other, original_module, path);
+        res.resolved_def.right().map(|m| m.id)
     }
 
     // Returns Yes if we are sure that additions to `ItemMap` wouldn't change
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index fedfe2fee..0f6ee7f47 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -130,9 +130,13 @@ impl Resolver {
         resolution
     }
 
-    pub(crate) fn resolve_macro_call(&self, path: Option<Path>) -> Option<MacroDefId> {
-        let name = path.and_then(|path| path.expand_macro_expr()).unwrap_or_else(Name::missing);
-        self.module()?.0.find_macro(&name)
+    pub(crate) fn resolve_macro_call(
+        &self,
+        db: &impl HirDatabase,
+        path: Option<Path>,
+    ) -> Option<MacroDefId> {
+        let m = self.module()?;
+        m.0.find_macro(db, m.1, &path?)
     }
 
     /// Returns the resolved path segments
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 860e10069..75ed2de6c 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -283,8 +283,13 @@ impl SourceAnalyzer {
         self.infer.as_ref()?.field_resolution(expr_id)
     }
 
-    pub fn resolve_macro_call(&self, macro_call: &ast::MacroCall) -> Option<MacroByExampleDef> {
-        let id = self.resolver.resolve_macro_call(macro_call.path().and_then(Path::from_ast))?;
+    pub fn resolve_macro_call(
+        &self,
+        db: &impl HirDatabase,
+        macro_call: &ast::MacroCall,
+    ) -> Option<MacroByExampleDef> {
+        let id =
+            self.resolver.resolve_macro_call(db, macro_call.path().and_then(Path::from_ast))?;
         Some(MacroByExampleDef { id })
     }