Skip to content

Commit 15c63c4

Browse files
committed
Auto merge of rust-lang#12541 - Veykril:vs-reload, r=Veykril
fix: Clear proc-macro changed flag when reloading workspace
2 parents 7ca5d16 + 664a751 commit 15c63c4

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

crates/rust-analyzer/src/handlers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ use crate::{
4545

4646
pub(crate) fn handle_workspace_reload(state: &mut GlobalState, _: ()) -> Result<()> {
4747
state.proc_macro_client = None;
48+
state.proc_macro_changed = false;
4849
state.fetch_workspaces_queue.request_op("reload workspace request".to_string());
4950
state.fetch_build_data_queue.request_op("reload workspace request".to_string());
5051
Ok(())

crates/rust-analyzer/src/reload.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ impl GlobalState {
162162
}
163163

164164
pub(crate) fn fetch_build_data(&mut self, cause: Cause) {
165-
tracing::debug!(%cause, "will fetch build data");
165+
tracing::info!(%cause, "will fetch build data");
166166
let workspaces = Arc::clone(&self.workspaces);
167167
let config = self.config.cargo();
168168
self.task_pool.handle.spawn_with_sender(move |sender| {

editors/code/src/ctx.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ export class Ctx {
7777
}
7878

7979
setServerStatus(status: ServerStatusParams) {
80-
this.statusBar.tooltip = status.message ?? "Ready";
8180
let icon = "";
8281
switch (status.health) {
8382
case "ok":
83+
this.statusBar.tooltip = status.message ?? "Ready";
8484
this.statusBar.command = undefined;
8585
this.statusBar.color = undefined;
8686
this.statusBar.backgroundColor = undefined;
@@ -105,7 +105,7 @@ export class Ctx {
105105
break;
106106
}
107107
if (!status.quiescent) icon = "$(sync~spin) ";
108-
this.statusBar.text = `${icon} rust-analyzer`;
108+
this.statusBar.text = `${icon}rust-analyzer`;
109109
}
110110

111111
pushCleanup(d: Disposable) {

0 commit comments

Comments
 (0)