From ad537be194018f6b3f6ef91af575a4fde47561a6 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Mon, 23 May 2022 16:09:56 +0200
Subject: [PATCH 1/2] fix: When reference searching macro inputs, don't search
everything that was downmapped
---
crates/hir/src/semantics.rs | 14 +++++++-------
crates/ide/src/references.rs | 2 +-
crates/syntax/src/ast/node_ext.rs | 7 +++++++
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
index 48661ec4ebe..282e9c0a4bd 100644
--- a/crates/hir/src/semantics.rs
+++ b/crates/hir/src/semantics.rs
@@ -208,14 +208,14 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
self.imp.descend_into_macros(token)
}
- /// Descend the token into macrocalls to all its mapped counterparts.
+ /// Descend the token into macrocalls to all its mapped counterparts that have the same text as the input token.
///
- /// Returns the original non descended token if none of the mapped counterparts have the same syntax kind.
- pub fn descend_into_macros_with_same_kind(
+ /// Returns the original non descended token if none of the mapped counterparts have the same text.
+ pub fn descend_into_macros_with_same_text(
&self,
token: SyntaxToken,
) -> SmallVec<[SyntaxToken; 1]> {
- self.imp.descend_into_macros_with_same_kind(token)
+ self.imp.descend_into_macros_with_same_text(token)
}
/// Maps a node down by mapping its first and last token down.
@@ -666,11 +666,11 @@ impl<'db> SemanticsImpl<'db> {
res
}
- fn descend_into_macros_with_same_kind(&self, token: SyntaxToken) -> SmallVec<[SyntaxToken; 1]> {
- let kind = token.kind();
+ fn descend_into_macros_with_same_text(&self, token: SyntaxToken) -> SmallVec<[SyntaxToken; 1]> {
+ let text = token.text();
let mut res = smallvec![];
self.descend_into_macros_impl(token.clone(), &mut |InFile { value, .. }| {
- if value.kind() == kind {
+ if value.text() == text {
res.push(value);
}
false
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index 0cd29c8432d..626e8fe34a9 100644
--- a/crates/ide/src/references.rs
+++ b/crates/ide/src/references.rs
@@ -122,7 +122,7 @@ pub(crate) fn find_defs<'a>(
)
});
token.map(|token| {
- sema.descend_into_macros_with_same_kind(token)
+ sema.descend_into_macros_with_same_text(token)
.into_iter()
.filter_map(|it| ast::NameLike::cast(it.parent()?))
.filter_map(move |name_like| {
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index f2153ca9211..b7bf45c04c9 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -432,6 +432,13 @@ impl NameLike {
_ => None,
}
}
+ pub fn text(&self) -> TokenText {
+ match self {
+ NameLike::NameRef(name_ref) => name_ref.text(),
+ NameLike::Name(name) => name.text(),
+ NameLike::Lifetime(lifetime) => lifetime.text(),
+ }
+ }
}
impl ast::AstNode for NameLike {
From 377c9247e6c8c5392acc5b6e935aee89457bd6f4 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Mon, 23 May 2022 16:11:36 +0200
Subject: [PATCH 2/2] fix: When hovering macro inputs, don't show everything
that was downmapped
---
crates/ide/src/hover.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index ae9be8adbd2..d2d367c8c55 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -115,7 +115,7 @@ pub(crate) fn hover(
});
}
- let descended = sema.descend_into_macros(original_token.clone());
+ let descended = sema.descend_into_macros_with_same_text(original_token.clone());
// FIXME: Definition should include known lints and the like instead of having this special case here
let hovered_lint = descended.iter().find_map(|token| {