fix caller for effects in macro expansions

Author: lzoghbi

src/macro_expand.rs

@@ -91,11 +91,10 @@ pub fn handle_macro_expansion(
             debug!("Failed to resolve macro path.");
             continue;
         }
-        let canonical_path =
-            match file_resolver_expand.resolve_macro_def_path(&macro_call) {
-                Some(cp) => cp,
-                None => continue,
-            };
+        let canonical_path = match file_resolver_expand.resolve_macro_def(&macro_call) {
+            Some(cp) => cp,
+            None => continue,
+        };
         let text_range = macro_call.syntax().text_range();
         let line_index =
             LineIndex::new(resolver.db().file_text(current_file_id).as_ref());

src/resolution/resolve.rs

@@ -4,6 +4,7 @@
 //! with the needed functionality.
 
 use crate::resolution::name_resolution::{Resolver, ResolverImpl};
+use crate::resolution::util::canonical_path;
 
 use super::hacky_resolver::HackyResolver;
 use crate::effect::SrcLoc;
@@ -13,7 +14,7 @@ use anyhow::Result;
 use log::debug;
 use ra_ap_hir::HirFileId;
 use ra_ap_syntax::ast::MacroCall;
-use ra_ap_syntax::SyntaxNode;
+use ra_ap_syntax::{AstNode, SyntaxNode};
 use std::fmt::Display;
 use std::path::Path as FilePath;
 use syn::{self, spanned::Spanned};
@@ -117,14 +118,11 @@ impl<'a> FileResolver<'a> {
         Some((file_id, expanded_syntax))
     }
 
-    pub fn resolve_macro_def_path(
-        &self,
-        macro_call: &MacroCall,
-    ) -> Option<CanonicalPath> {
-        let path = macro_call.path()?;
-        let last_segment = path.segment()?.name_ref()?.text().to_string();
-        let fake_ident = syn::Ident::new(&last_segment, proc_macro2::Span::call_site());
-        Some(self.resolve_def(&fake_ident))
+    pub fn resolve_macro_def(&self, macro_call: &MacroCall) -> Option<CanonicalPath> {
+        let containing_fn =
+            &macro_call.syntax().ancestors().find_map(ra_ap_syntax::ast::Fn::cast)?;
+        let def = self.resolver.sems.to_def(containing_fn)?;
+        canonical_path(&self.resolver.sems, self.resolver.sems.db, &def.into())
     }
 
     fn resolve_core(&self, i: &syn::Ident) -> Result<CanonicalPath> {