feat: allow disabling indent lines

cwrau · HeavyWombat · commit 56b69a3348eb · 2025-08-10T21:05:35.000+02:00
This makes it possible to copy the diffed lines without weird characters in them
diff --git a/internal/cmd/common.go b/internal/cmd/common.go
@@ -217,6 +217,7 @@ func writeReport(cmd *cobra.Command, report dyff.Report) error {
 		reportWriter = &dyff.HumanReport{
 			Report:                report,
 			Indent:                2,
+			UseIndentLines:        true,
 			DoNotInspectCerts:     reportOptions.doNotInspectCerts,
 			NoTableStyle:          reportOptions.noTableStyle,
 			OmitHeader:            reportOptions.omitHeader,
@@ -234,6 +235,7 @@ func writeReport(cmd *cobra.Command, report dyff.Report) error {
 			HumanReport: dyff.HumanReport{
 				Report:                report,
 				Indent:                0,
+				UseIndentLines:        true,
 				DoNotInspectCerts:     reportOptions.doNotInspectCerts,
 				NoTableStyle:          true,
 				OmitHeader:            true,
@@ -252,6 +254,7 @@ func writeReport(cmd *cobra.Command, report dyff.Report) error {
 			HumanReport: dyff.HumanReport{
 				Report:                report,
 				Indent:                0,
+				UseIndentLines:        true,
 				DoNotInspectCerts:     reportOptions.doNotInspectCerts,
 				NoTableStyle:          true,
 				OmitHeader:            true,
@@ -270,6 +273,7 @@ func writeReport(cmd *cobra.Command, report dyff.Report) error {
 			HumanReport: dyff.HumanReport{
 				Report:                report,
 				Indent:                0,
+				UseIndentLines:        true,
 				DoNotInspectCerts:     reportOptions.doNotInspectCerts,
 				NoTableStyle:          true,
 				OmitHeader:            true,
diff --git a/pkg/dyff/core_suite_test.go b/pkg/dyff/core_suite_test.go
@@ -135,6 +135,7 @@ func compareAgainstExpectedHuman(fromPath string, toPath string, expectedPath st
 	reportWriter := &dyff.HumanReport{
 		Report:                report,
 		Indent:                2,
+		UseIndentLines:        true,
 		DoNotInspectCerts:     false,
 		NoTableStyle:          false,
 		OmitHeader:            true,
@@ -171,6 +172,7 @@ func compareAgainstExpectedDiffSyntax(fromPath string, toPath string, expectedPa
 		HumanReport: dyff.HumanReport{
 			Report:                report,
 			Indent:                0,
+			UseIndentLines:        true,
 			DoNotInspectCerts:     false,
 			NoTableStyle:          true,
 			OmitHeader:            true,
@@ -275,6 +277,7 @@ func humanDiff(diff dyff.Diff) string {
 	reporter := dyff.HumanReport{
 		Report:            dyff.Report{Diffs: []dyff.Diff{diff}},
 		Indent:            2,
+		UseIndentLines:    true,
 		DoNotInspectCerts: false,
 		NoTableStyle:      false,
 		OmitHeader:        true,
@@ -296,6 +299,7 @@ func diffSyntaxDiff(diff dyff.Diff) string {
 		HumanReport: dyff.HumanReport{
 			Report:            dyff.Report{Diffs: []dyff.Diff{diff}},
 			Indent:            0,
+			UseIndentLines:    true,
 			DoNotInspectCerts: false,
 			NoTableStyle:      true,
 			OmitHeader:        true,
diff --git a/pkg/dyff/output.go b/pkg/dyff/output.go
@@ -26,8 +26,8 @@ import (
 	"github.com/lucasb-eyer/go-colorful"
 )
 
-func yamlStringInRedishColors(input interface{}) (string, error) {
-	return neat.NewOutputProcessor(true, true, &map[string]colorful.Color{
+func yamlStringInRedishColors(input interface{}, useIndentLines bool) (string, error) {
+	return neat.NewOutputProcessor(useIndentLines, true, &map[string]colorful.Color{
 		"keyColor":           bunt.FireBrick,
 		"indentLineColor":    {R: 0.2, G: 0, B: 0},
 		"scalarDefaultColor": bunt.LightCoral,
@@ -41,8 +41,8 @@ func yamlStringInRedishColors(input interface{}) (string, error) {
 	}).ToYAML(input)
 }
 
-func yamlStringInGreenishColors(input interface{}) (string, error) {
-	return neat.NewOutputProcessor(true, true, &map[string]colorful.Color{
+func yamlStringInGreenishColors(input interface{}, useIndentLines bool) (string, error) {
+	return neat.NewOutputProcessor(useIndentLines, true, &map[string]colorful.Color{
 		"keyColor":           bunt.Green,
 		"indentLineColor":    {R: 0, G: 0.2, B: 0},
 		"scalarDefaultColor": bunt.LimeGreen,
diff --git a/pkg/dyff/output_human.go b/pkg/dyff/output_human.go
@@ -53,6 +53,7 @@ type stringWriter interface {
 type HumanReport struct {
 	Report
 	Indent                int
+	UseIndentLines        bool
 	MinorChangeThreshold  float64
 	MultilineContextLines int
 	NoTableStyle          bool
@@ -184,7 +185,7 @@ func (report *HumanReport) generateHumanDetailOutputAddition(detail Detail) (str
 	}
 
 	ytbx.RestructureObject(detail.To)
-	yamlOutput, err := yamlStringInGreenishColors(detail.To)
+	yamlOutput, err := yamlStringInGreenishColors(detail.To, report.UseIndentLines)
 	if err != nil {
 		return "", err
 	}
@@ -214,7 +215,7 @@ func (report *HumanReport) generateHumanDetailOutputRemoval(detail Detail) (stri
 	}
 
 	ytbx.RestructureObject(detail.From)
-	yamlOutput, err := yamlStringInRedishColors(detail.From)
+	yamlOutput, err := yamlStringInRedishColors(detail.From, report.UseIndentLines)
 	if err != nil {
 		return "", err
 	}

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ type stringWriter interface {`
`53`	`53`	`type HumanReport struct {`
`54`	`54`	`Report`
`55`	`55`	`Indent int`
	`56`	`+ UseIndentLines bool`
`56`	`57`	`MinorChangeThreshold float64`
`57`	`58`	`MultilineContextLines int`
`58`	`59`	`NoTableStyle bool`
`@@ -184,7 +185,7 @@ func (report *HumanReport) generateHumanDetailOutputAddition(detail Detail) (str`
`184`	`185`	`}`
`185`	`186`
`186`	`187`	`ytbx.RestructureObject(detail.To)`
`187`		`- yamlOutput, err := yamlStringInGreenishColors(detail.To)`
	`188`	`+ yamlOutput, err := yamlStringInGreenishColors(detail.To, report.UseIndentLines)`
`188`	`189`	`if err != nil {`
`189`	`190`	`return "", err`
`190`	`191`	`}`
`@@ -214,7 +215,7 @@ func (report *HumanReport) generateHumanDetailOutputRemoval(detail Detail) (stri`
`214`	`215`	`}`
`215`	`216`
`216`	`217`	`ytbx.RestructureObject(detail.From)`
`217`		`- yamlOutput, err := yamlStringInRedishColors(detail.From)`
	`218`	`+ yamlOutput, err := yamlStringInRedishColors(detail.From, report.UseIndentLines)`
`218`	`219`	`if err != nil {`
`219`	`220`	`return "", err`
`220`	`221`	`}`