1 files changed, 4 insertions, 5 deletions

diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 410064d45..876ebe0e3 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -267,9 +267,8 @@ impl SourceAnalyzer {
         db: &impl HirDatabase,
         macro_call: &ast::MacroCall,
     ) -> Option<MacroDef> {
-        let id =
-            self.resolver.resolve_macro_call(db, macro_call.path().and_then(Path::from_ast))?;
-        Some(MacroDef { id })
+        let path = macro_call.path().and_then(Path::from_ast)?;
+        self.resolver.resolve_path_as_macro(db, &path)
     }
 
     pub fn resolve_hir_path(
@@ -277,7 +276,7 @@ impl SourceAnalyzer {
         db: &impl HirDatabase,
         path: &crate::Path,
     ) -> PerNs<crate::Resolution> {
-        self.resolver.resolve_path(db, path)
+        self.resolver.resolve_path_without_assoc_items(db, path)
     }
 
     pub fn resolve_path(&self, db: &impl HirDatabase, path: &ast::Path) -> Option<PathResolution> {
@@ -294,7 +293,7 @@ impl SourceAnalyzer {
             }
         }
         let hir_path = crate::Path::from_ast(path)?;
-        let res = self.resolver.resolve_path(db, &hir_path);
+        let res = self.resolver.resolve_path_without_assoc_items(db, &hir_path);
         let res = res.clone().take_types().or_else(|| res.take_values())?;
         let res = match res {
             crate::Resolution::Def(it) => PathResolution::Def(it),