user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #9196

Browse source 
9196: fix: Don't classify attributes on macro-calls are the macro itself r=Veykril a=Veykril

Fixes #9184
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-06-09 22:27:07 +00:00 • committed by GitHub
commit 660a89620f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ide/src/references.rs
View file

@ -1380,4 +1380,24 @@ lib::foo!();
"#]],
);
}
#[test]
fn macro_doesnt_reference_attribute_on_call() {
check(
r#"
macro_rules! m {
() => {};
}
#[proc_macro_test::attr_noop]
m$0!();
"#,
expect![[r#"
m Macro FileId(0) 0..32 13..14
FileId(0) 64..65
"#]],
);
}
}

8
crates/ide_db/src/defs.rs
View file

@ -357,9 +357,9 @@ impl NameRefClass {
}
}
if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) {
if let Some(path) = macro_call.path() {
if path.qualifier().is_none() {
if let Some(path) = name_ref.syntax().ancestors().find_map(ast::Path::cast) {
if path.qualifier().is_none() {
if let Some(macro_call) = path.syntax().parent().and_then(ast::MacroCall::cast) {
// Only use this to resolve single-segment macro calls like `foo!()`. Multi-segment
// paths are handled below (allowing `log$0::info!` to resolve to the log crate).
if let Some(macro_def) = sema.resolve_macro_call(&macro_call) {
@ -367,9 +367,7 @@ impl NameRefClass {
}
}
}
}
if let Some(path) = name_ref.syntax().ancestors().find_map(ast::Path::cast) {
if let Some(resolved) = sema.resolve_path(&path) {
if path.syntax().parent().and_then(ast::Attr::cast).is_some() {
if let PathResolution::Def(ModuleDef::Function(func)) = resolved {