Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #19384 from Veykril/push-yppplzzpoymr
fix: Fix stale `Building CrateGraph` report
Lukas Wirth 2025-03-17
parent 1c72e54 · parent c159ac2 · commit facaf8b
-rw-r--r--crates/rust-analyzer/src/reload.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index 0a716c0929..ce9e5c3f24 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -754,13 +754,11 @@ impl GlobalState {
self.analysis_host.apply_change(change);
self.finish_loading_crate_graph();
- return;
+ } else {
+ change.set_crate_graph(crate_graph);
+ self.fetch_proc_macros_queue.request_op(cause, (change, proc_macro_paths));
}
- change.set_crate_graph(crate_graph);
- self.fetch_proc_macros_queue.request_op(cause, (change, proc_macro_paths));
- }
- pub(crate) fn finish_loading_crate_graph(&mut self) {
self.report_progress(
"Building CrateGraph",
crate::lsp::utils::Progress::End,
@@ -768,7 +766,9 @@ impl GlobalState {
None,
None,
);
+ }
+ pub(crate) fn finish_loading_crate_graph(&mut self) {
self.process_changes();
self.reload_flycheck();
}