diff options
| author | bors <bors@rust-lang.org> | 2022-04-25 12:56:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-25 12:56:57 +0000 |
| commit | 60c4f072eb6dd0de3b551341a391758c7cd3a272 (patch) | |
| tree | d1a2f35cfcdec1d3ccd10fb60abd8da983c8609f | |
| parent | 1d2bd0e37969c81da520b1a790d4cffd9ccd135d (diff) | |
| parent | 8f616a6cb5cbb7e5ac36505a1d40dca15a905426 (diff) | |
| download | rust-60c4f072eb6dd0de3b551341a391758c7cd3a272.tar.gz rust-60c4f072eb6dd0de3b551341a391758c7cd3a272.zip | |
Auto merge of #12007 - edwin0cheng:restart-proc-macro-reload, r=jonas-schievink
Restart proc-macro client when server reload Fix #10719
| -rw-r--r-- | crates/rust-analyzer/src/handlers.rs | 7 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/main_loop.rs | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs index a1b71ab1437..d005cdb9852 100644 --- a/crates/rust-analyzer/src/handlers.rs +++ b/crates/rust-analyzer/src/handlers.rs @@ -43,6 +43,13 @@ use crate::{ to_proto, LspError, Result, }; +pub(crate) fn handle_workspace_reload(state: &mut GlobalState, _: ()) -> Result<()> { + state.proc_macro_client = None; + state.fetch_workspaces_queue.request_op("reload workspace request".to_string()); + state.fetch_build_data_queue.request_op("reload workspace request".to_string()); + Ok(()) +} + pub(crate) fn handle_analyzer_status( snap: GlobalStateSnapshot, params: lsp_ext::AnalyzerStatusParams, diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index 3ac64e66b52..96f4e2a50b9 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs @@ -499,9 +499,13 @@ impl GlobalState { self.fetch_workspaces(cause); } } - if let Some(cause) = self.fetch_build_data_queue.should_start_op() { - self.fetch_build_data(cause); + + if !self.fetch_workspaces_queue.op_in_progress() { + if let Some(cause) = self.fetch_build_data_queue.should_start_op() { + self.fetch_build_data(cause); + } } + if let Some(cause) = self.prime_caches_queue.should_start_op() { tracing::debug!(%cause, "will prime caches"); let num_worker_threads = self.config.prime_caches_num_threads(); @@ -571,14 +575,11 @@ impl GlobalState { } RequestDispatcher { req: Some(req), global_state: self } - .on_sync_mut::<lsp_ext::ReloadWorkspace>(|s, ()| { - s.fetch_workspaces_queue.request_op("reload workspace request".to_string()); - Ok(()) - })? .on_sync_mut::<lsp_types::request::Shutdown>(|s, ()| { s.shutdown_requested = true; Ok(()) })? + .on_sync_mut::<lsp_ext::ReloadWorkspace>(handlers::handle_workspace_reload)? .on_sync_mut::<lsp_ext::MemoryUsage>(handlers::handle_memory_usage)? .on_sync_mut::<lsp_ext::ShuffleCrateGraph>(handlers::handle_shuffle_crate_graph)? .on_sync::<lsp_ext::JoinLines>(handlers::handle_join_lines)? |