From 1ea3660fc8b25a38612335d62ec3950c7d4d72f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Mengu=C3=A9?= <dolmen@cpan.org>
Date: Thu, 17 Feb 2022 00:53:57 +0100
Subject: [PATCH 1/3] Add test of colors with ForceColor

go test -v -run TestLogger/colorize
---
 logger_test.go | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/logger_test.go b/logger_test.go
index 1d10e3e..3892bb0 100644
--- a/logger_test.go
+++ b/logger_test.go
@@ -257,6 +257,34 @@ func TestLogger(t *testing.T) {
 		assert.Equal(t, "[INFO]  sublogger: this is test\n", rest)
 	})
 
+	t.Run("colorize", func(t *testing.T) {
+		var buf bytes.Buffer
+
+		logger := New(&LoggerOptions{
+			// No name!
+			Output:     &buf,
+			Level:      Trace,
+			Color:      ForceColor,
+			TimeFormat: "<time>",
+		})
+
+		logger.Trace("trace")
+		logger.Debug("debug")
+		logger.Info("info")
+		logger.Warn("warn")
+		logger.Error("error")
+		str := buf.String()
+
+		assert.Equal(t, ""+
+			"\033[92m<time> [TRACE] trace\n\033[0m"+
+			"\033[97m<time> [DEBUG] debug\n\033[0m"+
+			"\033[94m<time> [INFO]  info\n\033[0m"+
+			"\033[93m<time> [WARN]  warn\n\033[0m"+
+			"\033[91m<time> [ERROR] error\n\033[0m",
+			str,
+		)
+	})
+
 	t.Run("use a different time format", func(t *testing.T) {
 		var buf bytes.Buffer
 

From 4a8b5e1cb0e998410e577d25de7162dbf6a73686 Mon Sep 17 00:00:00 2001
From: Evan Phoenix <evan@phx.io>
Date: Mon, 4 Dec 2023 10:54:35 -0800
Subject: [PATCH 2/3] Fix colors not being enabled in some forced contexts.

Turns out that the color package we use was doing it's own "should
colors be on or not" detection, which interferred with our own
detection. This caused situations where colors were forced on to still
be off (and, maddeningly, would show up in weird contexts because it
dependent on Stdout being not a terminal to break when forced).
---
 intlogger.go   | 20 +++++++++++++++++---
 logger_test.go |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/intlogger.go b/intlogger.go
index 0f63466..1a80008 100644
--- a/intlogger.go
+++ b/intlogger.go
@@ -55,11 +55,25 @@ var (
 
 	faintBoldColor                 = color.New(color.Faint, color.Bold)
 	faintColor                     = color.New(color.Faint)
-	faintMultiLinePrefix           = faintColor.Sprint("  | ")
-	faintFieldSeparator            = faintColor.Sprint("=")
-	faintFieldSeparatorWithNewLine = faintColor.Sprint("=\n")
+	faintMultiLinePrefix           string
+	faintFieldSeparator            string
+	faintFieldSeparatorWithNewLine string
 )
 
+func init() {
+	// Force all the colors to enabled because we do our own detection of color usage.
+	for _, c := range _levelToColor {
+		c.EnableColor()
+	}
+
+	faintBoldColor.EnableColor()
+	faintColor.EnableColor()
+
+	faintMultiLinePrefix = faintColor.Sprint("  | ")
+	faintFieldSeparator = faintColor.Sprint("=")
+	faintFieldSeparatorWithNewLine = faintColor.Sprint("=\n")
+}
+
 // Make sure that intLogger is a Logger
 var _ Logger = &intLogger{}
 
diff --git a/logger_test.go b/logger_test.go
index 3892bb0..6a4acca 100644
--- a/logger_test.go
+++ b/logger_test.go
@@ -257,7 +257,7 @@ func TestLogger(t *testing.T) {
 		assert.Equal(t, "[INFO]  sublogger: this is test\n", rest)
 	})
 
-	t.Run("colorize", func(t *testing.T) {
+	t.Run("can force colors to on in any context", func(t *testing.T) {
 		var buf bytes.Buffer
 
 		logger := New(&LoggerOptions{

From a72e7ad16a991ec7f1406b0a162420f2844ce037 Mon Sep 17 00:00:00 2001
From: Evan Phoenix <evan@phx.io>
Date: Mon, 4 Dec 2023 11:00:57 -0800
Subject: [PATCH 3/3] Add skip for color test on windows because the test uses
 posix colors

---
 logger_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/logger_test.go b/logger_test.go
index 6a4acca..1ab9fd5 100644
--- a/logger_test.go
+++ b/logger_test.go
@@ -258,6 +258,10 @@ func TestLogger(t *testing.T) {
 	})
 
 	t.Run("can force colors to on in any context", func(t *testing.T) {
+		if runtime.GOOS == "windows" {
+			t.Skip("colors are different on windows")
+		}
+
 		var buf bytes.Buffer
 
 		logger := New(&LoggerOptions{