itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-25 11:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix search of raw labels and lifetimes

Browse Source 
It used to search for `'foo` which won't find `'r#foo`, now we search for `foo` instead.
This commit is contained in:
Chayim Refael Friedman 2025-07-20 01:20:09 +03:00
parent ed193af369
commit 7723b21c3f
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/ide-db/src/search.rs
View File

@ -531,7 +531,7 @@ impl<'a> FindUsages<'a> {
node.token_at_offset(offset)
.find(|it| {
// `name` is stripped of raw ident prefix. See the comment on name retrieval below.
it.text().trim_start_matches("r#") == name
it.text().trim_start_matches('\'').trim_start_matches("r#") == name
})
.into_iter()
.flat_map(move |token| {
@ -938,7 +938,12 @@ impl<'a> FindUsages<'a> {
})
};
// We need to search without the `r#`, hence `as_str` access.
self.def.name(sema.db).or_else(self_kw_refs).map(|it| it.as_str().to_smolstr())
// We strip `'` from lifetimes and labels as otherwise they may not match with raw-escaped ones,
// e.g. if we search `'foo` we won't find `'r#foo`.
self.def
.name(sema.db)
.or_else(self_kw_refs)
.map(|it| it.as_str().trim_start_matches('\'').to_smolstr())
}
};
let name = match &name {

38
crates/ide/src/references.rs
View File

@ -3088,4 +3088,42 @@ fn main() {
"#]],
);
}
#[test]
fn raw_labels_and_lifetimes() {
check(
r#"
fn foo<'r#fn>(s: &'r#fn str) {
let _a: &'r#fn str = s;
let _b: &'r#fn str;
'r#break$0: {
break 'r#break;
}
}
"#,
expect![[r#"
'r#break Label FileId(0) 87..96 87..95
FileId(0) 113..121
"#]],
);
check(
r#"
fn foo<'r#fn$0>(s: &'r#fn str) {
let _a: &'r#fn str = s;
let _b: &'r#fn str;
'r#break: {
break 'r#break;
}
}
"#,
expect![[r#"
'r#fn LifetimeParam FileId(0) 7..12
FileId(0) 18..23
FileId(0) 44..49
FileId(0) 72..77
"#]],
);
}
}