From 2297a79ccd1ce53d35a28a460251de9bab77c133 Mon Sep 17 00:00:00 2001 From: Jared Palmer Date: Wed, 23 Mar 2022 15:49:55 -0400 Subject: [PATCH 1/3] Reset ansii after ui.rainbow() --- cli/internal/ui/ui.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/internal/ui/ui.go b/cli/internal/ui/ui.go index c4c9852ee0579..c24af9a29adb5 100644 --- a/cli/internal/ui/ui.go +++ b/cli/internal/ui/ui.go @@ -59,6 +59,7 @@ func Rainbow(text string) string { str := fmt.Sprintf("\033[1m\033[38;2;%d;%d;%dm%c\033[0m\033[0;1m", r, g, b, value) rainbowStr = append(rainbowStr, str) } + rainbowStr = append(rainbowStr, "\x1b[0m") return strings.Join(rainbowStr, "") } From 6848ba97feda58f7062f745e6e0d7f5e59296c00 Mon Sep 17 00:00:00 2001 From: Jared Palmer Date: Wed, 23 Mar 2022 15:57:24 -0400 Subject: [PATCH 2/3] Call reset after rainbowing in run_state --- cli/internal/run/run_state.go | 2 +- cli/internal/ui/ui.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cli/internal/run/run_state.go b/cli/internal/run/run_state.go index 2bf95dc8d4875..f20149fe83211 100644 --- a/cli/internal/run/run_state.go +++ b/cli/internal/run/run_state.go @@ -296,7 +296,7 @@ func (r *RunState) Close(Ui cli.Ui, filename string) error { Ui.Output("") // Clear the line Ui.Output(util.Sprintf("${BOLD} Tasks:${BOLD_GREEN} %v successful${RESET}${GRAY}, %v total", r.Cached+r.Success, r.Attempted)) Ui.Output(util.Sprintf("${BOLD}Cached: %v cached${RESET}${GRAY}, %v total", r.Cached, r.Attempted)) - Ui.Output(util.Sprintf("${BOLD} Time: %v${RESET} %v", time.Since(r.startedAt).Truncate(time.Millisecond), maybeFullTurbo)) + Ui.Output(util.Sprintf("${BOLD} Time: %v${RESET} %v${RESET}", time.Since(r.startedAt).Truncate(time.Millisecond), maybeFullTurbo)) Ui.Output("") } else { diff --git a/cli/internal/ui/ui.go b/cli/internal/ui/ui.go index c24af9a29adb5..c4c9852ee0579 100644 --- a/cli/internal/ui/ui.go +++ b/cli/internal/ui/ui.go @@ -59,7 +59,6 @@ func Rainbow(text string) string { str := fmt.Sprintf("\033[1m\033[38;2;%d;%d;%dm%c\033[0m\033[0;1m", r, g, b, value) rainbowStr = append(rainbowStr, str) } - rainbowStr = append(rainbowStr, "\x1b[0m") return strings.Join(rainbowStr, "") } From 6f347ae9d3b1524ee2a542583c285ab150a9104e Mon Sep 17 00:00:00 2001 From: Jared Palmer Date: Wed, 23 Mar 2022 15:58:30 -0400 Subject: [PATCH 3/3] Reset after each line --- cli/internal/run/run_state.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/internal/run/run_state.go b/cli/internal/run/run_state.go index f20149fe83211..5832d1c773499 100644 --- a/cli/internal/run/run_state.go +++ b/cli/internal/run/run_state.go @@ -294,8 +294,8 @@ func (r *RunState) Close(Ui cli.Ui, filename string) error { } if r.runOptions.stream { Ui.Output("") // Clear the line - Ui.Output(util.Sprintf("${BOLD} Tasks:${BOLD_GREEN} %v successful${RESET}${GRAY}, %v total", r.Cached+r.Success, r.Attempted)) - Ui.Output(util.Sprintf("${BOLD}Cached: %v cached${RESET}${GRAY}, %v total", r.Cached, r.Attempted)) + Ui.Output(util.Sprintf("${BOLD} Tasks:${BOLD_GREEN} %v successful${RESET}${GRAY}, %v total${RESET}", r.Cached+r.Success, r.Attempted)) + Ui.Output(util.Sprintf("${BOLD}Cached: %v cached${RESET}${GRAY}, %v total${RESET}", r.Cached, r.Attempted)) Ui.Output(util.Sprintf("${BOLD} Time: %v${RESET} %v${RESET}", time.Since(r.startedAt).Truncate(time.Millisecond), maybeFullTurbo)) Ui.Output("") } else {