Fix indentation

ammario · ammario · commit c0674e71abb1 · 2023-05-05T17:09:10.000-05:00
diff --git a/go.mod b/go.mod
@@ -4,8 +4,10 @@ go 1.13
 
 require (
 	cloud.google.com/go v0.26.0
+	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
 	github.com/fatih/color v1.15.0
 	github.com/google/go-cmp v0.5.3
+	github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f // indirect
 	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/nwidger/jsoncolor v0.3.2
 	go.opencensus.io v0.24.0
diff --git a/go.sum b/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
+github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -36,6 +38,8 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3 h1:x95R7cp+rSeeqAMI2knLtQ0DKlaBhv2NrtrOvafPHRo=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f h1:7LYC+Yfkj3CTRcShK0KOL/w6iTiKyqqBA9a41Wnggw8=
+github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f/go.mod h1:pFlLw2CfqZiIBOx6BuCeRLCrfxBJipTY0nIOF/VbGcI=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
diff --git a/internal/entryhuman/entry.go b/internal/entryhuman/entry.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/nwidger/jsoncolor"
+	"github.com/hokaccha/go-prettyjson"
 	"go.opencensus.io/trace"
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/xerrors"
@@ -116,7 +116,14 @@ func Fmt(w io.Writer, ent slog.SinkEntry) string {
 		// No error is guaranteed due to slog.Map handling errors itself.
 		var fields []byte
 		if shouldColor(w) {
-			fields, _ = jsoncolor.MarshalIndent(ent.Fields, "", "")
+			f := prettyjson.NewFormatter()
+			f.Newline = ""
+			f.Indent = 0
+			fields, _ = f.Marshal(ent.Fields)
+			// Need a space after ":" to match the non-color output.
+			var buf bytes.Buffer
+			_ = json.Indent(&buf, fields, "", "")
+			fields = buf.Bytes()
 		} else {
 			fields, _ = json.MarshalIndent(ent.Fields, "", "")
 		}
diff --git a/internal/entryhuman/entry_test.go b/internal/entryhuman/entry_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/acarl005/stripansi"
 	"go.opencensus.io/trace"
 
 	"cdr.dev/slog"
@@ -93,6 +94,25 @@ func TestEntry(t *testing.T) {
 		})
 		assert.Equal(t, "entry", "\x1b[0m\x1b[0m0001-01-01 00:00:00.000 \x1b[91m[CRITICAL]\x1b[0m\t\x1b[36m<.:0>	\x1b[0m\t\"\"\t{\x1b[34m\"hey\"\x1b[0m: \x1b[32m\"hi\"\x1b[0m}", act)
 	})
+
+	t.Run("colorJustColor", func(t *testing.T) {
+		t.Parallel()
+
+		ent := slog.SinkEntry{
+			Level: slog.LevelCritical,
+			Fields: slog.M(
+				slog.F("hey", "hi"),
+			),
+		}
+
+		actColor := entryhuman.Fmt(entryhuman.ForceColorWriter, ent)
+
+		assert.Equal(t,
+			"entries",
+			entryhuman.Fmt(ioutil.Discard, ent),
+			stripansi.Strip(actColor),
+		)
+	})
 }
 
 func BenchmarkFmt(b *testing.B) {
