conform plain flag to colorize values

semihbkgr · Jan 20, 2025 · 3a7e24e · 3a7e24e
1 parent b540a60
commit 3a7e24e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/diff/diff.go b/pkg/diff/diff.go
@@ -26,6 +26,7 @@ func (d *Diff) Format(opts FormatOptions) string {
 		if !opts.Plain {
 			sign = color.HiGreenString(sign)
 			path = color.HiGreenString(path)
+			value = colorize(value)
 			metadata = color.HiCyanString(metadata)
 		}
 
@@ -48,6 +49,7 @@ func (d *Diff) Format(opts FormatOptions) string {
 		if !opts.Plain {
 			sign = color.HiRedString(sign)
 			path = color.HiRedString(path)
+			value = colorize(value)
 			metadata = color.HiCyanString(metadata)
 		}
 
@@ -87,6 +89,8 @@ func (d *Diff) Format(opts FormatOptions) string {
 		if !opts.Plain {
 			sign = color.HiYellowString(sign)
 			path = color.HiYellowString(path)
+			leftValue = colorize(leftValue)
+			rightValue = colorize(rightValue)
 			leftMetadata = color.HiCyanString(leftMetadata)
 			rightMetadata = color.HiCyanString(rightMetadata)
 		}

diff --git a/pkg/diff/format.go b/pkg/diff/format.go
@@ -23,7 +23,7 @@ func nodeValueString(n ast.Node, indent int) (string, bool) {
 	s := n.String()
 	lines := strings.Split(s, "\n")
 	if len(lines) == 1 {
-		return colorize(s), false
+		return s, false
 	}
 
 	nodeIndentLevel := 0
@@ -36,7 +36,7 @@ func nodeValueString(n ast.Node, indent int) (string, bool) {
 		}
 	}
 
-	return colorize(strings.Join(lines, "\n")), true
+	return strings.Join(lines, "\n"), true
 }
 
 func nodeMetadata(n ast.Node) string {