about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-11-11 12:48:48 +0000
committerbors <bors@rust-lang.org>2022-11-11 12:48:48 +0000
commitadd85397ae3ddb7653ab1b66428985ee7ee2ca3f (patch)
tree81a0905cd9bdaa86b98dd67e4527c64f09a2aaf7
parent57cc2a6e27cf2a961623cdde0ee06ca685e34e13 (diff)
parente50712cf2c115a1c287080b351f584edce49485b (diff)
downloadrust-add85397ae3ddb7653ab1b66428985ee7ee2ca3f.tar.gz
rust-add85397ae3ddb7653ab1b66428985ee7ee2ca3f.zip
Auto merge of #13604 - Veykril:hover-attr, r=Veykril
fix: Fix hover in attributed items not preferring similar kinded tokens
-rw-r--r--crates/ide/src/hover.rs9
1 files changed, 8 insertions, 1 deletions
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 3687b597fc6..838fb18c3d5 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -119,7 +119,14 @@ pub(crate) fn hover(
         });
     }
 
-    let in_attr = matches!(original_token.parent().and_then(ast::TokenTree::cast), Some(tt) if tt.syntax().ancestors().any(|it| ast::Meta::can_cast(it.kind())));
+    let in_attr = original_token
+        .parent_ancestors()
+        .filter_map(ast::Item::cast)
+        .any(|item| sema.is_attr_macro_call(&item))
+        && !matches!(
+            original_token.parent().and_then(ast::TokenTree::cast),
+            Some(tt) if tt.syntax().ancestors().any(|it| ast::Meta::can_cast(it.kind()))
+        );
     // prefer descending the same token kind in attribute expansions, in normal macros text
     // equivalency is more important
     let descended = if in_attr {