language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-31 03:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Early exit in search properly

Browse source
This commit is contained in:
Lukas Wirth 2025-01-15 09:46:48 +01:00
parent d82e1a2472
commit 2a89e4a051
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/hir/src/semantics.rs
View file

@ -1756,7 +1756,7 @@ impl<'db> SemanticsImpl<'db> {
let file_id = self.lookup(&root_node).unwrap_or_else(|| { let file_id = self.lookup(&root_node).unwrap_or_else(|| {
panic!( panic!(
"\n\nFailed to lookup {:?} in this Semantics.\n\ "\n\nFailed to lookup {:?} in this Semantics.\n\
Make sure to use only query nodes, derived from this instance of Semantics.\n\ Make sure to only query nodes derived from this instance of Semantics.\n\
root node: {:?}\n\ root node: {:?}\n\
known nodes: {}\n\n", known nodes: {}\n\n",
node, node,

11
crates/ide-db/src/search.rs
View file

@ -953,14 +953,19 @@ impl<'a> FindUsages<'a> {
// Search for occurrences of the items name // Search for occurrences of the items name
for offset in Self::match_indices(&text, finder, search_range) { for offset in Self::match_indices(&text, finder, search_range) {
tree.token_at_offset(offset).for_each(|token| { let ret = tree.token_at_offset(offset).any(|token| {
let Some(str_token) = ast::String::cast(token.clone()) else { return }; let Some(str_token) = ast::String::cast(token.clone()) else { return false };
if let Some((range, Some(nameres))) = if let Some((range, Some(nameres))) =
sema.check_for_format_args_template(token, offset) sema.check_for_format_args_template(token, offset)
{ {
if self.found_format_args_ref(file_id, range, str_token, nameres, sink) {} return self
.found_format_args_ref(file_id, range, str_token, nameres, sink);
} }
false
}); });
if ret {
return;
}
for name in for name in
Self::find_nodes(sema, name, &tree, offset).filter_map(ast::NameLike::cast) Self::find_nodes(sema, name, &tree, offset).filter_map(ast::NameLike::cast)