diff options
author | Jonas Schievink <[email protected]> | 2020-07-14 16:23:33 +0100 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2020-07-14 16:23:33 +0100 |
commit | 2163ceb7ef0fc3c5268c9ca5f48bb50ae311947f (patch) | |
tree | 9514018f43d9c6220241b6afa78c6e5d6febb612 /crates/ra_ide_db | |
parent | 139214d8ca9b42a3966b45decd820d11cc056714 (diff) |
Fix classify_name_ref on multi-path macro calls
Diffstat (limited to 'crates/ra_ide_db')
-rw-r--r-- | crates/ra_ide_db/src/defs.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs index 3ef5e74b6..bcaabca92 100644 --- a/crates/ra_ide_db/src/defs.rs +++ b/crates/ra_ide_db/src/defs.rs | |||
@@ -255,8 +255,14 @@ pub fn classify_name_ref( | |||
255 | } | 255 | } |
256 | 256 | ||
257 | if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) { | 257 | if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) { |
258 | if let Some(macro_def) = sema.resolve_macro_call(¯o_call) { | 258 | if let Some(path) = macro_call.path() { |
259 | return Some(NameRefClass::Definition(Definition::Macro(macro_def))); | 259 | if path.qualifier().is_none() { |
260 | // Only use this to resolve single-segment macro calls like `foo!()`. Multi-segment | ||
261 | // paths are handled below (allowing `log<|>::info!` to resolve to the log crate). | ||
262 | if let Some(macro_def) = sema.resolve_macro_call(¯o_call) { | ||
263 | return Some(NameRefClass::Definition(Definition::Macro(macro_def))); | ||
264 | } | ||
265 | } | ||
260 | } | 266 | } |
261 | } | 267 | } |
262 | 268 | ||