From ba65d259de15ef09eb648d68a3f3f78859223d51 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Fri, 11 Jun 2021 01:35:14 +0300 Subject: [PATCH] Prime caches on workspace load --- crates/rust-analyzer/src/cli.rs | 1 - crates/rust-analyzer/src/cli/load_cargo.rs | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/rust-analyzer/src/cli.rs b/crates/rust-analyzer/src/cli.rs index 76b666dc27..25ebcc0ece 100644 --- a/crates/rust-analyzer/src/cli.rs +++ b/crates/rust-analyzer/src/cli.rs @@ -16,7 +16,6 @@ use vfs::Vfs; pub use self::{ analysis_stats::AnalysisStatsCmd, diagnostics::diagnostics, - load_cargo::{load_workspace, load_workspace_at, LoadCargoConfig}, ssr::{apply_ssr_rules, search_for_patterns}, }; diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs index 8cee654787..b1c0e015d6 100644 --- a/crates/rust-analyzer/src/cli/load_cargo.rs +++ b/crates/rust-analyzer/src/cli/load_cargo.rs @@ -33,7 +33,7 @@ pub fn load_workspace_at( load_workspace(workspace, load_config, progress) } -pub fn load_workspace( +fn load_workspace( ws: ProjectWorkspace, config: &LoadCargoConfig, progress: &dyn Fn(String), @@ -82,6 +82,8 @@ pub fn load_workspace( log::debug!("crate graph: {:?}", crate_graph); let host = load_crate_graph(crate_graph, project_folders.source_root_config, &mut vfs, &receiver); + + host.analysis().prime_caches(|_| {})?; Ok((host, vfs, proc_macro_client)) }