itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add fn load_workspace_into_db variant for ra_ap_load_cargo's fn load_workspace

Browse Source
This commit is contained in:
Vincent Esche 2025-07-02 10:32:46 +02:00
parent 87940a999f
commit a0e857f7bc
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crates/load-cargo/src/lib.rs
View File

@ -69,6 +69,23 @@ pub fn load_workspace(
extra_env: &FxHashMap<String, Option<String>>, extra_env: &FxHashMap<String, Option<String>>,
load_config: &LoadCargoConfig, load_config: &LoadCargoConfig,
) -> anyhow::Result<(RootDatabase, vfs::Vfs, Option<ProcMacroClient>)> { ) -> anyhow::Result<(RootDatabase, vfs::Vfs, Option<ProcMacroClient>)> {
let lru_cap = std::env::var("RA_LRU_CAP").ok().and_then(|it| it.parse::<u16>().ok());
let mut db = RootDatabase::new(lru_cap);
let (vfs, proc_macro_server) = load_workspace_into_db(ws, extra_env, load_config, &mut db)?;
Ok((db, vfs, proc_macro_server))
}
// This variant of `load_workspace` allows deferring the loading of rust-analyzer
// into an existing database, which is useful in certain third-party scenarios,
// now that `salsa` supports extending foreign databases (e.g. `RootDatabase`).
pub fn load_workspace_into_db(
ws: ProjectWorkspace,
extra_env: &FxHashMap<String, Option<String>>,
load_config: &LoadCargoConfig,
db: &mut RootDatabase,
) -> anyhow::Result<(vfs::Vfs, Option<ProcMacroClient>)> {
let (sender, receiver) = unbounded(); let (sender, receiver) = unbounded();
let mut vfs = vfs::Vfs::default(); let mut vfs = vfs::Vfs::default();
let mut loader = { let mut loader = {
@ -145,18 +162,20 @@ pub fn load_workspace(
version: 0, version: 0,
}); });
let db = load_crate_graph( load_crate_graph_into_db(
crate_graph, crate_graph,
proc_macros, proc_macros,
project_folders.source_root_config, project_folders.source_root_config,
&mut vfs, &mut vfs,
&receiver, &receiver,
db,
); );
if load_config.prefill_caches { if load_config.prefill_caches {
prime_caches::parallel_prime_caches(&db, 1, &|_| ()); prime_caches::parallel_prime_caches(db, 1, &|_| ());
} }
Ok((db, vfs, proc_macro_server.and_then(Result::ok)))
Ok((vfs, proc_macro_server.and_then(Result::ok)))
} }
#[derive(Default)] #[derive(Default)]
@ -425,15 +444,14 @@ pub fn load_proc_macro(
} }
} }
fn load_crate_graph( fn load_crate_graph_into_db(
crate_graph: CrateGraphBuilder, crate_graph: CrateGraphBuilder,
proc_macros: ProcMacrosBuilder, proc_macros: ProcMacrosBuilder,
source_root_config: SourceRootConfig, source_root_config: SourceRootConfig,
vfs: &mut vfs::Vfs, vfs: &mut vfs::Vfs,
receiver: &Receiver<vfs::loader::Message>, receiver: &Receiver<vfs::loader::Message>,
) -> RootDatabase { db: &mut RootDatabase,
let lru_cap = std::env::var("RA_LRU_CAP").ok().and_then(|it| it.parse::<u16>().ok()); ) {
let mut db = RootDatabase::new(lru_cap);
let mut analysis_change = ChangeWithProcMacros::default(); let mut analysis_change = ChangeWithProcMacros::default();
db.enable_proc_attr_macros(); db.enable_proc_attr_macros();
@ -470,7 +488,6 @@ fn load_crate_graph(
analysis_change.set_proc_macros(proc_macros); analysis_change.set_proc_macros(proc_macros);
db.apply_change(analysis_change); db.apply_change(analysis_change);
db
} }
fn expander_to_proc_macro( fn expander_to_proc_macro(