Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-11 07:34:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12541 - Veykril:vs-reload, r=Veykril

Browse source 
fix: Clear proc-macro changed flag when reloading workspace
This commit is contained in:
bors 2022-06-15 12:29:34 +00:00
commit 15c63c4119
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/rust-analyzer/src/handlers.rs
View file

@ -45,6 +45,7 @@ use crate::{
pub(crate) fn handle_workspace_reload(state: &mut GlobalState, _: ()) -> Result<()> {
state.proc_macro_client = None;
state.proc_macro_changed = false;
state.fetch_workspaces_queue.request_op("reload workspace request".to_string());
state.fetch_build_data_queue.request_op("reload workspace request".to_string());
Ok(())

2
crates/rust-analyzer/src/reload.rs
View file

@ -162,7 +162,7 @@ impl GlobalState {
}
pub(crate) fn fetch_build_data(&mut self, cause: Cause) {
tracing::debug!(%cause, "will fetch build data");
tracing::info!(%cause, "will fetch build data");
let workspaces = Arc::clone(&self.workspaces);
let config = self.config.cargo();
self.task_pool.handle.spawn_with_sender(move |sender| {

4
editors/code/src/ctx.ts
View file

@ -77,10 +77,10 @@ export class Ctx {
}
setServerStatus(status: ServerStatusParams) {
this.statusBar.tooltip = status.message ?? "Ready";
let icon = "";
switch (status.health) {
case "ok":
this.statusBar.tooltip = status.message ?? "Ready";
this.statusBar.command = undefined;
this.statusBar.color = undefined;
this.statusBar.backgroundColor = undefined;
@ -105,7 +105,7 @@ export class Ctx {
break;
}
if (!status.quiescent) icon = "$(sync~spin) ";
this.statusBar.text = `${icon} rust-analyzer`;
this.statusBar.text = `${icon}rust-analyzer`;
}
pushCleanup(d: Disposable) {