Skip to content

Commit

Permalink
fix(cli): Fixed bug where the progress bar did not clear (#16401)
Browse files Browse the repository at this point in the history
  • Loading branch information
k-nasa committed Oct 24, 2022
1 parent 3025900 commit 7a65b8e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cli/proc_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ impl ProcState {
dynamic_permissions: Permissions,
reload_on_watch: bool,
) -> Result<(), AnyError> {
let _pb_clear_guard = self.progress_bar.clear_guard();
let roots = roots
.into_iter()
.map(|s| (s, ModuleKind::Esm))
Expand Down Expand Up @@ -412,7 +413,7 @@ impl ProcState {
self.prepare_node_std_graph().await?;
}

self.progress_bar.clear();
drop(_pb_clear_guard);

// type check if necessary
if self.options.type_check_mode() != TypeCheckMode::None {
Expand Down
14 changes: 14 additions & 0 deletions cli/progress_bar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,18 @@ impl ProgressBar {
inner.pb = None;
}
}

pub fn clear_guard(&self) -> ClearGuard {
ClearGuard { pb: self.clone() }
}
}

pub struct ClearGuard {
pb: ProgressBar,
}

impl Drop for ClearGuard {
fn drop(&mut self) {
self.pb.clear();
}
}

0 comments on commit 7a65b8e

Please sign in to comment.