language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-03 05:13:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Attach the DB in symbol queries

Browse source
This commit is contained in:
Chayim Refael Friedman 2025-08-21 07:14:55 +03:00
parent f9e402dfcb
commit 243d158e88
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/ide-db/src/symbol_index.rs
View file

@ -133,23 +133,27 @@ pub trait SymbolsDatabase: HirDatabase + SourceDatabase {
fn library_symbols(db: &dyn SymbolsDatabase, source_root_id: SourceRootId) -> Arc<SymbolIndex> { fn library_symbols(db: &dyn SymbolsDatabase, source_root_id: SourceRootId) -> Arc<SymbolIndex> {
let _p = tracing::info_span!("library_symbols").entered(); let _p = tracing::info_span!("library_symbols").entered();
let mut symbol_collector = SymbolCollector::new(db); // We call this without attaching because this runs in parallel, so we need to attach here.
salsa::attach(db, || {
let mut symbol_collector = SymbolCollector::new(db);
db.source_root_crates(source_root_id) db.source_root_crates(source_root_id)
.iter() .iter()
.flat_map(|&krate| Crate::from(krate).modules(db)) .flat_map(|&krate| Crate::from(krate).modules(db))
// we specifically avoid calling other SymbolsDatabase queries here, even though they do the same thing, // we specifically avoid calling other SymbolsDatabase queries here, even though they do the same thing,
// as the index for a library is not going to really ever change, and we do not want to store each // as the index for a library is not going to really ever change, and we do not want to store each
// the module or crate indices for those in salsa unless we need to. // the module or crate indices for those in salsa unless we need to.
.for_each(|module| symbol_collector.collect(module)); .for_each(|module| symbol_collector.collect(module));
Arc::new(SymbolIndex::new(symbol_collector.finish())) Arc::new(SymbolIndex::new(symbol_collector.finish()))
})
} }
fn module_symbols(db: &dyn SymbolsDatabase, module: Module) -> Arc<SymbolIndex> { fn module_symbols(db: &dyn SymbolsDatabase, module: Module) -> Arc<SymbolIndex> {
let _p = tracing::info_span!("module_symbols").entered(); let _p = tracing::info_span!("module_symbols").entered();
Arc::new(SymbolIndex::new(SymbolCollector::new_module(db, module))) // We call this without attaching because this runs in parallel, so we need to attach here.
salsa::attach(db, || Arc::new(SymbolIndex::new(SymbolCollector::new_module(db, module))))
} }
pub fn crate_symbols(db: &dyn SymbolsDatabase, krate: Crate) -> Box<[Arc<SymbolIndex>]> { pub fn crate_symbols(db: &dyn SymbolsDatabase, krate: Crate) -> Box<[Arc<SymbolIndex>]> {