fix: fix cliui prompt styling (#11899)

aslilac · web-flow · commit f572e18144ea · 2024-01-29T13:56:43.000-07:00
diff --git a/cli/cliui/prompt.go b/cli/cliui/prompt.go
@@ -71,9 +71,9 @@ func Prompt(inv *clibase.Invocation, opts PromptOptions) (string, error) {
 		} else {
 			renderedNo = Bold(ConfirmNo)
 		}
-		pretty.Fprintf(inv.Stdout, DefaultStyles.Placeholder, "(%s/%s) ", renderedYes, renderedNo)
+		_, _ = fmt.Fprintf(inv.Stdout, "(%s/%s) ", renderedYes, renderedNo)
 	} else if opts.Default != "" {
-		_, _ = fmt.Fprint(inv.Stdout, pretty.Sprint(DefaultStyles.Placeholder, "("+opts.Default+") "))
+		_, _ = fmt.Fprintf(inv.Stdout, "(%s) ", pretty.Sprint(DefaultStyles.Placeholder, opts.Default))
 	}
 	interrupt := make(chan os.Signal, 1)
 
diff --git a/cli/restart.go b/cli/restart.go
@@ -41,7 +41,7 @@ func (r *RootCmd) restart() *clibase.Cmd {
 			}
 
 			_, err = cliui.Prompt(inv, cliui.PromptOptions{
-				Text:      "Confirm restart workspace?",
+				Text:      "Restart workspace?",
 				IsConfirm: true,
 			})
 			if err != nil {
diff --git a/cli/restart_test.go b/cli/restart_test.go
@@ -84,7 +84,7 @@ func TestRestart(t *testing.T) {
 
 		matches := []string{
 			ephemeralParameterDescription, ephemeralParameterValue,
-			"Confirm restart workspace?", "yes",
+			"Restart workspace?", "yes",
 			"Stopping workspace", "",
 			"Starting workspace", "",
 			"workspace has been restarted", "",
@@ -138,7 +138,7 @@ func TestRestart(t *testing.T) {
 		}()
 
 		matches := []string{
-			"Confirm restart workspace?", "yes",
+			"Restart workspace?", "yes",
 			"Stopping workspace", "",
 			"Starting workspace", "",
 			"workspace has been restarted", "",

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ func Prompt(inv *clibase.Invocation, opts PromptOptions) (string, error) {`
`71`	`71`	`} else {`
`72`	`72`	`renderedNo = Bold(ConfirmNo)`
`73`	`73`	`}`
`74`		`- pretty.Fprintf(inv.Stdout, DefaultStyles.Placeholder, "(%s/%s) ", renderedYes, renderedNo)`
	`74`	`+ _, _ = fmt.Fprintf(inv.Stdout, "(%s/%s) ", renderedYes, renderedNo)`
`75`	`75`	`} else if opts.Default != "" {`
`76`		`- _, _ = fmt.Fprint(inv.Stdout, pretty.Sprint(DefaultStyles.Placeholder, "("+opts.Default+") "))`
	`76`	`+ _, _ = fmt.Fprintf(inv.Stdout, "(%s) ", pretty.Sprint(DefaultStyles.Placeholder, opts.Default))`
`77`	`77`	`}`
`78`	`78`	`interrupt := make(chan os.Signal, 1)`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func (r RootCmd) restart() clibase.Cmd {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`_, err = cliui.Prompt(inv, cliui.PromptOptions{`
`44`		`- Text: "Confirm restart workspace?",`
	`44`	`+ Text: "Restart workspace?",`
`45`	`45`	`IsConfirm: true,`
`46`	`46`	`})`
`47`	`47`	`if err != nil {`