Merge #2147

2147: Fixes #2143 r=matklad a=kjeremy



Co-authored-by: kjeremy <kjeremy@gmail.com>

crates/ra_hir/src/source_binder.rs

@@ -255,7 +255,9 @@ impl SourceAnalyzer {
 
         let items =
             self.resolver.resolve_module_path(db, &path).take_types().map(PathResolution::Def);
-        types.or(values).or(items)
+        types.or(values).or(items).or_else(|| {
+            self.resolver.resolve_path_as_macro(db, &path).map(|def| PathResolution::Macro(def))
+        })
     }
 
     pub fn resolve_path(&self, db: &impl HirDatabase, path: &ast::Path) -> Option<PathResolution> {

crates/ra_ide_api/src/goto_definition.rs

@@ -315,6 +315,25 @@ mod tests {
         );
     }
 
+    #[test]
+    fn goto_definition_works_for_macros_in_use_tree() {
+        check_goto(
+            "
+            //- /lib.rs
+            use foo::foo<|>;
+
+            //- /foo/lib.rs
+            #[macro_export]
+            macro_rules! foo {
+                () => {
+                    {}
+                };
+            }
+            ",
+            "foo MACRO_CALL FileId(2) [0; 66) [29; 32)",
+        );
+    }
+
     #[test]
     fn goto_definition_works_for_methods() {
         covers!(goto_definition_works_for_methods);