language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 14:51:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix is_quiescent reporting

Browse source
This commit is contained in:
Lukas Wirth 2023-03-10 10:26:02 +01:00
parent 2cb60343ed
commit c03775e477
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/rust-analyzer/src/main_loop.rs
View file

@ -444,7 +444,7 @@ impl GlobalState {
ProjectWorkspaceProgress::End(workspaces) => { ProjectWorkspaceProgress::End(workspaces) => {
self.fetch_workspaces_queue.op_completed(Some(workspaces)); self.fetch_workspaces_queue.op_completed(Some(workspaces));
if let Err(e) = self.fetch_workspace_error() { if let Err(e) = self.fetch_workspace_error() {
tracing::error!("FetchWorkspaceError:\n{e}") tracing::error!("FetchWorkspaceError:\n{e}");
} }
let old = Arc::clone(&self.workspaces); let old = Arc::clone(&self.workspaces);
@ -468,7 +468,7 @@ impl GlobalState {
BuildDataProgress::End(build_data_result) => { BuildDataProgress::End(build_data_result) => {
self.fetch_build_data_queue.op_completed(build_data_result); self.fetch_build_data_queue.op_completed(build_data_result);
if let Err(e) = self.fetch_build_data_error() { if let Err(e) = self.fetch_build_data_error() {
tracing::error!("FetchBuildDataError:\n{e}") tracing::error!("FetchBuildDataError:\n{e}");
} }
self.switch_workspaces("fetched build data".to_string()); self.switch_workspaces("fetched build data".to_string());
@ -495,7 +495,6 @@ impl GlobalState {
} }
} }
} }
vfs::loader::Message::Progress { n_total: 0, .. } => {}
vfs::loader::Message::Progress { n_total, n_done, config_version } => { vfs::loader::Message::Progress { n_total, n_done, config_version } => {
always!(config_version <= self.vfs_config_version); always!(config_version <= self.vfs_config_version);
@ -503,6 +502,7 @@ impl GlobalState {
self.vfs_progress_n_total = n_total; self.vfs_progress_n_total = n_total;
self.vfs_progress_n_done = n_done; self.vfs_progress_n_done = n_done;
// if n_total != 0 {
let state = if n_done == 0 { let state = if n_done == 0 {
Progress::Begin Progress::Begin
} else if n_done < n_total { } else if n_done < n_total {
@ -517,7 +517,8 @@ impl GlobalState {
Some(format!("{n_done}/{n_total}")), Some(format!("{n_done}/{n_total}")),
Some(Progress::fraction(n_done, n_total)), Some(Progress::fraction(n_done, n_total)),
None, None,
) );
// }
} }
} }
} }

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

@ -56,7 +56,8 @@ pub(crate) enum BuildDataProgress {
impl GlobalState { impl GlobalState {
pub(crate) fn is_quiescent(&self) -> bool { pub(crate) fn is_quiescent(&self) -> bool {
!(self.fetch_workspaces_queue.op_in_progress() !(self.last_reported_status.is_none()
|| self.fetch_workspaces_queue.op_in_progress()
|| self.fetch_build_data_queue.op_in_progress() || self.fetch_build_data_queue.op_in_progress()
|| self.vfs_progress_config_version < self.vfs_config_version || self.vfs_progress_config_version < self.vfs_config_version
|| self.vfs_progress_n_done < self.vfs_progress_n_total) || self.vfs_progress_n_done < self.vfs_progress_n_total)