Merge pull request #742 from brettbuddin/no-color

mislav · web-flow · commit 250114e2c033 · 2020-04-03T19:10:16.000+02:00
Support NO_COLOR environment variable to disable color
diff --git a/utils/color.go b/utils/color.go
@@ -9,8 +9,10 @@ import (
 	"github.com/mgutz/ansi"
 )
 
+var _isColorEnabled = true
 var _isStdoutTerminal = false
 var checkedTerminal = false
+var checkedNoColor = false
 
 func isStdoutTerminal() bool {
 	if !checkedTerminal {
@@ -33,13 +35,21 @@ func NewColorable(f *os.File) io.Writer {
 func makeColorFunc(color string) func(string) string {
 	cf := ansi.ColorFunc(color)
 	return func(arg string) string {
-		if isStdoutTerminal() {
+		if isColorEnabled() && isStdoutTerminal() {
 			return cf(arg)
 		}
 		return arg
 	}
 }
 
+func isColorEnabled() bool {
+	if !checkedNoColor {
+		_isColorEnabled = os.Getenv("NO_COLOR") == ""
+		checkedNoColor = true
+	}
+	return _isColorEnabled
+}
+
 // Magenta outputs ANSI color if stdout is a tty
 var Magenta = makeColorFunc("magenta")
 
diff --git a/utils/utils.go b/utils/utils.go
@@ -22,7 +22,11 @@ func OpenInBrowser(url string) error {
 }
 
 func RenderMarkdown(text string) (string, error) {
-	return glamour.Render(text, "dark")
+	style := "notty"
+	if isColorEnabled() {
+		style = "dark"
+	}
+	return glamour.Render(text, style)
 }
 
 func Pluralize(num int, thing string) string {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,11 @@ func OpenInBrowser(url string) error {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`func RenderMarkdown(text string) (string, error) {`
`25`		`- return glamour.Render(text, "dark")`
	`25`	`+ style := "notty"`
	`26`	`+ if isColorEnabled() {`
	`27`	`+ style = "dark"`
	`28`	`+ }`
	`29`	`+ return glamour.Render(text, style)`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`func Pluralize(num int, thing string) string {`