Skip to content

Preliminary fix for message timing with cli_progress_along() (#668) #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaborcsardi merged 5 commits into from
Sep 24, 2026
Merged

Preliminary fix for message timing with cli_progress_along() (#668) #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3aeb4f
Prelim fix
rundel Sep 19, 2025
a54a91f
Merge branch 'main' into main
rundel Sep 19, 2025
64ff28c
Update snapshot
rundel Sep 19, 2025
1993bfc
Merged origin/main into rundel-main
gaborcsardi Sep 24, 2026
3120e4a
Fox PROTECT()
gaborcsardi Sep 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/progress-altrep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,18 @@ int progress_along_Elt(SEXP x, R_xlen_t i) {
Rf_defineVar(PROTECT(Rf_install("current")), PROTECT(ScalarReal((int) i)), bar);
cli__current_progress_bar = bar;
SEXP show_after = clic__find_var(bar, Rf_install("show_after"));
if (now > REAL(show_after)[0]) INTEGER(cli__disable_gc);
UNPROTECT(2);

SEXP last_shown = Rf_findVarInFrame(bar, Rf_install("last_shown"));
if (last_shown == R_UnboundValue) {
last_shown = PROTECT(Rf_ScalarReal(R_NegInf));
} else {
PROTECT(last_shown);
}

if (now > REAL(show_after)[0] + REAL(last_shown)[0]) {
DATAPTR(cli__disable_gc);
}
UNPROTECT(3);
}
return (int) (i + 1);
}
Expand Down
3 changes: 1 addition & 2 deletions tests/testthat/_snaps/progress-along.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
Code
out
Output
[1] "\rx: 10\033[K\r" "\rx: 10\033[K\r" "\rx: 10\033[K\r" "\rx: 10\033[K\r"
[5] "\r\033[K"
[1] "\rx: 10\033[K\r" "\rx: 10\033[K\r" "\r\033[K"

# cli_progress_along

Expand Down
Loading