update gop to support MaxDepth

ysmood · ysmood · commit 43df43d99abc · 2025-11-04T03:41:04.000+09:00
diff --git a/assertions_error.go b/assertions_error.go
@@ -95,9 +95,9 @@ type defaultAssertionError struct {
 }
 
 // NewDefaultAssertionError handler
-func NewDefaultAssertionError(theme gop.Theme, diffTheme diff.Theme) AssertionError {
+func NewDefaultAssertionError(maxDepth int, theme gop.Theme, diffTheme diff.Theme) AssertionError {
 	f := func(v interface{}) string {
-		return gop.Format(gop.Tokenize(v), theme)
+		return gop.Format(gop.TokenizeWithOptions(v, gop.Options{MaxDepth: maxDepth}), theme)
 	}
 
 	k := func(s string) string {
diff --git a/assertions_test.go b/assertions_test.go
@@ -94,7 +94,7 @@ func TestAssertion(t *testing.T) {
 func TestAssertionErr(t *testing.T) {
 	m := &mock{t: t}
 	as := got.New(m)
-	as.Assertions.ErrorHandler = got.NewDefaultAssertionError(gop.ThemeNone, nil)
+	as.Assertions.ErrorHandler = got.NewDefaultAssertionError(15, gop.ThemeNone, nil)
 
 	type data struct {
 		A int
diff --git a/go.mod b/go.mod
@@ -2,4 +2,4 @@ module github.com/ysmood/got
 
 go 1.21
 
-require github.com/ysmood/gop v0.2.0
+require github.com/ysmood/gop v0.3.0
diff --git a/go.sum b/go.sum
@@ -1,2 +1,2 @@
-github.com/ysmood/gop v0.2.0 h1:+tFrG0TWPxT6p9ZaZs+VY+opCvHU8/3Fk6BaNv6kqKg=
-github.com/ysmood/gop v0.2.0/go.mod h1:rr5z2z27oGEbyB787hpEcx4ab8cCiPnKxn0SUHt6xzk=
+github.com/ysmood/gop v0.3.0 h1:b/t6tbGSIaSqfnhb1R6Xkye4ZkINfKiUxYZF33JEZWU=
+github.com/ysmood/gop v0.3.0/go.mod h1:K4LAB/BdLArknXrVSy+DyXcfb8P85JwAtwYM8zlb0mU=
diff --git a/go.work.sum b/go.work.sum
@@ -2,4 +2,5 @@ github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
+github.com/ysmood/gop v0.2.0/go.mod h1:rr5z2z27oGEbyB787hpEcx4ab8cCiPnKxn0SUHt6xzk=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
diff --git a/got.go b/got.go
@@ -53,7 +53,7 @@ func T(t Testable) G {
 
 // New G instance
 func New(t Testable) G {
-	eh := NewDefaultAssertionError(gop.ThemeDefault, diff.ThemeDefault)
+	eh := NewDefaultAssertionError(15, gop.ThemeDefault, diff.ThemeDefault)
 
 	g := G{
 		t,
diff --git a/lib/diff/format_test.go b/lib/diff/format_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 var setup = got.Setup(func(g got.G) {
-	g.ErrorHandler = got.NewDefaultAssertionError(nil, nil)
+	g.ErrorHandler = got.NewDefaultAssertionError(15, nil, nil)
 })
 
 func split(s string) []string { return strings.Split(s, "") }
diff --git a/lib/example/06_customize_assertion_output_test.go b/lib/example/06_customize_assertion_output_test.go
@@ -13,7 +13,7 @@ import (
 func TestCustomizeAssertionOutput(t *testing.T) {
 	g := got.New(t)
 
-	dh := got.NewDefaultAssertionError(gop.ThemeDefault, diff.ThemeDefault)
+	dh := got.NewDefaultAssertionError(10, gop.ThemeDefault, diff.ThemeDefault)
 	h := got.AssertionErrorReport(func(c *got.AssertionCtx) string {
 		if c.Type == got.AssertionEq {
 			return fmt.Sprintf("%v != %v", c.Details[0], c.Details[1])
diff --git a/lib/lcs/lcs_test.go b/lib/lcs/lcs_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 var setup = got.Setup(func(g got.G) {
-	g.ErrorHandler = got.NewDefaultAssertionError(nil, nil)
+	g.ErrorHandler = got.NewDefaultAssertionError(15, nil, nil)
 })
 
 func TestLCS(t *testing.T) {
diff --git a/snapshots_test.go b/snapshots_test.go
@@ -35,7 +35,7 @@ func TestSnapshots(t *testing.T) {
 	g.Has(m.msg, "diff chunk")
 	m.reset()
 
-	gm.ErrorHandler = got.NewDefaultAssertionError(gop.ThemeNone, nil)
+	gm.ErrorHandler = got.NewDefaultAssertionError(15, gop.ThemeNone, nil)
 	gm.Snapshot("a", "no")
 	m.checkWithStyle(true, `"no" ⦗not ==⦘ "ok"`)
 }

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,9 @@ type defaultAssertionError struct {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`// NewDefaultAssertionError handler`
`98`		`-func NewDefaultAssertionError(theme gop.Theme, diffTheme diff.Theme) AssertionError {`
	`98`	`+func NewDefaultAssertionError(maxDepth int, theme gop.Theme, diffTheme diff.Theme) AssertionError {`
`99`	`99`	`f := func(v interface{}) string {`
`100`		`- return gop.Format(gop.Tokenize(v), theme)`
	`100`	`+ return gop.Format(gop.TokenizeWithOptions(v, gop.Options{MaxDepth: maxDepth}), theme)`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`k := func(s string) string {`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ module github.com/ysmood/got`
`2`	`2`
`3`	`3`	`go 1.21`
`4`	`4`
`5`		`-require github.com/ysmood/gop v0.2.0`
	`5`	`+require github.com/ysmood/gop v0.3.0`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var setup = got.Setup(func(g got.G) {`
`15`		`- g.ErrorHandler = got.NewDefaultAssertionError(nil, nil)`
	`15`	`+ g.ErrorHandler = got.NewDefaultAssertionError(15, nil, nil)`
`16`	`16`	`})`
`17`	`17`
`18`	`18`	`func split(s string) []string { return strings.Split(s, "") }`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`var setup = got.Setup(func(g got.G) {`
`16`		`- g.ErrorHandler = got.NewDefaultAssertionError(nil, nil)`
	`16`	`+ g.ErrorHandler = got.NewDefaultAssertionError(15, nil, nil)`
`17`	`17`	`})`
`18`	`18`
`19`	`19`	`func TestLCS(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func TestSnapshots(t *testing.T) {`
`35`	`35`	`g.Has(m.msg, "diff chunk")`
`36`	`36`	`m.reset()`
`37`	`37`
`38`		`- gm.ErrorHandler = got.NewDefaultAssertionError(gop.ThemeNone, nil)`
	`38`	`+ gm.ErrorHandler = got.NewDefaultAssertionError(15, gop.ThemeNone, nil)`
`39`	`39`	`gm.Snapshot("a", "no")`
`40`	`40`	m.checkWithStyle(true, `"no" ⦗not ==⦘ "ok"`)
`41`	`41`	`}`