language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-31 15:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Attach the DB when mapping the result of world_symbols()

Browse source 
We call `try_to_nav()` there.
This commit is contained in:
Chayim Refael Friedman 2025-08-21 08:06:43 +03:00
parent 75ce5dc2c9
commit 7a27a27f4b
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ide/src/lib.rs
View file

@ -481,12 +481,15 @@ impl Analysis {
// `world_symbols` currently clones the database to run stuff in parallel, which will make any query panic // `world_symbols` currently clones the database to run stuff in parallel, which will make any query panic
// if we were to attach it here. // if we were to attach it here.
Cancelled::catch(|| { Cancelled::catch(|| {
symbol_index::world_symbols(&self.db, query) let symbols = symbol_index::world_symbols(&self.db, query);
.into_iter() salsa::attach(&self.db, || {
.filter_map(|s| s.try_to_nav(&self.db)) symbols
.take(limit) .into_iter()
.map(UpmappingResult::call_site) .filter_map(|s| s.try_to_nav(&self.db))
.collect::<Vec<_>>() .take(limit)
.map(UpmappingResult::call_site)
.collect::<Vec<_>>()
})
}) })
} }