mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-08-30 23:27:24 +00:00
Attach the DB when mapping the result of world_symbols()
We call `try_to_nav()` there.
This commit is contained in:
parent
75ce5dc2c9
commit
7a27a27f4b
1 changed files with 9 additions and 6 deletions
|
@ -481,12 +481,15 @@ impl Analysis {
|
|||
// `world_symbols` currently clones the database to run stuff in parallel, which will make any query panic
|
||||
// if we were to attach it here.
|
||||
Cancelled::catch(|| {
|
||||
symbol_index::world_symbols(&self.db, query)
|
||||
.into_iter()
|
||||
.filter_map(|s| s.try_to_nav(&self.db))
|
||||
.take(limit)
|
||||
.map(UpmappingResult::call_site)
|
||||
.collect::<Vec<_>>()
|
||||
let symbols = symbol_index::world_symbols(&self.db, query);
|
||||
salsa::attach(&self.db, || {
|
||||
symbols
|
||||
.into_iter()
|
||||
.filter_map(|s| s.try_to_nav(&self.db))
|
||||
.take(limit)
|
||||
.map(UpmappingResult::call_site)
|
||||
.collect::<Vec<_>>()
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue