aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/resolve.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
-rw-r--r--crates/ra_hir/src/resolve.rs10
1 files changed, 7 insertions, 3 deletions
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 {
130 resolution 130 resolution
131 } 131 }
132 132
133 pub(crate) fn resolve_macro_call(&self, path: Option<Path>) -> Option<MacroDefId> { 133 pub(crate) fn resolve_macro_call(
134 let name = path.and_then(|path| path.expand_macro_expr()).unwrap_or_else(Name::missing); 134 &self,
135 self.module()?.0.find_macro(&name) 135 db: &impl HirDatabase,
136 path: Option<Path>,
137 ) -> Option<MacroDefId> {
138 let m = self.module()?;
139 m.0.find_macro(db, m.1, &path?)
136 } 140 }
137 141
138 /// Returns the resolved path segments 142 /// Returns the resolved path segments