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

fix: Do not force descend into derives for goto IDE features

Browse source 
Doing so can cause us to duplicate navigation targets for the same ranges which breaks convenience features of some editors where go to def can trigger find all references
This commit is contained in:
Lukas Wirth 2025-06-12 09:36:22 +02:00
parent fa7a6c1a46
commit 2972e77d38
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tools/rust-analyzer/crates/hir/src/semantics.rs
View file

@ -244,7 +244,7 @@ impl<DB: HirDatabase + ?Sized> Semantics<'_, DB> {
offset: TextSize,
) -> impl Iterator<Item = ast::NameLike> + 'slf {
node.token_at_offset(offset)
.map(move |token| self.descend_into_macros_no_opaque(token))
.map(move |token| self.descend_into_macros_no_opaque(token, true))
.map(|descendants| descendants.into_iter().filter_map(move |it| it.value.parent()))
// re-order the tokens from token_at_offset by returning the ancestors with the smaller first nodes first
// See algo::ancestors_at_offset, which uses the same approach
@ -1009,10 +1009,11 @@ impl<'db> SemanticsImpl<'db> {
pub fn descend_into_macros_no_opaque(
&self,
token: SyntaxToken,
always_descend_into_derives: bool,
) -> SmallVec<[InFile<SyntaxToken>; 1]> {
let mut res = smallvec![];
let token = self.wrap_token_infile(token);
self.descend_into_macros_all(token.clone(), true, &mut |t, ctx| {
self.descend_into_macros_all(token.clone(), always_descend_into_derives, &mut |t, ctx| {
if !ctx.is_opaque(self.db) {
// Don't descend into opaque contexts
res.push(t);

2
src/tools/rust-analyzer/crates/ide/src/goto_declaration.rs
View file

@ -29,7 +29,7 @@ pub(crate) fn goto_declaration(
.find(|it| matches!(it.kind(), IDENT | T![self] | T![super] | T![crate] | T![Self]))?;
let range = original_token.text_range();
let info: Vec<NavigationTarget> = sema
.descend_into_macros_no_opaque(original_token)
.descend_into_macros_no_opaque(original_token, false)
.iter()
.filter_map(|token| {
let parent = token.value.parent()?;

2
src/tools/rust-analyzer/crates/ide/src/goto_definition.rs
View file

@ -88,7 +88,7 @@ pub(crate) fn goto_definition(
}
let navs = sema
.descend_into_macros_no_opaque(original_token.clone())
.descend_into_macros_no_opaque(original_token.clone(), false)
.into_iter()
.filter_map(|token| {
let parent = token.value.parent()?;

2
src/tools/rust-analyzer/crates/ide/src/goto_type_definition.rs
View file

@ -70,7 +70,7 @@ pub(crate) fn goto_type_definition(
}
let range = token.text_range();
sema.descend_into_macros_no_opaque(token)
sema.descend_into_macros_no_opaque(token,false)
.into_iter()
.filter_map(|token| {
sema