Fix colored output on Windows

Author: juho05

cli/output.go

@@ -3,56 +3,60 @@ package cli
 import (
 	"errors"
 	"fmt"
+
+	"github.com/mattn/go-colorable"
 )
 
 var inProgress = false
 
+var out = colorable.NewColorableStdout()
+
 func IsInProgress() bool {
 	return inProgress
 }
 
 func Info(format string, a ...any) {
 	if inProgress {
-		fmt.Println()
+		fmt.Fprintln(out)
 		inProgress = false
 	}
-	fmt.Printf("%s\n", fmt.Sprintf(format, a...))
+	fmt.Fprintf(out, "%s\n", fmt.Sprintf(format, a...))
 }
 
 func Begin(format string, a ...any) {
-	fmt.Printf(format, a...)
+	fmt.Fprintf(out, format, a...)
 	inProgress = true
 }
 
 func Finish() {
 	if inProgress {
-		fmt.Print(" done.\n")
+		fmt.Fprint(out, " done.\n")
 		inProgress = false
 	}
 }
 
 func Success(format string, a ...any) {
 	if inProgress {
-		fmt.Println()
+		fmt.Fprintln(out)
 		inProgress = false
 	}
-	fmt.Printf("\x1b[32m%s\x1b[0m\n", fmt.Sprintf(format, a...))
+	fmt.Fprintf(out, "\x1b[32m%s\x1b[0m\n", fmt.Sprintf(format, a...))
 }
 
 func Warn(format string, a ...any) {
 	if inProgress {
-		fmt.Println()
+		fmt.Fprintln(out)
 		inProgress = false
 	}
-	fmt.Printf("\x1b[33mWARNING: %s\x1b[0m\n", fmt.Sprintf(format, a...))
+	fmt.Fprintf(out, "\x1b[33mWARNING: %s\x1b[0m\n", fmt.Sprintf(format, a...))
 }
 
 func Error(format string, a ...any) error {
 	if inProgress {
-		fmt.Println()
+		fmt.Fprintln(out)
 		inProgress = false
 	}
 	message := fmt.Sprintf(format, a...)
-	fmt.Printf("\x1b[1;31mERROR: %s\x1b[0m\n", message)
+	fmt.Fprintf(out, "\x1b[1;31mERROR: %s\x1b[0m\n", message)
 	return errors.New(message)
 }

go.mod

@@ -5,12 +5,12 @@ go 1.18
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.4
 	github.com/adrg/xdg v0.4.0
+	github.com/mattn/go-colorable v0.1.12
 	github.com/ogier/pflag v0.0.1
 )
 
 require (
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect

main.go

@@ -36,9 +36,6 @@ func main() {
 	switch command {
 	case "new":
 		err = commands.New()
-		if err == cli.ErrCanceled {
-			cli.Info(err.Error())
-		}
 	case "docs":
 		err = external.OpenBrowser("https://docs.code-game.org")
 		if err != nil {