X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=crates%2Frust-analyzer%2Fsrc%2Fmain_loop.rs;h=979b3b1522159679d2c1de1d81e5ca0bf2c9453e;hb=a68ce62f6a33d3e5777c1d64c946e0f1d9c7f457;hp=9f08ad5ebfcbab1acdac309e71f69947c961dd3c;hpb=d85946b73566312f96b2c465d26ed6a613b39109;p=rust.git diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index 9f08ad5ebfc..979b3b15221 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs @@ -406,7 +406,10 @@ fn handle_event(&mut self, event: Event) -> Result<()> { // When we're running multiple flychecks, we have to include a disambiguator in // the title, or the editor complains. Note that this is a user-facing string. let title = if self.flycheck.len() == 1 { - "cargo check".to_string() + match self.config.flycheck() { + Some(config) => format!("{}", config), + None => "cargo check".to_string(), + } } else { format!("cargo check (#{})", id + 1) }; @@ -430,7 +433,9 @@ fn handle_event(&mut self, event: Event) -> Result<()> { for flycheck in &self.flycheck { flycheck.update(); } - self.prime_caches_queue.request_op(); + if self.config.prefill_caches() { + self.prime_caches_queue.request_op(); + } } if !was_quiescent || state_changed { @@ -561,7 +566,7 @@ fn on_request(&mut self, request_received: Instant, req: Request) -> Result<()> s.shutdown_requested = true; Ok(()) })? - .on_sync_mut::(|s, p| handlers::handle_memory_usage(s, p))? + .on_sync_mut::(handlers::handle_memory_usage)? .on_sync::(handlers::handle_join_lines)? .on_sync::(handlers::handle_on_enter)? .on_sync::(handlers::handle_selection_range)?