Re-add message

ammario · ammario · commit cb746033dd15 · 2023-05-08T14:35:36.000-05:00
diff --git a/internal/entryhuman/entry.go b/internal/entryhuman/entry.go
@@ -49,15 +49,26 @@ func render(w io.Writer, st lipgloss.Style, s string) string {
 	return s
 }
 
+func reset(w io.Writer, termW io.Writer) {
+	if shouldColor(termW) {
+		fmt.Fprintf(w, termenv.CSI+termenv.ResetSeq+"m")
+	}
+}
+
 // Fmt returns a human readable format for ent.
 //
 // We never return with a trailing newline because Go's testing framework adds one
 // automatically and if we include one, then we'll get two newlines.
 // We also do not indent the fields as go's test does that automatically
 // for extra lines in a log so if we did it here, the fields would be indented
 // twice in test logs. So the Stderr logger indents all the fields itself.
-func Fmt(buf io.StringWriter, termW io.Writer, ent slog.SinkEntry,
+func Fmt(
+	buf interface {
+		io.StringWriter
+		io.Writer
+	}, termW io.Writer, ent slog.SinkEntry,
 ) {
+	reset(buf, termW)
 	ts := ent.Time.Format(TimeFormat)
 	buf.WriteString(ts + " ")
 
@@ -83,9 +94,8 @@ func Fmt(buf io.StringWriter, termW io.Writer, ent slog.SinkEntry,
 		multilineVal = msg
 		msg = "..."
 		msg = quote(msg)
-		buf.WriteString(msg)
-
 	}
+	buf.WriteString(msg)
 
 	if ent.SpanContext != (trace.SpanContext{}) {
 		ent.Fields = append(slog.M(
diff --git a/internal/entryhuman/entry_test.go b/internal/entryhuman/entry_test.go
@@ -145,7 +145,7 @@ func BenchmarkFmt(b *testing.B) {
 				b.ResetTimer()
 				b.ReportAllocs()
 				for i := 0; i < b.N; i++ {
-					entryhuman.Fmt(io.Discard.(io.StringWriter), w, se)
+					entryhuman.Fmt(bytes.NewBuffer(nil), w, se)
 				}
 			})
 		}
diff --git a/internal/entryhuman/testdata/multilineField.golden b/internal/entryhuman/testdata/multilineField.golden
@@ -1,3 +1,3 @@
-0001-01-01 00:00:00.000 [INFO]	 ...
+0001-01-01 00:00:00.000 [INFO]	msg ...
 field= line1
        line2
diff --git a/internal/entryhuman/testdata/simpleNoFields.golden b/internal/entryhuman/testdata/simpleNoFields.golden
@@ -1 +1 @@
-2000-02-05 04:04:04.000 [DEBU]	
+2000-02-05 04:04:04.000 [DEBU]	wowowow	izi

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func BenchmarkFmt(b *testing.B) {`
`145`	`145`	`b.ResetTimer()`
`146`	`146`	`b.ReportAllocs()`
`147`	`147`	`for i := 0; i < b.N; i++ {`
`148`		`- entryhuman.Fmt(io.Discard.(io.StringWriter), w, se)`
	`148`	`+ entryhuman.Fmt(bytes.NewBuffer(nil), w, se)`
`149`	`149`	`}`
`150`	`150`	`})`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2000-02-05 04:04:04.000 [DEBU]`
	`1`	`+2000-02-05 04:04:04.000 [DEBU] wowowow izi`