Skip to content

Fix color output to Git Bash #126

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
mislav merged 3 commits into from
Nov 28, 2019
+28 −1
Merged

Fix color output to Git Bash #126

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37eb320
Fix color output to Git Bash
mislav Nov 27, 2019
02189fe
Merge remote-tracking branch 'origin/master' into cygwin-color
mislav Nov 28, 2019
3804c1b
Add docs to color funcs
mislav Nov 28, 2019
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
29 changes: 28 additions & 1 deletion utils/color.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ import (
"github.com/mgutz/ansi"
)

var _isStdoutTerminal = false
var checkedTerminal = false

func isStdoutTerminal() bool {
if !checkedTerminal {
fd := os.Stdout.Fd()
_isStdoutTerminal = isatty.IsTerminal(fd) || isatty.IsCygwinTerminal(fd)
checkedTerminal = true
}
return _isStdoutTerminal
}

// NewColorable returns an output stream that handles ANSI color sequences on Windows
func NewColorable(f *os.File) io.Writer {
return colorable.NewColorable(f)
Expand All @@ -17,18 +29,33 @@ func NewColorable(f *os.File) io.Writer {
func makeColorFunc(color string) func(string) string {
cf := ansi.ColorFunc(color)
return func(arg string) string {
if isatty.IsTerminal(os.Stdout.Fd()) {
if isStdoutTerminal() {
return cf(arg)
}
return arg
}
}

// Magenta outputs ANSI color if stdout is a tty
var Magenta = makeColorFunc("magenta")

// Cyan outputs ANSI color if stdout is a tty
var Cyan = makeColorFunc("cyan")

// Red outputs ANSI color if stdout is a tty
var Red = makeColorFunc("red")

// Yellow outputs ANSI color if stdout is a tty
var Yellow = makeColorFunc("yellow")

// Blue outputs ANSI color if stdout is a tty
var Blue = makeColorFunc("blue")

// Green outputs ANSI color if stdout is a tty
var Green = makeColorFunc("green")

// Gray outputs ANSI color if stdout is a tty
var Gray = makeColorFunc("black+h")

// Bold outputs ANSI color if stdout is a tty
var Bold = makeColorFunc("default+b")