From 7de40d99cf8197b51a5c3f169292c98b04af6fbc Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 2 Jun 2025 18:02:42 -0300 Subject: [PATCH 01/64] chore: having some fun with the `go-udiff` package --- go.mod | 1 + go.sum | 4 +- internal/exp/diff/diff.go | 1 + .../DefaultContextLines/Content.golden | 11 +++ .../DefaultContextLines/JSON.golden | 40 ++++++++ .../DefaultContextLinesPlusOne/Content.golden | 12 +++ .../DefaultContextLinesPlusOne/JSON.golden | 44 +++++++++ .../DefaultContextLinesPlusTwo/Content.golden | 13 +++ .../DefaultContextLinesPlusTwo/JSON.golden | 48 ++++++++++ .../diff/testdata/TestUdiff/Unified.golden | 11 +++ internal/exp/diff/udiff_test.go | 92 +++++++++++++++++++ 11 files changed, 275 insertions(+), 2 deletions(-) create mode 100644 internal/exp/diff/diff.go create mode 100644 internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/Content.golden create mode 100644 internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/JSON.golden create mode 100644 internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/Content.golden create mode 100644 internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/JSON.golden create mode 100644 internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/Content.golden create mode 100644 internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/JSON.golden create mode 100644 internal/exp/diff/testdata/TestUdiff/Unified.golden create mode 100644 internal/exp/diff/udiff_test.go diff --git a/go.mod b/go.mod index 82994450a85848a8b1be260b8d1611dec023ac1d..866c30da7e92eefaad23d3fd715bed3533e5f9f4 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,7 @@ require ( github.com/charmbracelet/glamour v0.9.1 github.com/charmbracelet/lipgloss v1.1.0 github.com/charmbracelet/x/ansi v0.8.0 + github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb github.com/fsnotify/fsnotify v1.8.0 github.com/go-logfmt/logfmt v0.6.0 github.com/google/uuid v1.6.0 diff --git a/go.sum b/go.sum index 8b7e307442ad96a69ff3471fe8164a1ba2a46e8a..3c742d185d7cf35460c7e1dc3d321e2f91013d41 100644 --- a/go.sum +++ b/go.sum @@ -82,8 +82,8 @@ github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2ll github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q= github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8= github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= -github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ= -github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U= +github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb h1:GT/STWThMsrOfYQnhnIPb165e/g1waAp0gNMFvEO6WI= +github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb/go.mod h1:929X+xY3LeoOZrDWIBVZcx/zyS0CYtyLiUIvE4VbKC0= github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= diff --git a/internal/exp/diff/diff.go b/internal/exp/diff/diff.go new file mode 100644 index 0000000000000000000000000000000000000000..f8689a22b662733cb979bd47da00b4c2a7828625 --- /dev/null +++ b/internal/exp/diff/diff.go @@ -0,0 +1 @@ +package diff diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/Content.golden b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/Content.golden new file mode 100644 index 0000000000000000000000000000000000000000..b0d3d504a4dc9e8aabb220d7b03f699e7286e765 --- /dev/null +++ b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/Content.golden @@ -0,0 +1,11 @@ +--- main.go ++++ main.go +@@ -5,5 +5,6 @@ + ) + + func main() { +- fmt.Println("Hello, World!") ++ content := "Hello, World!" ++ fmt.Println(content) + } +\ No newline at end of file diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/JSON.golden b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/JSON.golden new file mode 100644 index 0000000000000000000000000000000000000000..dc02fd23ed304cfcf868dd661f685ad7dbb6754f --- /dev/null +++ b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/JSON.golden @@ -0,0 +1,40 @@ +{ + "From": "main.go", + "To": "main.go", + "Hunks": [ + { + "FromLine": 5, + "ToLine": 5, + "Lines": [ + { + "Kind": 2, + "Content": "\t)\n" + }, + { + "Kind": 2, + "Content": "\n" + }, + { + "Kind": 2, + "Content": "\tfunc main() {\n" + }, + { + "Kind": 0, + "Content": "\t\tfmt.Println(\"Hello, World!\")\n" + }, + { + "Kind": 1, + "Content": "\t\tcontent := \"Hello, World!\"\n" + }, + { + "Kind": 1, + "Content": "\t\tfmt.Println(content)\n" + }, + { + "Kind": 2, + "Content": "\t}" + } + ] + } + ] +} diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/Content.golden b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/Content.golden new file mode 100644 index 0000000000000000000000000000000000000000..95ab1aca68b72158f829ef6391dc30771e3ace52 --- /dev/null +++ b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/Content.golden @@ -0,0 +1,12 @@ +--- main.go ++++ main.go +@@ -4,6 +4,7 @@ + "fmt" + ) + + func main() { +- fmt.Println("Hello, World!") ++ content := "Hello, World!" ++ fmt.Println(content) + } +\ No newline at end of file diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/JSON.golden b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/JSON.golden new file mode 100644 index 0000000000000000000000000000000000000000..20adf2e182705257388d13baba06198367f4c9b7 --- /dev/null +++ b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/JSON.golden @@ -0,0 +1,44 @@ +{ + "From": "main.go", + "To": "main.go", + "Hunks": [ + { + "FromLine": 4, + "ToLine": 4, + "Lines": [ + { + "Kind": 2, + "Content": "\t\t\"fmt\"\n" + }, + { + "Kind": 2, + "Content": "\t)\n" + }, + { + "Kind": 2, + "Content": "\n" + }, + { + "Kind": 2, + "Content": "\tfunc main() {\n" + }, + { + "Kind": 0, + "Content": "\t\tfmt.Println(\"Hello, World!\")\n" + }, + { + "Kind": 1, + "Content": "\t\tcontent := \"Hello, World!\"\n" + }, + { + "Kind": 1, + "Content": "\t\tfmt.Println(content)\n" + }, + { + "Kind": 2, + "Content": "\t}" + } + ] + } + ] +} diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/Content.golden b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/Content.golden new file mode 100644 index 0000000000000000000000000000000000000000..01b92d2512090f1ff2ea624c31fbeb1cae9235b4 --- /dev/null +++ b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/Content.golden @@ -0,0 +1,13 @@ +--- main.go ++++ main.go +@@ -3,7 +3,8 @@ + import ( + "fmt" + ) + + func main() { +- fmt.Println("Hello, World!") ++ content := "Hello, World!" ++ fmt.Println(content) + } +\ No newline at end of file diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/JSON.golden b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/JSON.golden new file mode 100644 index 0000000000000000000000000000000000000000..2f0df7c1703ffa1ddc929265be0770d29ec2aec3 --- /dev/null +++ b/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/JSON.golden @@ -0,0 +1,48 @@ +{ + "From": "main.go", + "To": "main.go", + "Hunks": [ + { + "FromLine": 3, + "ToLine": 3, + "Lines": [ + { + "Kind": 2, + "Content": "\timport (\n" + }, + { + "Kind": 2, + "Content": "\t\t\"fmt\"\n" + }, + { + "Kind": 2, + "Content": "\t)\n" + }, + { + "Kind": 2, + "Content": "\n" + }, + { + "Kind": 2, + "Content": "\tfunc main() {\n" + }, + { + "Kind": 0, + "Content": "\t\tfmt.Println(\"Hello, World!\")\n" + }, + { + "Kind": 1, + "Content": "\t\tcontent := \"Hello, World!\"\n" + }, + { + "Kind": 1, + "Content": "\t\tfmt.Println(content)\n" + }, + { + "Kind": 2, + "Content": "\t}" + } + ] + } + ] +} diff --git a/internal/exp/diff/testdata/TestUdiff/Unified.golden b/internal/exp/diff/testdata/TestUdiff/Unified.golden new file mode 100644 index 0000000000000000000000000000000000000000..b0d3d504a4dc9e8aabb220d7b03f699e7286e765 --- /dev/null +++ b/internal/exp/diff/testdata/TestUdiff/Unified.golden @@ -0,0 +1,11 @@ +--- main.go ++++ main.go +@@ -5,5 +5,6 @@ + ) + + func main() { +- fmt.Println("Hello, World!") ++ content := "Hello, World!" ++ fmt.Println(content) + } +\ No newline at end of file diff --git a/internal/exp/diff/udiff_test.go b/internal/exp/diff/udiff_test.go new file mode 100644 index 0000000000000000000000000000000000000000..65977ae047aad25551a65957d6ea919ae59da618 --- /dev/null +++ b/internal/exp/diff/udiff_test.go @@ -0,0 +1,92 @@ +package diff_test + +import ( + "bytes" + "encoding/json" + "testing" + + "github.com/aymanbagabas/go-udiff" + "github.com/aymanbagabas/go-udiff/myers" + "github.com/charmbracelet/x/exp/golden" +) + +func TestUdiff(t *testing.T) { + before := `package main + + import ( + "fmt" + ) + + func main() { + fmt.Println("Hello, World!") + }` + + after := `package main + + import ( + "fmt" + ) + + func main() { + content := "Hello, World!" + fmt.Println(content) + }` + + t.Run("Unified", func(t *testing.T) { + content := udiff.Unified("main.go", "main.go", before, after) + golden.RequireEqual(t, []byte(content)) + }) + + t.Run("ToUnifiedDiff", func(t *testing.T) { + toUnifiedDiff := func(t *testing.T, before, after string, contextLines int) udiff.UnifiedDiff { + edits := myers.ComputeEdits(before, after) + unifiedDiff, err := udiff.ToUnifiedDiff("main.go", "main.go", before, edits, contextLines) + if err != nil { + t.Fatalf("ToUnifiedDiff failed: %v", err) + } + return unifiedDiff + } + toJSON := func(t *testing.T, unifiedDiff udiff.UnifiedDiff) []byte { + var buff bytes.Buffer + encoder := json.NewEncoder(&buff) + encoder.SetIndent("", " ") + if err := encoder.Encode(unifiedDiff); err != nil { + t.Fatalf("Failed to encode unified diff: %v", err) + } + return buff.Bytes() + } + + t.Run("DefaultContextLines", func(t *testing.T) { + unifiedDiff := toUnifiedDiff(t, before, after, udiff.DefaultContextLines) + + t.Run("Content", func(t *testing.T) { + golden.RequireEqual(t, []byte(unifiedDiff.String())) + }) + t.Run("JSON", func(t *testing.T) { + golden.RequireEqual(t, toJSON(t, unifiedDiff)) + }) + }) + + t.Run("DefaultContextLinesPlusOne", func(t *testing.T) { + unifiedDiff := toUnifiedDiff(t, before, after, udiff.DefaultContextLines+1) + + t.Run("Content", func(t *testing.T) { + golden.RequireEqual(t, []byte(unifiedDiff.String())) + }) + t.Run("JSON", func(t *testing.T) { + golden.RequireEqual(t, toJSON(t, unifiedDiff)) + }) + }) + + t.Run("DefaultContextLinesPlusTwo", func(t *testing.T) { + unifiedDiff := toUnifiedDiff(t, before, after, udiff.DefaultContextLines+2) + + t.Run("Content", func(t *testing.T) { + golden.RequireEqual(t, []byte(unifiedDiff.String())) + }) + t.Run("JSON", func(t *testing.T) { + golden.RequireEqual(t, toJSON(t, unifiedDiff)) + }) + }) + }) +} From a7943ac1d1cf89b992c6d1b030e376aae949ccfc Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 3 Jun 2025 13:44:30 -0300 Subject: [PATCH 02/64] refactor: rename package `diff` to `diffview` --- internal/exp/diff/diff.go | 1 - internal/exp/diffview/diffview.go | 1 + .../TestUdiff/ToUnifiedDiff/DefaultContextLines/Content.golden | 0 .../TestUdiff/ToUnifiedDiff/DefaultContextLines/JSON.golden | 0 .../ToUnifiedDiff/DefaultContextLinesPlusOne/Content.golden | 0 .../ToUnifiedDiff/DefaultContextLinesPlusOne/JSON.golden | 0 .../ToUnifiedDiff/DefaultContextLinesPlusTwo/Content.golden | 0 .../ToUnifiedDiff/DefaultContextLinesPlusTwo/JSON.golden | 0 .../exp/{diff => diffview}/testdata/TestUdiff/Unified.golden | 0 internal/exp/{diff => diffview}/udiff_test.go | 2 +- 10 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 internal/exp/diff/diff.go create mode 100644 internal/exp/diffview/diffview.go rename internal/exp/{diff => diffview}/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/Content.golden (100%) rename internal/exp/{diff => diffview}/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/JSON.golden (100%) rename internal/exp/{diff => diffview}/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/Content.golden (100%) rename internal/exp/{diff => diffview}/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/JSON.golden (100%) rename internal/exp/{diff => diffview}/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/Content.golden (100%) rename internal/exp/{diff => diffview}/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/JSON.golden (100%) rename internal/exp/{diff => diffview}/testdata/TestUdiff/Unified.golden (100%) rename internal/exp/{diff => diffview}/udiff_test.go (99%) diff --git a/internal/exp/diff/diff.go b/internal/exp/diff/diff.go deleted file mode 100644 index f8689a22b662733cb979bd47da00b4c2a7828625..0000000000000000000000000000000000000000 --- a/internal/exp/diff/diff.go +++ /dev/null @@ -1 +0,0 @@ -package diff diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go new file mode 100644 index 0000000000000000000000000000000000000000..5bf12488f6eb960702f10ffafd8c7f58e608c06b --- /dev/null +++ b/internal/exp/diffview/diffview.go @@ -0,0 +1 @@ +package diffview diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/Content.golden b/internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/Content.golden similarity index 100% rename from internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/Content.golden rename to internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/Content.golden diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/JSON.golden b/internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/JSON.golden similarity index 100% rename from internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/JSON.golden rename to internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLines/JSON.golden diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/Content.golden b/internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/Content.golden similarity index 100% rename from internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/Content.golden rename to internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/Content.golden diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/JSON.golden b/internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/JSON.golden similarity index 100% rename from internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/JSON.golden rename to internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusOne/JSON.golden diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/Content.golden b/internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/Content.golden similarity index 100% rename from internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/Content.golden rename to internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/Content.golden diff --git a/internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/JSON.golden b/internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/JSON.golden similarity index 100% rename from internal/exp/diff/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/JSON.golden rename to internal/exp/diffview/testdata/TestUdiff/ToUnifiedDiff/DefaultContextLinesPlusTwo/JSON.golden diff --git a/internal/exp/diff/testdata/TestUdiff/Unified.golden b/internal/exp/diffview/testdata/TestUdiff/Unified.golden similarity index 100% rename from internal/exp/diff/testdata/TestUdiff/Unified.golden rename to internal/exp/diffview/testdata/TestUdiff/Unified.golden diff --git a/internal/exp/diff/udiff_test.go b/internal/exp/diffview/udiff_test.go similarity index 99% rename from internal/exp/diff/udiff_test.go rename to internal/exp/diffview/udiff_test.go index 65977ae047aad25551a65957d6ea919ae59da618..d98b04e7dbf4870f354ea55592ecfba9186b2e37 100644 --- a/internal/exp/diff/udiff_test.go +++ b/internal/exp/diffview/udiff_test.go @@ -1,4 +1,4 @@ -package diff_test +package diffview_test import ( "bytes" From 1f98b24fab6b16ebbca9100412f1177e870a37f2 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 3 Jun 2025 15:01:34 -0300 Subject: [PATCH 03/64] feat(diffview): getting started with the api design --- go.mod | 5 +- go.sum | 10 +- internal/exp/diffview/diffview.go | 124 ++++++++++++++++++ internal/exp/diffview/diffview_test.go | 15 +++ .../exp/diffview/testdata/TestDefault.golden | 7 + 5 files changed, 155 insertions(+), 6 deletions(-) create mode 100644 internal/exp/diffview/diffview_test.go create mode 100644 internal/exp/diffview/testdata/TestDefault.golden diff --git a/go.mod b/go.mod index 866c30da7e92eefaad23d3fd715bed3533e5f9f4..1db1275fadeeac9c8cc2033b1c689a843e41d8a5 100644 --- a/go.mod +++ b/go.mod @@ -15,6 +15,7 @@ require ( github.com/charmbracelet/bubbletea v1.3.5 github.com/charmbracelet/glamour v0.9.1 github.com/charmbracelet/lipgloss v1.1.0 + github.com/charmbracelet/lipgloss/v2 v2.0.0-beta1 github.com/charmbracelet/x/ansi v0.8.0 github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb github.com/fsnotify/fsnotify v1.8.0 @@ -59,8 +60,8 @@ require ( github.com/aws/smithy-go v1.20.3 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/aymerick/douceur v0.2.0 // indirect - github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect - github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect + github.com/charmbracelet/colorprofile v0.3.0 // indirect + github.com/charmbracelet/x/cellbuf v0.0.13 // indirect github.com/charmbracelet/x/term v0.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/disintegration/imaging v1.6.2 diff --git a/go.sum b/go.sum index 3c742d185d7cf35460c7e1dc3d321e2f91013d41..3aff4dea3db17367f337812636de7f5431e1ff3f 100644 --- a/go.sum +++ b/go.sum @@ -72,16 +72,18 @@ github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg= github.com/charmbracelet/bubbletea v1.3.5 h1:JAMNLTbqMOhSwoELIr0qyP4VidFq72/6E9j7HHmRKQc= github.com/charmbracelet/bubbletea v1.3.5/go.mod h1:TkCnmH+aBd4LrXhXcqrKiYwRs7qyQx5rBgH5fVY3v54= -github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= -github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= +github.com/charmbracelet/colorprofile v0.3.0 h1:KtLh9uuu1RCt+Hml4s6Hz+kB1PfV3wi++1h5ia65yKQ= +github.com/charmbracelet/colorprofile v0.3.0/go.mod h1:oHJ340RS2nmG1zRGPmhJKJ/jf4FPNNk0P39/wBPA1G0= github.com/charmbracelet/glamour v0.9.1 h1:11dEfiGP8q1BEqvGoIjivuc2rBk+5qEXdPtaQ2WoiCM= github.com/charmbracelet/glamour v0.9.1/go.mod h1:+SHvIS8qnwhgTpVMiXwn7OfGomSqff1cHBCI8jLOetk= github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= +github.com/charmbracelet/lipgloss/v2 v2.0.0-beta1 h1:SOylT6+BQzPHEjn15TIzawBPVD0QmhKXbcb3jY0ZIKU= +github.com/charmbracelet/lipgloss/v2 v2.0.0-beta1/go.mod h1:tRlx/Hu0lo/j9viunCN2H+Ze6JrmdjQlXUQvvArgaOc= github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE= github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q= -github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8= -github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= +github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k= +github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb h1:GT/STWThMsrOfYQnhnIPb165e/g1waAp0gNMFvEO6WI= github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb/go.mod h1:929X+xY3LeoOZrDWIBVZcx/zyS0CYtyLiUIvE4VbKC0= github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 5bf12488f6eb960702f10ffafd8c7f58e608c06b..b4949c1be2ea2d15ba0829e4a686e020cd9c5a45 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -1 +1,125 @@ package diffview + +import ( + "github.com/aymanbagabas/go-udiff" + "github.com/aymanbagabas/go-udiff/myers" + "github.com/charmbracelet/lipgloss/v2" +) + +type file struct { + path string + content string +} + +type layout int + +const ( + layoutUnified layout = iota + 1 + layoutSplit +) + +// DiffView represents a view for displaying differences between two files. +type DiffView struct { + layout layout + before file + after file + contextLines int + baseStyle lipgloss.Style + highlight bool + height int + width int + + isComputed bool + err error + unified udiff.UnifiedDiff + edits []udiff.Edit +} + +// New creates a new DiffView with default settings. +func New() *DiffView { + return &DiffView{ + layout: layoutUnified, + contextLines: udiff.DefaultContextLines, + } +} + +// Unified sets the layout of the DiffView to unified. +func (dv *DiffView) Unified() *DiffView { + dv.layout = layoutUnified + return dv +} + +// Split sets the layout of the DiffView to split (side-by-side). +func (dv *DiffView) Split() *DiffView { + dv.layout = layoutSplit + return dv +} + +// Before sets the "before" file for the DiffView. +func (dv *DiffView) Before(path, content string) *DiffView { + dv.before = file{path: path, content: content} + return dv +} + +// After sets the "after" file for the DiffView. +func (dv *DiffView) After(path, content string) *DiffView { + dv.after = file{path: path, content: content} + return dv +} + +// ContextLines sets the number of context lines for the DiffView. +func (dv *DiffView) ContextLines(contextLines int) *DiffView { + dv.contextLines = contextLines + return dv +} + +// BaseStyle sets the base style for the DiffView. +// This is useful for setting a custom background color, for example. +func (dv *DiffView) BaseStyle(baseStyle lipgloss.Style) *DiffView { + dv.baseStyle = baseStyle + return dv +} + +// SyntaxHighlight sets whether to enable syntax highlighting in the DiffView. +func (dv *DiffView) SyntaxHighlight(highlight bool) *DiffView { + dv.highlight = highlight + return dv +} + +// Height sets the height of the DiffView. +func (dv *DiffView) Height(height int) *DiffView { + dv.height = height + return dv +} + +// Width sets the width of the DiffView. +func (dv *DiffView) Width(width int) *DiffView { + dv.width = width + return dv +} + +// String returns the string representation of the DiffView. +func (dv *DiffView) String() string { + if !dv.isComputed { + dv.compute() + } + if dv.err != nil { + return dv.err.Error() + } + return dv.unified.String() +} + +func (dv *DiffView) compute() { + dv.isComputed = true + dv.edits = myers.ComputeEdits( + dv.before.content, + dv.after.content, + ) + dv.unified, dv.err = udiff.ToUnifiedDiff( + dv.before.path, + dv.after.path, + dv.before.content, + dv.edits, + dv.contextLines, + ) +} diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go new file mode 100644 index 0000000000000000000000000000000000000000..b04adacccc9e78461377dacc2c8c39a763c70c27 --- /dev/null +++ b/internal/exp/diffview/diffview_test.go @@ -0,0 +1,15 @@ +package diffview_test + +import ( + "testing" + + "github.com/charmbracelet/x/exp/golden" + "github.com/opencode-ai/opencode/internal/exp/diffview" +) + +func TestDefault(t *testing.T) { + dv := diffview.New(). + Before("test.txt", "This is the original content."). + After("test.txt", "This is the modified content.") + golden.RequireEqual(t, []byte(dv.String())) +} diff --git a/internal/exp/diffview/testdata/TestDefault.golden b/internal/exp/diffview/testdata/TestDefault.golden new file mode 100644 index 0000000000000000000000000000000000000000..2ef961a2191b5195f5dadbea21350e370ba5c426 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDefault.golden @@ -0,0 +1,7 @@ +--- test.txt ++++ test.txt +@@ -1 +1 @@ +-This is the original content. +\ No newline at end of file ++This is the modified content. +\ No newline at end of file From b7ab1a8091421b7ea05a47f36ec31e1e7b8765d7 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 4 Jun 2025 14:23:34 -0300 Subject: [PATCH 04/64] feat(diffview): basic working functionality --- go.mod | 2 + go.sum | 2 + internal/exp/diffview/diffview.go | 118 ++++++++++++++++-- internal/exp/diffview/diffview_test.go | 22 +++- .../exp/diffview/testdata/TestDefault.after | 10 ++ .../exp/diffview/testdata/TestDefault.before | 9 ++ .../exp/diffview/testdata/TestDefault.golden | 7 -- .../testdata/TestDefault/DarkMode.golden | 7 ++ .../testdata/TestDefault/LightMode.golden | 7 ++ 9 files changed, 162 insertions(+), 22 deletions(-) create mode 100644 internal/exp/diffview/testdata/TestDefault.after create mode 100644 internal/exp/diffview/testdata/TestDefault.before delete mode 100644 internal/exp/diffview/testdata/TestDefault.golden create mode 100644 internal/exp/diffview/testdata/TestDefault/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDefault/LightMode.golden diff --git a/go.mod b/go.mod index 1db1275fadeeac9c8cc2033b1c689a843e41d8a5..bc13eef3e2a293e915c44042f5577be4bf51ac2b 100644 --- a/go.mod +++ b/go.mod @@ -35,6 +35,8 @@ require ( github.com/stretchr/testify v1.10.0 ) +require github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444 + require ( cloud.google.com/go v0.116.0 // indirect cloud.google.com/go/auth v0.13.0 // indirect diff --git a/go.sum b/go.sum index 3aff4dea3db17367f337812636de7f5431e1ff3f..f3108274b2726806d9f1548f1b9a22374422e320 100644 --- a/go.sum +++ b/go.sum @@ -84,6 +84,8 @@ github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2ll github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q= github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k= github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= +github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444 h1:IJDiTgVE56gkAGfq0lBEloWgkXMk4hl/bmuPoicI4R0= +github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444/go.mod h1:T9jr8CzFpjhFVHjNjKwbAD7KwBNyFnj2pntAO7F2zw0= github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb h1:GT/STWThMsrOfYQnhnIPb165e/g1waAp0gNMFvEO6WI= github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb/go.mod h1:929X+xY3LeoOZrDWIBVZcx/zyS0CYtyLiUIvE4VbKC0= github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index b4949c1be2ea2d15ba0829e4a686e020cd9c5a45..12a764b26784325999ed80fd5f53d08a45857794 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -1,11 +1,18 @@ package diffview import ( + "os" + "strings" + "github.com/aymanbagabas/go-udiff" "github.com/aymanbagabas/go-udiff/myers" "github.com/charmbracelet/lipgloss/v2" + "github.com/charmbracelet/x/ansi" + "github.com/charmbracelet/x/exp/charmtone" ) +const leadingSymbolsSize = 2 + type file struct { path string content string @@ -18,16 +25,60 @@ const ( layoutSplit ) +type Style struct { + Base lipgloss.Style + InsertLine lipgloss.Style + InsertSymbols lipgloss.Style + DeleteLine lipgloss.Style + DeleteSymbols lipgloss.Style +} + +var DefaultLightStyle = Style{ + Base: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(charmtone.Salt), + InsertLine: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(lipgloss.Color("#e8f5e9")), + InsertSymbols: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#e8f5e9")), + DeleteLine: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(lipgloss.Color("#ffebee")), + DeleteSymbols: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#ffebee")), +} + +var DefaultDarkStyle = Style{ + Base: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(charmtone.Pepper), + InsertLine: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(lipgloss.Color("#303a30")), + InsertSymbols: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#303a30")), + DeleteLine: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(lipgloss.Color("#3a3030")), + DeleteSymbols: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#3a3030")), +} + // DiffView represents a view for displaying differences between two files. type DiffView struct { layout layout before file after file contextLines int - baseStyle lipgloss.Style highlight bool height int width int + style Style isComputed bool err error @@ -37,10 +88,16 @@ type DiffView struct { // New creates a new DiffView with default settings. func New() *DiffView { - return &DiffView{ + dv := &DiffView{ layout: layoutUnified, contextLines: udiff.DefaultContextLines, } + if lipgloss.HasDarkBackground(os.Stdin, os.Stdout) { + dv.style = DefaultDarkStyle + } else { + dv.style = DefaultLightStyle + } + return dv } // Unified sets the layout of the DiffView to unified. @@ -73,10 +130,9 @@ func (dv *DiffView) ContextLines(contextLines int) *DiffView { return dv } -// BaseStyle sets the base style for the DiffView. -// This is useful for setting a custom background color, for example. -func (dv *DiffView) BaseStyle(baseStyle lipgloss.Style) *DiffView { - dv.baseStyle = baseStyle +// Style sets the style for the DiffView. +func (dv *DiffView) Style(style Style) *DiffView { + dv.style = style return dv } @@ -100,16 +156,39 @@ func (dv *DiffView) Width(width int) *DiffView { // String returns the string representation of the DiffView. func (dv *DiffView) String() string { - if !dv.isComputed { - dv.compute() + if err := dv.computeDiff(); err != nil { + return err.Error() } - if dv.err != nil { - return dv.err.Error() + dv.detectWidth() + + var b strings.Builder + + for _, h := range dv.unified.Hunks { + for _, l := range h.Lines { + content := strings.TrimSuffix(l.Content, "\n") + width := dv.width - leadingSymbolsSize + + switch l.Kind { + case udiff.Insert: + b.WriteString(dv.style.InsertSymbols.Render("+ ")) + b.WriteString(dv.style.InsertLine.Width(width).Render(content)) + case udiff.Delete: + b.WriteString(dv.style.DeleteSymbols.Render("- ")) + b.WriteString(dv.style.DeleteLine.Width(width).Render(content)) + case udiff.Equal: + b.WriteString(dv.style.Base.Width(width + leadingSymbolsSize).Render(" " + content)) + } + b.WriteRune('\n') + } } - return dv.unified.String() + + return b.String() } -func (dv *DiffView) compute() { +func (dv *DiffView) computeDiff() error { + if dv.isComputed { + return dv.err + } dv.isComputed = true dv.edits = myers.ComputeEdits( dv.before.content, @@ -122,4 +201,19 @@ func (dv *DiffView) compute() { dv.edits, dv.contextLines, ) + return dv.err +} + +func (dv *DiffView) detectWidth() { + if dv.width > 0 { + return + } + + for _, h := range dv.unified.Hunks { + for _, l := range h.Lines { + lineWidth := ansi.StringWidth(strings.TrimSuffix(l.Content, "\n")) + lineWidth += leadingSymbolsSize + dv.width = max(dv.width, lineWidth) + } + } } diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index b04adacccc9e78461377dacc2c8c39a763c70c27..bd70048a4c81ce260d2d569a3ee1e8fe8aa10e19 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -1,15 +1,31 @@ package diffview_test import ( + _ "embed" "testing" "github.com/charmbracelet/x/exp/golden" "github.com/opencode-ai/opencode/internal/exp/diffview" ) +//go:embed testdata/TestDefault.before +var TestDefaultBefore string + +//go:embed testdata/TestDefault.after +var TestDefaultAfter string + func TestDefault(t *testing.T) { dv := diffview.New(). - Before("test.txt", "This is the original content."). - After("test.txt", "This is the modified content.") - golden.RequireEqual(t, []byte(dv.String())) + Before("main.go", TestDefaultBefore). + After("main.go", TestDefaultAfter) + + t.Run("LightMode", func(t *testing.T) { + dv = dv.Style(diffview.DefaultLightStyle) + golden.RequireEqual(t, []byte(dv.String())) + }) + + t.Run("DarkMode", func(t *testing.T) { + dv = dv.Style(diffview.DefaultDarkStyle) + golden.RequireEqual(t, []byte(dv.String())) + }) } diff --git a/internal/exp/diffview/testdata/TestDefault.after b/internal/exp/diffview/testdata/TestDefault.after new file mode 100644 index 0000000000000000000000000000000000000000..f5cedbfb45f13c7e15835782ddfdc511adb769c0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDefault.after @@ -0,0 +1,10 @@ +package main + +import ( + "fmt" +) + +func main() { + content := "Hello, world!" + fmt.Println(content) +} diff --git a/internal/exp/diffview/testdata/TestDefault.before b/internal/exp/diffview/testdata/TestDefault.before new file mode 100644 index 0000000000000000000000000000000000000000..5dc991b75fcbbc9a47076de46349322816027e86 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDefault.before @@ -0,0 +1,9 @@ +package main + +import ( + "fmt" +) + +func main() { + fmt.Println("Hello, world!") +} diff --git a/internal/exp/diffview/testdata/TestDefault.golden b/internal/exp/diffview/testdata/TestDefault.golden deleted file mode 100644 index 2ef961a2191b5195f5dadbea21350e370ba5c426..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDefault.golden +++ /dev/null @@ -1,7 +0,0 @@ ---- test.txt -+++ test.txt -@@ -1 +1 @@ --This is the original content. -\ No newline at end of file -+This is the modified content. -\ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDefault/DarkMode.golden b/internal/exp/diffview/testdata/TestDefault/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..1cefd40f62dbe898b5d215a7d9b3e88fea8cb477 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDefault/DarkMode.golden @@ -0,0 +1,7 @@ + )  +   + func main() {  +-  fmt.Println("Hello, world!") ++  content := "Hello, world!"  ++  fmt.Println(content)  + }  diff --git a/internal/exp/diffview/testdata/TestDefault/LightMode.golden b/internal/exp/diffview/testdata/TestDefault/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..dffbc6071dea4f70e5534473aefdb02af7f0a389 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDefault/LightMode.golden @@ -0,0 +1,7 @@ + )  +   + func main() {  +-  fmt.Println("Hello, world!") ++  content := "Hello, world!"  ++  fmt.Println(content)  + }  From f8fc11edaccfcbde37bce5a9cd259b156f18dffb Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 4 Jun 2025 16:35:05 -0300 Subject: [PATCH 05/64] refactor(diffview): convert styles into a reusable `LineStyle` type --- internal/exp/diffview/diffview.go | 95 ++++++++++++++++++------------- 1 file changed, 55 insertions(+), 40 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 12a764b26784325999ed80fd5f53d08a45857794..40481539fdb0b233242dddd4990775abdacd982b 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -25,48 +25,63 @@ const ( layoutSplit ) +type LineStyle struct { + Symbol lipgloss.Style + Code lipgloss.Style +} + type Style struct { - Base lipgloss.Style - InsertLine lipgloss.Style - InsertSymbols lipgloss.Style - DeleteLine lipgloss.Style - DeleteSymbols lipgloss.Style + EqualLine LineStyle + InsertLine LineStyle + DeleteLine LineStyle } var DefaultLightStyle = Style{ - Base: lipgloss.NewStyle(). - Foreground(charmtone.Pepper). - Background(charmtone.Salt), - InsertLine: lipgloss.NewStyle(). - Foreground(charmtone.Pepper). - Background(lipgloss.Color("#e8f5e9")), - InsertSymbols: lipgloss.NewStyle(). - Foreground(charmtone.Turtle). - Background(lipgloss.Color("#e8f5e9")), - DeleteLine: lipgloss.NewStyle(). - Foreground(charmtone.Pepper). - Background(lipgloss.Color("#ffebee")), - DeleteSymbols: lipgloss.NewStyle(). - Foreground(charmtone.Cherry). - Background(lipgloss.Color("#ffebee")), + EqualLine: LineStyle{ + Code: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(charmtone.Salt), + }, + InsertLine: LineStyle{ + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#e8f5e9")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(lipgloss.Color("#e8f5e9")), + }, + DeleteLine: LineStyle{ + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#ffebee")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(lipgloss.Color("#ffebee")), + }, } var DefaultDarkStyle = Style{ - Base: lipgloss.NewStyle(). - Foreground(charmtone.Salt). - Background(charmtone.Pepper), - InsertLine: lipgloss.NewStyle(). - Foreground(charmtone.Salt). - Background(lipgloss.Color("#303a30")), - InsertSymbols: lipgloss.NewStyle(). - Foreground(charmtone.Turtle). - Background(lipgloss.Color("#303a30")), - DeleteLine: lipgloss.NewStyle(). - Foreground(charmtone.Salt). - Background(lipgloss.Color("#3a3030")), - DeleteSymbols: lipgloss.NewStyle(). - Foreground(charmtone.Cherry). - Background(lipgloss.Color("#3a3030")), + EqualLine: LineStyle{ + Code: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(charmtone.Pepper), + }, + InsertLine: LineStyle{ + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#303a30")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(lipgloss.Color("#303a30")), + }, + DeleteLine: LineStyle{ + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#3a3030")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(lipgloss.Color("#3a3030")), + }, } // DiffView represents a view for displaying differences between two files. @@ -170,13 +185,13 @@ func (dv *DiffView) String() string { switch l.Kind { case udiff.Insert: - b.WriteString(dv.style.InsertSymbols.Render("+ ")) - b.WriteString(dv.style.InsertLine.Width(width).Render(content)) + b.WriteString(dv.style.InsertLine.Symbol.Render("+ ")) + b.WriteString(dv.style.InsertLine.Code.Width(width).Render(content)) case udiff.Delete: - b.WriteString(dv.style.DeleteSymbols.Render("- ")) - b.WriteString(dv.style.DeleteLine.Width(width).Render(content)) + b.WriteString(dv.style.DeleteLine.Symbol.Render("- ")) + b.WriteString(dv.style.DeleteLine.Code.Width(width).Render(content)) case udiff.Equal: - b.WriteString(dv.style.Base.Width(width + leadingSymbolsSize).Render(" " + content)) + b.WriteString(dv.style.EqualLine.Code.Width(width + leadingSymbolsSize).Render(" " + content)) } b.WriteRune('\n') } From ab0c4ff7d016ffa1110a7ee13a4970d9a179dcd7 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 4 Jun 2025 17:43:46 -0300 Subject: [PATCH 06/64] feat(diffview): show line numbers on the left --- internal/exp/diffview/diffview.go | 109 +++++++----------- internal/exp/diffview/diffview_test.go | 17 +++ internal/exp/diffview/style.go | 96 +++++++++++++++ .../testdata/TestDefault/DarkMode.golden | 14 +-- .../testdata/TestDefault/LightMode.golden | 14 +-- .../TestNoLineNumbers/DarkMode.golden | 7 ++ .../TestNoLineNumbers/LightMode.golden | 7 ++ internal/exp/diffview/util.go | 14 +++ 8 files changed, 197 insertions(+), 81 deletions(-) create mode 100644 internal/exp/diffview/style.go create mode 100644 internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden create mode 100644 internal/exp/diffview/util.go diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 40481539fdb0b233242dddd4990775abdacd982b..2f3b1e7927adbbfd489d2fa8bff8ada82d55a9bb 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -2,13 +2,13 @@ package diffview import ( "os" + "strconv" "strings" "github.com/aymanbagabas/go-udiff" "github.com/aymanbagabas/go-udiff/myers" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" - "github.com/charmbracelet/x/exp/charmtone" ) const leadingSymbolsSize = 2 @@ -25,71 +25,13 @@ const ( layoutSplit ) -type LineStyle struct { - Symbol lipgloss.Style - Code lipgloss.Style -} - -type Style struct { - EqualLine LineStyle - InsertLine LineStyle - DeleteLine LineStyle -} - -var DefaultLightStyle = Style{ - EqualLine: LineStyle{ - Code: lipgloss.NewStyle(). - Foreground(charmtone.Pepper). - Background(charmtone.Salt), - }, - InsertLine: LineStyle{ - Symbol: lipgloss.NewStyle(). - Foreground(charmtone.Turtle). - Background(lipgloss.Color("#e8f5e9")), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Pepper). - Background(lipgloss.Color("#e8f5e9")), - }, - DeleteLine: LineStyle{ - Symbol: lipgloss.NewStyle(). - Foreground(charmtone.Cherry). - Background(lipgloss.Color("#ffebee")), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Pepper). - Background(lipgloss.Color("#ffebee")), - }, -} - -var DefaultDarkStyle = Style{ - EqualLine: LineStyle{ - Code: lipgloss.NewStyle(). - Foreground(charmtone.Salt). - Background(charmtone.Pepper), - }, - InsertLine: LineStyle{ - Symbol: lipgloss.NewStyle(). - Foreground(charmtone.Turtle). - Background(lipgloss.Color("#303a30")), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Salt). - Background(lipgloss.Color("#303a30")), - }, - DeleteLine: LineStyle{ - Symbol: lipgloss.NewStyle(). - Foreground(charmtone.Cherry). - Background(lipgloss.Color("#3a3030")), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Salt). - Background(lipgloss.Color("#3a3030")), - }, -} - // DiffView represents a view for displaying differences between two files. type DiffView struct { layout layout before file after file contextLines int + lineNumbers bool highlight bool height int width int @@ -106,6 +48,7 @@ func New() *DiffView { dv := &DiffView{ layout: layoutUnified, contextLines: udiff.DefaultContextLines, + lineNumbers: true, } if lipgloss.HasDarkBackground(os.Stdin, os.Stdout) { dv.style = DefaultDarkStyle @@ -151,8 +94,14 @@ func (dv *DiffView) Style(style Style) *DiffView { return dv } -// SyntaxHighlight sets whether to enable syntax highlighting in the DiffView. -func (dv *DiffView) SyntaxHighlight(highlight bool) *DiffView { +// LineNumbers sets whether to display line numbers in the DiffView. +func (dv *DiffView) LineNumbers(lineNumbers bool) *DiffView { + dv.lineNumbers = lineNumbers + return dv +} + +// SyntaxHightlight sets whether to enable syntax highlighting in the DiffView. +func (dv *DiffView) SyntaxHightlight(highlight bool) *DiffView { dv.highlight = highlight return dv } @@ -176,22 +125,48 @@ func (dv *DiffView) String() string { } dv.detectWidth() + lineNumberWidth := func(start, num int) int { + return len(strconv.Itoa(start + num)) + } + var b strings.Builder for _, h := range dv.unified.Hunks { + beforeLine := h.FromLine + afterLine := h.ToLine + + beforeNumDigits := lineNumberWidth(h.FromLine, len(h.Lines)) + afterNumDigits := lineNumberWidth(h.ToLine, len(h.Lines)) + for _, l := range h.Lines { content := strings.TrimSuffix(l.Content, "\n") - width := dv.width - leadingSymbolsSize + codeWidth := dv.width - leadingSymbolsSize switch l.Kind { + case udiff.Equal: + if dv.lineNumbers { + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, afterNumDigits))) + } + b.WriteString(dv.style.EqualLine.Code.Width(codeWidth + leadingSymbolsSize).Render(" " + content)) + beforeLine++ + afterLine++ case udiff.Insert: + if dv.lineNumbers { + b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(" ", beforeNumDigits))) + b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, afterNumDigits))) + } b.WriteString(dv.style.InsertLine.Symbol.Render("+ ")) - b.WriteString(dv.style.InsertLine.Code.Width(width).Render(content)) + b.WriteString(dv.style.InsertLine.Code.Width(codeWidth).Render(content)) + afterLine++ case udiff.Delete: + if dv.lineNumbers { + b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) + b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(" ", afterNumDigits))) + } b.WriteString(dv.style.DeleteLine.Symbol.Render("- ")) - b.WriteString(dv.style.DeleteLine.Code.Width(width).Render(content)) - case udiff.Equal: - b.WriteString(dv.style.EqualLine.Code.Width(width + leadingSymbolsSize).Render(" " + content)) + b.WriteString(dv.style.DeleteLine.Code.Width(codeWidth).Render(content)) + beforeLine++ } b.WriteRune('\n') } diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index bd70048a4c81ce260d2d569a3ee1e8fe8aa10e19..982bad099ff29ca912a78fcb9068ada771f25e15 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -29,3 +29,20 @@ func TestDefault(t *testing.T) { golden.RequireEqual(t, []byte(dv.String())) }) } + +func TestNoLineNumbers(t *testing.T) { + dv := diffview.New(). + Before("main.go", TestDefaultBefore). + After("main.go", TestDefaultAfter). + LineNumbers(false) + + t.Run("LightMode", func(t *testing.T) { + dv = dv.Style(diffview.DefaultLightStyle) + golden.RequireEqual(t, []byte(dv.String())) + }) + + t.Run("DarkMode", func(t *testing.T) { + dv = dv.Style(diffview.DefaultDarkStyle) + golden.RequireEqual(t, []byte(dv.String())) + }) +} diff --git a/internal/exp/diffview/style.go b/internal/exp/diffview/style.go new file mode 100644 index 0000000000000000000000000000000000000000..13b025ea4b14b2d7bdee4f01870d18273afa5867 --- /dev/null +++ b/internal/exp/diffview/style.go @@ -0,0 +1,96 @@ +package diffview + +import ( + "github.com/charmbracelet/lipgloss/v2" + "github.com/charmbracelet/x/exp/charmtone" +) + +type LineStyle struct { + LineNumber lipgloss.Style + Symbol lipgloss.Style + Code lipgloss.Style +} + +type Style struct { + EqualLine LineStyle + InsertLine LineStyle + DeleteLine LineStyle +} + +var DefaultLightStyle = Style{ + EqualLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Charcoal). + Background(charmtone.Ash). + Align(lipgloss.Right). + Padding(0, 1), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(charmtone.Salt), + }, + InsertLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#c8e6c9")). + Align(lipgloss.Right). + Padding(0, 1), + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#e8f5e9")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(lipgloss.Color("#e8f5e9")), + }, + DeleteLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#ffcdd2")). + Align(lipgloss.Left). + Padding(0, 1), + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#ffebee")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(lipgloss.Color("#ffebee")), + }, +} + +var DefaultDarkStyle = Style{ + EqualLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Ash). + Background(charmtone.Charcoal). + Align(lipgloss.Right). + Padding(0, 1), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(charmtone.Pepper), + }, + InsertLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#293229")). + Align(lipgloss.Right). + Padding(0, 1), + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#303a30")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(lipgloss.Color("#303a30")), + }, + DeleteLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#332929")). + Align(lipgloss.Left). + Padding(0, 1), + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#3a3030")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(lipgloss.Color("#3a3030")), + }, +} diff --git a/internal/exp/diffview/testdata/TestDefault/DarkMode.golden b/internal/exp/diffview/testdata/TestDefault/DarkMode.golden index 1cefd40f62dbe898b5d215a7d9b3e88fea8cb477..c7449b30c8ab6d9c7b38c7c8babb8a551fbf159c 100644 --- a/internal/exp/diffview/testdata/TestDefault/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDefault/DarkMode.golden @@ -1,7 +1,7 @@ - )  -   - func main() {  --  fmt.Println("Hello, world!") -+  content := "Hello, world!"  -+  fmt.Println(content)  - }  +  5   5  )  +  6   6    +  7   7  func main() {  +  8    -  fmt.Println("Hello, world!") +     8 +  content := "Hello, world!"  +     9 +  fmt.Println(content)  +  9  10  }  diff --git a/internal/exp/diffview/testdata/TestDefault/LightMode.golden b/internal/exp/diffview/testdata/TestDefault/LightMode.golden index dffbc6071dea4f70e5534473aefdb02af7f0a389..31548d7db1806ccab600d85428259b0d4050d500 100644 --- a/internal/exp/diffview/testdata/TestDefault/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDefault/LightMode.golden @@ -1,7 +1,7 @@ - )  -   - func main() {  --  fmt.Println("Hello, world!") -+  content := "Hello, world!"  -+  fmt.Println(content)  - }  +  5   5  )  +  6   6    +  7   7  func main() {  +  8    -  fmt.Println("Hello, world!") +     8 +  content := "Hello, world!"  +     9 +  fmt.Println(content)  +  9  10  }  diff --git a/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..1cefd40f62dbe898b5d215a7d9b3e88fea8cb477 --- /dev/null +++ b/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden @@ -0,0 +1,7 @@ + )  +   + func main() {  +-  fmt.Println("Hello, world!") ++  content := "Hello, world!"  ++  fmt.Println(content)  + }  diff --git a/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..dffbc6071dea4f70e5534473aefdb02af7f0a389 --- /dev/null +++ b/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden @@ -0,0 +1,7 @@ + )  +   + func main() {  +-  fmt.Println("Hello, world!") ++  content := "Hello, world!"  ++  fmt.Println(content)  + }  diff --git a/internal/exp/diffview/util.go b/internal/exp/diffview/util.go new file mode 100644 index 0000000000000000000000000000000000000000..6cf260aa9c654a162fd1e41d64e832c2cacb3320 --- /dev/null +++ b/internal/exp/diffview/util.go @@ -0,0 +1,14 @@ +package diffview + +import ( + "fmt" + "strings" +) + +func pad(v any, width int) string { + s := fmt.Sprintf("%v", v) + if len(s) >= width { + return s + } + return strings.Repeat(" ", width-len(s)) + s +} From c8e653e2787ef602a0d536f7c4cec717e1cfe60a Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 5 Jun 2025 13:38:57 -0300 Subject: [PATCH 07/64] fix(diffview): fix left pad for ansi stuff --- internal/exp/diffview/util.go | 7 +++++-- internal/exp/diffview/util_test.go | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 internal/exp/diffview/util_test.go diff --git a/internal/exp/diffview/util.go b/internal/exp/diffview/util.go index 6cf260aa9c654a162fd1e41d64e832c2cacb3320..4834cc53377fd345aab8dfa2b7a7d59a674dbab6 100644 --- a/internal/exp/diffview/util.go +++ b/internal/exp/diffview/util.go @@ -3,12 +3,15 @@ package diffview import ( "fmt" "strings" + + "github.com/charmbracelet/x/ansi" ) func pad(v any, width int) string { s := fmt.Sprintf("%v", v) - if len(s) >= width { + w := ansi.StringWidth(s) + if w >= width { return s } - return strings.Repeat(" ", width-len(s)) + s + return strings.Repeat(" ", width-w) + s } diff --git a/internal/exp/diffview/util_test.go b/internal/exp/diffview/util_test.go new file mode 100644 index 0000000000000000000000000000000000000000..3bba5070773a98c99a010722d0019fa48f45db43 --- /dev/null +++ b/internal/exp/diffview/util_test.go @@ -0,0 +1,27 @@ +package diffview + +import ( + "testing" +) + +func TestPad(t *testing.T) { + tests := []struct { + input any + width int + expected string + }{ + {7, 2, " 7"}, + {7, 3, " 7"}, + {"a", 2, " a"}, + {"a", 3, " a"}, + {"…", 2, " …"}, + {"…", 3, " …"}, + } + + for _, tt := range tests { + result := pad(tt.input, tt.width) + if result != tt.expected { + t.Errorf("expected %q, got %q", tt.expected, result) + } + } +} From 07d4221c589fe068d98c949bdf1461d6e29fee98 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 5 Jun 2025 14:35:04 -0300 Subject: [PATCH 08/64] feat(diffview): show hunk lines and test for multiple hunks --- internal/exp/diffview/diffview.go | 56 ++++++++++++++++--- internal/exp/diffview/diffview_test.go | 22 ++++++++ internal/exp/diffview/style.go | 27 ++++++++- .../testdata/TestDefault/DarkMode.golden | 1 + .../testdata/TestDefault/LightMode.golden | 1 + .../diffview/testdata/TestMultipleHunks.after | 15 +++++ .../testdata/TestMultipleHunks.before | 13 +++++ .../TestMultipleHunks/DarkMode.golden | 16 ++++++ .../TestMultipleHunks/LightMode.golden | 16 ++++++ .../TestNoLineNumbers/DarkMode.golden | 1 + .../TestNoLineNumbers/LightMode.golden | 1 + 11 files changed, 158 insertions(+), 11 deletions(-) create mode 100644 internal/exp/diffview/testdata/TestMultipleHunks.after create mode 100644 internal/exp/diffview/testdata/TestMultipleHunks.before create mode 100644 internal/exp/diffview/testdata/TestMultipleHunks/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestMultipleHunks/LightMode.golden diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 2f3b1e7927adbbfd489d2fa8bff8ada82d55a9bb..77cea81f593de49454f3f72c31b9e365a95c25d7 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -1,6 +1,7 @@ package diffview import ( + "fmt" "os" "strconv" "strings" @@ -125,22 +126,34 @@ func (dv *DiffView) String() string { } dv.detectWidth() - lineNumberWidth := func(start, num int) int { - return len(strconv.Itoa(start + num)) - } + codeWidth := dv.width - leadingSymbolsSize + beforeNumDigits, afterNumDigits := dv.lineNumberDigits() var b strings.Builder - for _, h := range dv.unified.Hunks { + for i, h := range dv.unified.Hunks { + beforeShownLines, afterShownLines := dv.hunkShownLines(i) + + if dv.lineNumbers { + b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", beforeNumDigits))) + b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", afterNumDigits))) + } + b.WriteString(dv.style.DividerLine.Code.Width(codeWidth + leadingSymbolsSize).Render( + fmt.Sprintf( + " @@ -%d,%d +%d,%d @@", + h.FromLine, + beforeShownLines, + h.ToLine, + afterShownLines, + ), + )) + b.WriteRune('\n') + beforeLine := h.FromLine afterLine := h.ToLine - beforeNumDigits := lineNumberWidth(h.FromLine, len(h.Lines)) - afterNumDigits := lineNumberWidth(h.ToLine, len(h.Lines)) - for _, l := range h.Lines { content := strings.TrimSuffix(l.Content, "\n") - codeWidth := dv.width - leadingSymbolsSize switch l.Kind { case udiff.Equal: @@ -194,6 +207,33 @@ func (dv *DiffView) computeDiff() error { return dv.err } +// lineNumberDigits calculates the maximum number of digits needed for before and +// after line numbers. +func (dv *DiffView) lineNumberDigits() (maxBefore, maxAfter int) { + for _, h := range dv.unified.Hunks { + maxBefore = max(maxBefore, len(strconv.Itoa(h.FromLine+len(h.Lines)))) + maxAfter = max(maxAfter, len(strconv.Itoa(h.ToLine+len(h.Lines)))) + } + return +} + +// hunkShownLines calculates the number of lines shown in a hunk for both before +// and after versions. +func (dv *DiffView) hunkShownLines(i int) (before, after int) { + for _, l := range dv.unified.Hunks[i].Lines { + switch l.Kind { + case udiff.Equal: + before++ + after++ + case udiff.Insert: + after++ + case udiff.Delete: + before++ + } + } + return +} + func (dv *DiffView) detectWidth() { if dv.width > 0 { return diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index 982bad099ff29ca912a78fcb9068ada771f25e15..250f06bd9e212fcf19d16c8d47996a199eef97e1 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -14,6 +14,12 @@ var TestDefaultBefore string //go:embed testdata/TestDefault.after var TestDefaultAfter string +//go:embed testdata/TestMultipleHunks.before +var TestMultipleHunksBefore string + +//go:embed testdata/TestMultipleHunks.after +var TestMultipleHunksAfter string + func TestDefault(t *testing.T) { dv := diffview.New(). Before("main.go", TestDefaultBefore). @@ -46,3 +52,19 @@ func TestNoLineNumbers(t *testing.T) { golden.RequireEqual(t, []byte(dv.String())) }) } + +func TestMultipleHunks(t *testing.T) { + dv := diffview.New(). + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter) + + t.Run("LightMode", func(t *testing.T) { + dv = dv.Style(diffview.DefaultLightStyle) + golden.RequireEqual(t, []byte(dv.String())) + }) + + t.Run("DarkMode", func(t *testing.T) { + dv = dv.Style(diffview.DefaultDarkStyle) + golden.RequireEqual(t, []byte(dv.String())) + }) +} diff --git a/internal/exp/diffview/style.go b/internal/exp/diffview/style.go index 13b025ea4b14b2d7bdee4f01870d18273afa5867..e8f21c75139c7fba2489feb2bd63c1aca9d2c7fa 100644 --- a/internal/exp/diffview/style.go +++ b/internal/exp/diffview/style.go @@ -12,12 +12,23 @@ type LineStyle struct { } type Style struct { - EqualLine LineStyle - InsertLine LineStyle - DeleteLine LineStyle + DividerLine LineStyle + EqualLine LineStyle + InsertLine LineStyle + DeleteLine LineStyle } var DefaultLightStyle = Style{ + DividerLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Iron). + Background(charmtone.Thunder). + Align(lipgloss.Right). + Padding(0, 1), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Oyster). + Background(charmtone.Anchovy), + }, EqualLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Charcoal). @@ -57,6 +68,16 @@ var DefaultLightStyle = Style{ } var DefaultDarkStyle = Style{ + DividerLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Smoke). + Background(charmtone.Sapphire). + Align(lipgloss.Right). + Padding(0, 1), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Smoke). + Background(charmtone.Ox), + }, EqualLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Ash). diff --git a/internal/exp/diffview/testdata/TestDefault/DarkMode.golden b/internal/exp/diffview/testdata/TestDefault/DarkMode.golden index c7449b30c8ab6d9c7b38c7c8babb8a551fbf159c..a173f27e7d2cc981122f2559a5b3784b618a1ace 100644 --- a/internal/exp/diffview/testdata/TestDefault/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDefault/DarkMode.golden @@ -1,3 +1,4 @@ +  …   …  @@ -5,5 +5,6 @@    5   5  )    6   6      7   7  func main() {  diff --git a/internal/exp/diffview/testdata/TestDefault/LightMode.golden b/internal/exp/diffview/testdata/TestDefault/LightMode.golden index 31548d7db1806ccab600d85428259b0d4050d500..057fc6b55127c00a1fbbca406bd639e474d3b8a8 100644 --- a/internal/exp/diffview/testdata/TestDefault/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDefault/LightMode.golden @@ -1,3 +1,4 @@ +  …   …  @@ -5,5 +5,6 @@    5   5  )    6   6      7   7  func main() {  diff --git a/internal/exp/diffview/testdata/TestMultipleHunks.after b/internal/exp/diffview/testdata/TestMultipleHunks.after new file mode 100644 index 0000000000000000000000000000000000000000..b78a823fa5c0f744c6eb3196a890338f92e40ada --- /dev/null +++ b/internal/exp/diffview/testdata/TestMultipleHunks.after @@ -0,0 +1,15 @@ +package main + +import ( + "fmt" + "strings" +) + +func main() { + fmt.Println(getContent()) +} + +func getContent() string { + content := strings.ToUpper("Hello, World!") + return content +} diff --git a/internal/exp/diffview/testdata/TestMultipleHunks.before b/internal/exp/diffview/testdata/TestMultipleHunks.before new file mode 100644 index 0000000000000000000000000000000000000000..97661af36e6d8fe0900a32dc9cceea7960c9062f --- /dev/null +++ b/internal/exp/diffview/testdata/TestMultipleHunks.before @@ -0,0 +1,13 @@ +package main + +import ( + "fmt" +) + +func main() { + fmt.Println(getContent()) +} + +func getContent() string { + return "Hello, world!" +} diff --git a/internal/exp/diffview/testdata/TestMultipleHunks/DarkMode.golden b/internal/exp/diffview/testdata/TestMultipleHunks/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..026618e2403d89e10575b3e5a7737f7ba8b41c46 --- /dev/null +++ b/internal/exp/diffview/testdata/TestMultipleHunks/DarkMode.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@  +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@  +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!") +    14 +  return content  + 13  15  }  diff --git a/internal/exp/diffview/testdata/TestMultipleHunks/LightMode.golden b/internal/exp/diffview/testdata/TestMultipleHunks/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..2ff673f4d9d103855dd38a63bfffe534e8fe6b9d --- /dev/null +++ b/internal/exp/diffview/testdata/TestMultipleHunks/LightMode.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@  +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@  +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!") +    14 +  return content  + 13  15  }  diff --git a/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden index 1cefd40f62dbe898b5d215a7d9b3e88fea8cb477..5f919312d6ff3bf0b4918fc6350659bd56feb723 100644 --- a/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden @@ -1,3 +1,4 @@ + @@ -5,5 +5,6 @@   )      func main() {  diff --git a/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden index dffbc6071dea4f70e5534473aefdb02af7f0a389..d79658d36d68c55b53008ff505295e340b024a23 100644 --- a/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden +++ b/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden @@ -1,3 +1,4 @@ + @@ -5,5 +5,6 @@   )      func main() {  From 357d727eca1c4f7c6cc527c2537f2cc7af8e02d5 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 5 Jun 2025 14:39:55 -0300 Subject: [PATCH 09/64] test(diffview): add test for custom context lines --- internal/exp/diffview/diffview_test.go | 17 +++++++++++++++++ .../TestCustomContextLines/DarkMode.golden | 17 +++++++++++++++++ .../TestCustomContextLines/LightMode.golden | 17 +++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 internal/exp/diffview/testdata/TestCustomContextLines/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestCustomContextLines/LightMode.golden diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index 250f06bd9e212fcf19d16c8d47996a199eef97e1..32cccaaf6b4c03503b3c688c9fb8de8d60250ed8 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -68,3 +68,20 @@ func TestMultipleHunks(t *testing.T) { golden.RequireEqual(t, []byte(dv.String())) }) } + +func TestCustomContextLines(t *testing.T) { + dv := diffview.New(). + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter). + ContextLines(4) + + t.Run("LightMode", func(t *testing.T) { + dv = dv.Style(diffview.DefaultLightStyle) + golden.RequireEqual(t, []byte(dv.String())) + }) + + t.Run("DarkMode", func(t *testing.T) { + dv = dv.Style(diffview.DefaultDarkStyle) + golden.RequireEqual(t, []byte(dv.String())) + }) +} diff --git a/internal/exp/diffview/testdata/TestCustomContextLines/DarkMode.golden b/internal/exp/diffview/testdata/TestCustomContextLines/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..263ada13e18ba7a28110b358be92b78fbd6a9bc8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestCustomContextLines/DarkMode.golden @@ -0,0 +1,17 @@ +  …   …  @@ -1,13 +1,15 @@  +  1   1  package main  +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  8   9  fmt.Println(getContent())  +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!") +    14 +  return content  + 13  15  }  diff --git a/internal/exp/diffview/testdata/TestCustomContextLines/LightMode.golden b/internal/exp/diffview/testdata/TestCustomContextLines/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..ab3295817aff64626089aa4ea8e6f1c5855c2896 --- /dev/null +++ b/internal/exp/diffview/testdata/TestCustomContextLines/LightMode.golden @@ -0,0 +1,17 @@ +  …   …  @@ -1,13 +1,15 @@  +  1   1  package main  +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  8   9  fmt.Println(getContent())  +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!") +    14 +  return content  + 13  15  }  From b7219b848466d6f8aeddb3a1eb57f46ccc068471 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 5 Jun 2025 16:02:11 -0300 Subject: [PATCH 10/64] fix(diffview): fix diffview width when code is too narrow --- internal/exp/diffview/diffview.go | 31 +++++++++++-------- internal/exp/diffview/diffview_test.go | 22 +++++++++++++ .../TestCustomContextLines/DarkMode.golden | 2 +- .../TestCustomContextLines/LightMode.golden | 2 +- .../testdata/TestDefault/DarkMode.golden | 2 +- .../testdata/TestDefault/LightMode.golden | 2 +- .../TestMultipleHunks/DarkMode.golden | 4 +-- .../TestMultipleHunks/LightMode.golden | 4 +-- .../exp/diffview/testdata/TestNarrow.after | 3 ++ .../exp/diffview/testdata/TestNarrow.before | 3 ++ .../testdata/TestNarrow/DarkMode.golden | 7 +++++ .../testdata/TestNarrow/LightMode.golden | 7 +++++ .../TestNoLineNumbers/DarkMode.golden | 2 +- .../TestNoLineNumbers/LightMode.golden | 2 +- 14 files changed, 70 insertions(+), 23 deletions(-) create mode 100644 internal/exp/diffview/testdata/TestNarrow.after create mode 100644 internal/exp/diffview/testdata/TestNarrow.before create mode 100644 internal/exp/diffview/testdata/TestNarrow/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestNarrow/LightMode.golden diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 77cea81f593de49454f3f72c31b9e365a95c25d7..be262a8bac73e4507c69d3b4d8757646f75d03bb 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -132,21 +132,11 @@ func (dv *DiffView) String() string { var b strings.Builder for i, h := range dv.unified.Hunks { - beforeShownLines, afterShownLines := dv.hunkShownLines(i) - if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", beforeNumDigits))) b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", afterNumDigits))) } - b.WriteString(dv.style.DividerLine.Code.Width(codeWidth + leadingSymbolsSize).Render( - fmt.Sprintf( - " @@ -%d,%d +%d,%d @@", - h.FromLine, - beforeShownLines, - h.ToLine, - afterShownLines, - ), - )) + b.WriteString(dv.style.DividerLine.Code.Width(codeWidth + leadingSymbolsSize).Render(dv.hunkLineFor(i))) b.WriteRune('\n') beforeLine := h.FromLine @@ -217,6 +207,19 @@ func (dv *DiffView) lineNumberDigits() (maxBefore, maxAfter int) { return } +func (dv *DiffView) hunkLineFor(i int) string { + h := dv.unified.Hunks[i] + beforeShownLines, afterShownLines := dv.hunkShownLines(i) + + return fmt.Sprintf( + " @@ -%d,%d +%d,%d @@ ", + h.FromLine, + beforeShownLines, + h.ToLine, + afterShownLines, + ) +} + // hunkShownLines calculates the number of lines shown in a hunk for both before // and after versions. func (dv *DiffView) hunkShownLines(i int) (before, after int) { @@ -239,11 +242,13 @@ func (dv *DiffView) detectWidth() { return } - for _, h := range dv.unified.Hunks { + for i, h := range dv.unified.Hunks { + shownLines := ansi.StringWidth(dv.hunkLineFor(i)) + for _, l := range h.Lines { lineWidth := ansi.StringWidth(strings.TrimSuffix(l.Content, "\n")) lineWidth += leadingSymbolsSize - dv.width = max(dv.width, lineWidth) + dv.width = max(dv.width, lineWidth, shownLines) } } } diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index 32cccaaf6b4c03503b3c688c9fb8de8d60250ed8..ebfa2f99f808c29b4393ae1e6214add8734cb335 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -20,6 +20,12 @@ var TestMultipleHunksBefore string //go:embed testdata/TestMultipleHunks.after var TestMultipleHunksAfter string +//go:embed testdata/TestNarrow.before +var TestNarrowBefore string + +//go:embed testdata/TestNarrow.after +var TestNarrowAfter string + func TestDefault(t *testing.T) { dv := diffview.New(). Before("main.go", TestDefaultBefore). @@ -85,3 +91,19 @@ func TestCustomContextLines(t *testing.T) { golden.RequireEqual(t, []byte(dv.String())) }) } + +func TestNarrow(t *testing.T) { + dv := diffview.New(). + Before("text.txt", TestNarrowBefore). + After("text.txt", TestNarrowAfter) + + t.Run("LightMode", func(t *testing.T) { + dv = dv.Style(diffview.DefaultLightStyle) + golden.RequireEqual(t, []byte(dv.String())) + }) + + t.Run("DarkMode", func(t *testing.T) { + dv = dv.Style(diffview.DefaultDarkStyle) + golden.RequireEqual(t, []byte(dv.String())) + }) +} diff --git a/internal/exp/diffview/testdata/TestCustomContextLines/DarkMode.golden b/internal/exp/diffview/testdata/TestCustomContextLines/DarkMode.golden index 263ada13e18ba7a28110b358be92b78fbd6a9bc8..476034952acfa039a8fa4d91cb55fb51797d8846 100644 --- a/internal/exp/diffview/testdata/TestCustomContextLines/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestCustomContextLines/DarkMode.golden @@ -1,4 +1,4 @@ -  …   …  @@ -1,13 +1,15 @@  +  …   …  @@ -1,13 +1,15 @@     1   1  package main    2   2      3   3  import (  diff --git a/internal/exp/diffview/testdata/TestCustomContextLines/LightMode.golden b/internal/exp/diffview/testdata/TestCustomContextLines/LightMode.golden index ab3295817aff64626089aa4ea8e6f1c5855c2896..10ca5458cb5fae3c7f2a716fb2d6c10065ed66da 100644 --- a/internal/exp/diffview/testdata/TestCustomContextLines/LightMode.golden +++ b/internal/exp/diffview/testdata/TestCustomContextLines/LightMode.golden @@ -1,4 +1,4 @@ -  …   …  @@ -1,13 +1,15 @@  +  …   …  @@ -1,13 +1,15 @@     1   1  package main    2   2      3   3  import (  diff --git a/internal/exp/diffview/testdata/TestDefault/DarkMode.golden b/internal/exp/diffview/testdata/TestDefault/DarkMode.golden index a173f27e7d2cc981122f2559a5b3784b618a1ace..50445f4e0ba2228fef78161b2d655b5dd4031921 100644 --- a/internal/exp/diffview/testdata/TestDefault/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDefault/DarkMode.golden @@ -1,4 +1,4 @@ -  …   …  @@ -5,5 +5,6 @@  +  …   …  @@ -5,5 +5,6 @@     5   5  )    6   6      7   7  func main() {  diff --git a/internal/exp/diffview/testdata/TestDefault/LightMode.golden b/internal/exp/diffview/testdata/TestDefault/LightMode.golden index 057fc6b55127c00a1fbbca406bd639e474d3b8a8..fffc7209f0939e453d402fd3d512ca00870dee1a 100644 --- a/internal/exp/diffview/testdata/TestDefault/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDefault/LightMode.golden @@ -1,4 +1,4 @@ -  …   …  @@ -5,5 +5,6 @@  +  …   …  @@ -5,5 +5,6 @@     5   5  )    6   6      7   7  func main() {  diff --git a/internal/exp/diffview/testdata/TestMultipleHunks/DarkMode.golden b/internal/exp/diffview/testdata/TestMultipleHunks/DarkMode.golden index 026618e2403d89e10575b3e5a7737f7ba8b41c46..8d96732f3f3a43891fc6e86e95a2f002a5639b26 100644 --- a/internal/exp/diffview/testdata/TestMultipleHunks/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestMultipleHunks/DarkMode.golden @@ -1,4 +1,4 @@ -  …   …  @@ -2,6 +2,7 @@  +  …   …  @@ -2,6 +2,7 @@     2   2      3   3  import (    4   4  "fmt"  @@ -6,7 +6,7 @@   5   6  )    6   7      7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@  +  …   …  @@ -9,5 +10,6 @@     9  10  }   10  11     11  12  func getContent() string {  diff --git a/internal/exp/diffview/testdata/TestMultipleHunks/LightMode.golden b/internal/exp/diffview/testdata/TestMultipleHunks/LightMode.golden index 2ff673f4d9d103855dd38a63bfffe534e8fe6b9d..3b17cd9eab064dc286b0e3196b7dbcc160afde59 100644 --- a/internal/exp/diffview/testdata/TestMultipleHunks/LightMode.golden +++ b/internal/exp/diffview/testdata/TestMultipleHunks/LightMode.golden @@ -1,4 +1,4 @@ -  …   …  @@ -2,6 +2,7 @@  +  …   …  @@ -2,6 +2,7 @@     2   2      3   3  import (    4   4  "fmt"  @@ -6,7 +6,7 @@   5   6  )    6   7      7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@  +  …   …  @@ -9,5 +10,6 @@     9  10  }   10  11     11  12  func getContent() string {  diff --git a/internal/exp/diffview/testdata/TestNarrow.after b/internal/exp/diffview/testdata/TestNarrow.after new file mode 100644 index 0000000000000000000000000000000000000000..2bb9b90bce52274e75ca3ebcf9ffd4e12d86126b --- /dev/null +++ b/internal/exp/diffview/testdata/TestNarrow.after @@ -0,0 +1,3 @@ +d +e +f diff --git a/internal/exp/diffview/testdata/TestNarrow.before b/internal/exp/diffview/testdata/TestNarrow.before new file mode 100644 index 0000000000000000000000000000000000000000..de980441c3ab03a8c07dda1ad27b8a11f39deb1e --- /dev/null +++ b/internal/exp/diffview/testdata/TestNarrow.before @@ -0,0 +1,3 @@ +a +b +c diff --git a/internal/exp/diffview/testdata/TestNarrow/DarkMode.golden b/internal/exp/diffview/testdata/TestNarrow/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..6bea8fb809ed316716bff912221081340d05edad --- /dev/null +++ b/internal/exp/diffview/testdata/TestNarrow/DarkMode.golden @@ -0,0 +1,7 @@ + …  …  @@ -1,3 +1,3 @@  + 1    - a  + 2    - b  + 3    - c  +    1 + d  +    2 + e  +    3 + f  diff --git a/internal/exp/diffview/testdata/TestNarrow/LightMode.golden b/internal/exp/diffview/testdata/TestNarrow/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..6820053e41bc12c3e262d7817e5673e4583f7e70 --- /dev/null +++ b/internal/exp/diffview/testdata/TestNarrow/LightMode.golden @@ -0,0 +1,7 @@ + …  …  @@ -1,3 +1,3 @@  + 1    - a  + 2    - b  + 3    - c  +    1 + d  +    2 + e  +    3 + f  diff --git a/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden index 5f919312d6ff3bf0b4918fc6350659bd56feb723..1a971eb0896a7232d0ea03718fb677b310b50348 100644 --- a/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden @@ -1,4 +1,4 @@ - @@ -5,5 +5,6 @@  + @@ -5,5 +5,6 @@    )      func main() {  diff --git a/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden index d79658d36d68c55b53008ff505295e340b024a23..878ec69d9194d52b0c161f417c06926e3752cc18 100644 --- a/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden +++ b/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden @@ -1,4 +1,4 @@ - @@ -5,5 +5,6 @@  + @@ -5,5 +5,6 @@    )      func main() {  From 062c9a42d7baf14ca9bbd6f974ffc8a454b34988 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 5 Jun 2025 17:24:41 -0300 Subject: [PATCH 11/64] chore(diffview): update `go-udiff` --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bc13eef3e2a293e915c44042f5577be4bf51ac2b..2277e5d8e3f776e94417d6568598e51198a38cf3 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/PuerkitoBio/goquery v1.9.2 github.com/alecthomas/chroma/v2 v2.15.0 github.com/anthropics/anthropic-sdk-go v1.4.0 - github.com/aymanbagabas/go-udiff v0.2.0 + github.com/aymanbagabas/go-udiff v0.3.1 github.com/bmatcuk/doublestar/v4 v4.8.1 github.com/catppuccin/go v0.3.0 github.com/charmbracelet/bubbles v0.21.0 diff --git a/go.sum b/go.sum index f3108274b2726806d9f1548f1b9a22374422e320..9187ee3ede70a73caf1ac76f395946695eed9bc1 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE= github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= -github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8= -github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA= +github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3vj1nolY= +github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38= From 67fe93e4d37a7e872b937c4b48223f49c970e79f Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 5 Jun 2025 17:28:05 -0300 Subject: [PATCH 12/64] refactor(diffview): ask hunk by parameter instead of accessing by index --- internal/exp/diffview/diffview.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index be262a8bac73e4507c69d3b4d8757646f75d03bb..c179f811cd3953d17884369fa4299bb9776fc630 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -131,12 +131,12 @@ func (dv *DiffView) String() string { var b strings.Builder - for i, h := range dv.unified.Hunks { + for _, h := range dv.unified.Hunks { if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", beforeNumDigits))) b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", afterNumDigits))) } - b.WriteString(dv.style.DividerLine.Code.Width(codeWidth + leadingSymbolsSize).Render(dv.hunkLineFor(i))) + b.WriteString(dv.style.DividerLine.Code.Width(codeWidth + leadingSymbolsSize).Render(dv.hunkLineFor(h))) b.WriteRune('\n') beforeLine := h.FromLine @@ -207,9 +207,8 @@ func (dv *DiffView) lineNumberDigits() (maxBefore, maxAfter int) { return } -func (dv *DiffView) hunkLineFor(i int) string { - h := dv.unified.Hunks[i] - beforeShownLines, afterShownLines := dv.hunkShownLines(i) +func (dv *DiffView) hunkLineFor(h *udiff.Hunk) string { + beforeShownLines, afterShownLines := dv.hunkShownLines(h) return fmt.Sprintf( " @@ -%d,%d +%d,%d @@ ", @@ -222,8 +221,8 @@ func (dv *DiffView) hunkLineFor(i int) string { // hunkShownLines calculates the number of lines shown in a hunk for both before // and after versions. -func (dv *DiffView) hunkShownLines(i int) (before, after int) { - for _, l := range dv.unified.Hunks[i].Lines { +func (dv *DiffView) hunkShownLines(h *udiff.Hunk) (before, after int) { + for _, l := range h.Lines { switch l.Kind { case udiff.Equal: before++ @@ -242,8 +241,8 @@ func (dv *DiffView) detectWidth() { return } - for i, h := range dv.unified.Hunks { - shownLines := ansi.StringWidth(dv.hunkLineFor(i)) + for _, h := range dv.unified.Hunks { + shownLines := ansi.StringWidth(dv.hunkLineFor(h)) for _, l := range h.Lines { lineWidth := ansi.StringWidth(strings.TrimSuffix(l.Content, "\n")) From a947f597388efb57b755099b4e57b2f020eee646 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Fri, 6 Jun 2025 13:53:59 -0300 Subject: [PATCH 13/64] refactor(diffview): refactor tests to be table driven --- internal/exp/diffview/diffview_test.go | 155 +++++++++--------- .../CustomContextLines}/DarkMode.golden | 0 .../CustomContextLines}/LightMode.golden | 0 .../Unified/Default}/DarkMode.golden | 0 .../Unified/Default}/LightMode.golden | 0 .../Unified/MultipleHunks}/DarkMode.golden | 0 .../Unified/MultipleHunks}/LightMode.golden | 0 .../Unified/Narrow}/DarkMode.golden | 0 .../Unified/Narrow}/LightMode.golden | 0 .../Unified/NoLineNumbers}/DarkMode.golden | 0 .../Unified/NoLineNumbers}/LightMode.golden | 0 11 files changed, 77 insertions(+), 78 deletions(-) rename internal/exp/diffview/testdata/{TestCustomContextLines => TestDiffView/Unified/CustomContextLines}/DarkMode.golden (100%) rename internal/exp/diffview/testdata/{TestCustomContextLines => TestDiffView/Unified/CustomContextLines}/LightMode.golden (100%) rename internal/exp/diffview/testdata/{TestDefault => TestDiffView/Unified/Default}/DarkMode.golden (100%) rename internal/exp/diffview/testdata/{TestDefault => TestDiffView/Unified/Default}/LightMode.golden (100%) rename internal/exp/diffview/testdata/{TestMultipleHunks => TestDiffView/Unified/MultipleHunks}/DarkMode.golden (100%) rename internal/exp/diffview/testdata/{TestMultipleHunks => TestDiffView/Unified/MultipleHunks}/LightMode.golden (100%) rename internal/exp/diffview/testdata/{TestNarrow => TestDiffView/Unified/Narrow}/DarkMode.golden (100%) rename internal/exp/diffview/testdata/{TestNarrow => TestDiffView/Unified/Narrow}/LightMode.golden (100%) rename internal/exp/diffview/testdata/{TestNoLineNumbers => TestDiffView/Unified/NoLineNumbers}/DarkMode.golden (100%) rename internal/exp/diffview/testdata/{TestNoLineNumbers => TestDiffView/Unified/NoLineNumbers}/LightMode.golden (100%) diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index ebfa2f99f808c29b4393ae1e6214add8734cb335..7d5abeab92444c32822642decb87108310fb826a 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -26,84 +26,83 @@ var TestNarrowBefore string //go:embed testdata/TestNarrow.after var TestNarrowAfter string -func TestDefault(t *testing.T) { - dv := diffview.New(). - Before("main.go", TestDefaultBefore). - After("main.go", TestDefaultAfter) - - t.Run("LightMode", func(t *testing.T) { - dv = dv.Style(diffview.DefaultLightStyle) - golden.RequireEqual(t, []byte(dv.String())) - }) - - t.Run("DarkMode", func(t *testing.T) { - dv = dv.Style(diffview.DefaultDarkStyle) - golden.RequireEqual(t, []byte(dv.String())) - }) -} - -func TestNoLineNumbers(t *testing.T) { - dv := diffview.New(). - Before("main.go", TestDefaultBefore). - After("main.go", TestDefaultAfter). - LineNumbers(false) - - t.Run("LightMode", func(t *testing.T) { - dv = dv.Style(diffview.DefaultLightStyle) - golden.RequireEqual(t, []byte(dv.String())) - }) - - t.Run("DarkMode", func(t *testing.T) { - dv = dv.Style(diffview.DefaultDarkStyle) - golden.RequireEqual(t, []byte(dv.String())) - }) -} - -func TestMultipleHunks(t *testing.T) { - dv := diffview.New(). - Before("main.go", TestMultipleHunksBefore). - After("main.go", TestMultipleHunksAfter) - - t.Run("LightMode", func(t *testing.T) { - dv = dv.Style(diffview.DefaultLightStyle) - golden.RequireEqual(t, []byte(dv.String())) - }) - - t.Run("DarkMode", func(t *testing.T) { - dv = dv.Style(diffview.DefaultDarkStyle) - golden.RequireEqual(t, []byte(dv.String())) - }) -} - -func TestCustomContextLines(t *testing.T) { - dv := diffview.New(). - Before("main.go", TestMultipleHunksBefore). - After("main.go", TestMultipleHunksAfter). - ContextLines(4) - - t.Run("LightMode", func(t *testing.T) { - dv = dv.Style(diffview.DefaultLightStyle) - golden.RequireEqual(t, []byte(dv.String())) - }) - - t.Run("DarkMode", func(t *testing.T) { - dv = dv.Style(diffview.DefaultDarkStyle) - golden.RequireEqual(t, []byte(dv.String())) - }) -} - -func TestNarrow(t *testing.T) { - dv := diffview.New(). - Before("text.txt", TestNarrowBefore). - After("text.txt", TestNarrowAfter) +type ( + TestFunc func(dv *diffview.DiffView) *diffview.DiffView + TestFuncs map[string]TestFunc +) - t.Run("LightMode", func(t *testing.T) { - dv = dv.Style(diffview.DefaultLightStyle) - golden.RequireEqual(t, []byte(dv.String())) - }) +var ( + UnifiedFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv.Unified() + } + + DefaultFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv. + Before("main.go", TestDefaultBefore). + After("main.go", TestDefaultAfter) + } + NoLineNumbersFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv. + Before("main.go", TestDefaultBefore). + After("main.go", TestDefaultAfter). + LineNumbers(false) + } + MultipleHunksFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv. + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter) + } + CustomContextLinesFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv. + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter). + ContextLines(4) + } + NarrowFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv. + Before("text.txt", TestNarrowBefore). + After("text.txt", TestNarrowAfter) + } + + LightModeFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv.Style(diffview.DefaultLightStyle) + } + DarkModeFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv.Style(diffview.DefaultDarkStyle) + } + + LayoutFuncs = TestFuncs{ + "Unified": UnifiedFunc, + } + BehaviorFuncs = TestFuncs{ + "Default": DefaultFunc, + "NoLineNumbers": NoLineNumbersFunc, + "MultipleHunks": MultipleHunksFunc, + "CustomContextLines": CustomContextLinesFunc, + "Narrow": NarrowFunc, + } + ThemeFuncs = TestFuncs{ + "LightMode": LightModeFunc, + "DarkMode": DarkModeFunc, + } +) - t.Run("DarkMode", func(t *testing.T) { - dv = dv.Style(diffview.DefaultDarkStyle) - golden.RequireEqual(t, []byte(dv.String())) - }) +func TestDiffView(t *testing.T) { + for layoutName, layoutFunc := range LayoutFuncs { + t.Run(layoutName, func(t *testing.T) { + for behaviorName, behaviorFunc := range BehaviorFuncs { + t.Run(behaviorName, func(t *testing.T) { + for themeName, themeFunc := range ThemeFuncs { + t.Run(themeName, func(t *testing.T) { + dv := diffview.New() + dv = layoutFunc(dv) + dv = behaviorFunc(dv) + dv = themeFunc(dv) + golden.RequireEqual(t, []byte(dv.String())) + }) + } + }) + } + }) + } } diff --git a/internal/exp/diffview/testdata/TestCustomContextLines/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden similarity index 100% rename from internal/exp/diffview/testdata/TestCustomContextLines/DarkMode.golden rename to internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden diff --git a/internal/exp/diffview/testdata/TestCustomContextLines/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden similarity index 100% rename from internal/exp/diffview/testdata/TestCustomContextLines/LightMode.golden rename to internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden diff --git a/internal/exp/diffview/testdata/TestDefault/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDefault/DarkMode.golden rename to internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden diff --git a/internal/exp/diffview/testdata/TestDefault/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDefault/LightMode.golden rename to internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden diff --git a/internal/exp/diffview/testdata/TestMultipleHunks/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden similarity index 100% rename from internal/exp/diffview/testdata/TestMultipleHunks/DarkMode.golden rename to internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden diff --git a/internal/exp/diffview/testdata/TestMultipleHunks/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden similarity index 100% rename from internal/exp/diffview/testdata/TestMultipleHunks/LightMode.golden rename to internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden diff --git a/internal/exp/diffview/testdata/TestNarrow/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden similarity index 100% rename from internal/exp/diffview/testdata/TestNarrow/DarkMode.golden rename to internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden diff --git a/internal/exp/diffview/testdata/TestNarrow/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden similarity index 100% rename from internal/exp/diffview/testdata/TestNarrow/LightMode.golden rename to internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden diff --git a/internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden similarity index 100% rename from internal/exp/diffview/testdata/TestNoLineNumbers/DarkMode.golden rename to internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden diff --git a/internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden similarity index 100% rename from internal/exp/diffview/testdata/TestNoLineNumbers/LightMode.golden rename to internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden From b759c373d80a9477fc2fc3f9c6e4aeb5712b824d Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Fri, 6 Jun 2025 14:07:55 -0300 Subject: [PATCH 14/64] chore: add taskfile to easily run tests --- internal/exp/diffview/Taskfile.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 internal/exp/diffview/Taskfile.yaml diff --git a/internal/exp/diffview/Taskfile.yaml b/internal/exp/diffview/Taskfile.yaml new file mode 100644 index 0000000000000000000000000000000000000000..33083d02f7686f3792e27aed0f2ed83d039e9a42 --- /dev/null +++ b/internal/exp/diffview/Taskfile.yaml @@ -0,0 +1,22 @@ +version: "3" + +tasks: + test: + desc: Run tests + cmds: + - go test ./... {{.CLI_ARGS}} + + test:update: + desc: Run tests and update golden files + cmds: + - go test ./... -update {{.CLI_ARGS}} + + test:print: + desc: Print golden files for debugging + method: none + sources: + - ./testdata/TestDiffView/**/*.golden + cmds: + - for: sources + cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} + silent: true From 38b91cc824a748dc1b285e8eacdb483a1b8b7ef5 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Fri, 6 Jun 2025 16:24:04 -0300 Subject: [PATCH 15/64] chore(deps): add `github.com/charmbracelet/x/exp/slice` --- go.mod | 4 ++-- go.sum | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 2277e5d8e3f776e94417d6568598e51198a38cf3..1f09f6b67223eda684b3a73477f67f8009139c66 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,9 @@ require ( github.com/charmbracelet/lipgloss v1.1.0 github.com/charmbracelet/lipgloss/v2 v2.0.0-beta1 github.com/charmbracelet/x/ansi v0.8.0 + github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444 github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb + github.com/charmbracelet/x/exp/slice v0.0.0-20250606192012-6931dbeeced5 github.com/fsnotify/fsnotify v1.8.0 github.com/go-logfmt/logfmt v0.6.0 github.com/google/uuid v1.6.0 @@ -35,8 +37,6 @@ require ( github.com/stretchr/testify v1.10.0 ) -require github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444 - require ( cloud.google.com/go v0.116.0 // indirect cloud.google.com/go/auth v0.13.0 // indirect diff --git a/go.sum b/go.sum index 9187ee3ede70a73caf1ac76f395946695eed9bc1..fd133d9ae855ce0c8c33f7485de7faa8c79b508e 100644 --- a/go.sum +++ b/go.sum @@ -88,6 +88,8 @@ github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444 h1:I github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444/go.mod h1:T9jr8CzFpjhFVHjNjKwbAD7KwBNyFnj2pntAO7F2zw0= github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb h1:GT/STWThMsrOfYQnhnIPb165e/g1waAp0gNMFvEO6WI= github.com/charmbracelet/x/exp/golden v0.0.0-20250602192518-9e722df69bbb/go.mod h1:929X+xY3LeoOZrDWIBVZcx/zyS0CYtyLiUIvE4VbKC0= +github.com/charmbracelet/x/exp/slice v0.0.0-20250606192012-6931dbeeced5 h1:NrUNqSKeW0nKSccnzgJYxC+SFGx+C7wskfASBKToXBs= +github.com/charmbracelet/x/exp/slice v0.0.0-20250606192012-6931dbeeced5/go.mod h1:vI5nDVMWi6veaYH+0Fmvpbe/+cv/iJfMntdh+N0+Tms= github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= From 0823b31fd08a7f098cc09cf916167b988c3e1a78 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Fri, 6 Jun 2025 17:49:23 -0300 Subject: [PATCH 16/64] feat(diffview): implement split / side-by-side view --- internal/exp/diffview/diffview.go | 136 +++++++++++++++++- internal/exp/diffview/diffview_test.go | 4 + internal/exp/diffview/split.go | 74 ++++++++++ internal/exp/diffview/style.go | 15 ++ .../Split/CustomContextLines/DarkMode.golden | 16 +++ .../Split/CustomContextLines/LightMode.golden | 16 +++ .../Split/Default/DarkMode.golden | 7 + .../Split/Default/LightMode.golden | 7 + .../Split/MultipleHunks/DarkMode.golden | 15 ++ .../Split/MultipleHunks/LightMode.golden | 15 ++ .../TestDiffView/Split/Narrow/DarkMode.golden | 4 + .../Split/Narrow/LightMode.golden | 4 + .../Split/NoLineNumbers/DarkMode.golden | 7 + .../Split/NoLineNumbers/LightMode.golden | 7 + 14 files changed, 325 insertions(+), 2 deletions(-) create mode 100644 internal/exp/diffview/split.go create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index c179f811cd3953d17884369fa4299bb9776fc630..7a7a0b90538d58b0ac4d60ade8486edd04c00179 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -42,6 +42,10 @@ type DiffView struct { err error unified udiff.UnifiedDiff edits []udiff.Edit + + splitHunks []splitHunk + beforeCodeWidth int + afterCodeWidth int } // New creates a new DiffView with default settings. @@ -124,7 +128,20 @@ func (dv *DiffView) String() string { if err := dv.computeDiff(); err != nil { return err.Error() } - dv.detectWidth() + + switch dv.layout { + case layoutUnified: + return dv.renderUnified() + case layoutSplit: + return dv.renderSplit() + default: + panic("unknown diffview layout") + } +} + +// renderUnified renders the unified diff view as a string. +func (dv *DiffView) renderUnified() string { + dv.detectUnifiedWidth() codeWidth := dv.width - leadingSymbolsSize beforeNumDigits, afterNumDigits := dv.lineNumberDigits() @@ -178,6 +195,88 @@ func (dv *DiffView) String() string { return b.String() } +// renderSplit renders the split (side-by-side) diff view as a string. +func (dv *DiffView) renderSplit() string { + dv.convertDiffToSplit() + dv.detectSplitWidth() + + beforeNumDigits, afterNumDigits := dv.lineNumberDigits() + + var b strings.Builder + + for i, h := range dv.splitHunks { + if dv.lineNumbers { + b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", beforeNumDigits))) + } + b.WriteString(dv.style.DividerLine.Code.Width(dv.beforeCodeWidth + leadingSymbolsSize).Render(dv.hunkLineFor(dv.unified.Hunks[i]))) + if dv.lineNumbers { + b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", afterNumDigits))) + } + b.WriteString(dv.style.DividerLine.Code.Width(dv.afterCodeWidth + leadingSymbolsSize).Render(" ")) + b.WriteRune('\n') + + beforeLine := h.fromLine + afterLine := h.toLine + + for _, l := range h.lines { + var beforeContent string + var afterContent string + if l.before != nil { + beforeContent = strings.TrimSuffix(l.before.Content, "\n") + } + if l.after != nil { + afterContent = strings.TrimSuffix(l.after.Content, "\n") + } + + switch { + case l.before == nil: + if dv.lineNumbers { + b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", beforeNumDigits))) + } + b.WriteString(dv.style.MissingLine.Code.Width(dv.beforeCodeWidth + leadingSymbolsSize).Render(" ")) + case l.before.Kind == udiff.Equal: + if dv.lineNumbers { + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) + } + b.WriteString(dv.style.EqualLine.Code.Width(dv.beforeCodeWidth + leadingSymbolsSize).Render(" " + beforeContent)) + beforeLine++ + case l.before.Kind == udiff.Delete: + if dv.lineNumbers { + b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) + } + b.WriteString(dv.style.DeleteLine.Symbol.Render("- ")) + b.WriteString(dv.style.DeleteLine.Code.Width(dv.beforeCodeWidth).Render(beforeContent)) + beforeLine++ + } + + switch { + case l.after == nil: + if dv.lineNumbers { + b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", afterNumDigits))) + } + b.WriteString(dv.style.MissingLine.Code.Width(dv.afterCodeWidth + leadingSymbolsSize).Render(" ")) + case l.after.Kind == udiff.Equal: + if dv.lineNumbers { + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, afterNumDigits))) + } + b.WriteString(dv.style.EqualLine.Code.Width(dv.afterCodeWidth + leadingSymbolsSize).Render(" " + afterContent)) + afterLine++ + case l.after.Kind == udiff.Insert: + if dv.lineNumbers { + b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, afterNumDigits))) + } + b.WriteString(dv.style.InsertLine.Symbol.Render("+ ")) + b.WriteString(dv.style.InsertLine.Code.Width(dv.afterCodeWidth).Render(afterContent)) + afterLine++ + } + + b.WriteRune('\n') + } + } + + return b.String() +} + func (dv *DiffView) computeDiff() error { if dv.isComputed { return dv.err @@ -236,7 +335,7 @@ func (dv *DiffView) hunkShownLines(h *udiff.Hunk) (before, after int) { return } -func (dv *DiffView) detectWidth() { +func (dv *DiffView) detectUnifiedWidth() { if dv.width > 0 { return } @@ -251,3 +350,36 @@ func (dv *DiffView) detectWidth() { } } } + +func (dv *DiffView) convertDiffToSplit() { + dv.splitHunks = make([]splitHunk, len(dv.unified.Hunks)) + for i, h := range dv.unified.Hunks { + dv.splitHunks[i] = hunkToSplit(h) + } +} + +func (dv *DiffView) detectSplitWidth() { + if dv.width > 0 { + return + } + + for i, h := range dv.splitHunks { + shownLines := ansi.StringWidth(dv.hunkLineFor(dv.unified.Hunks[i])) + + for _, l := range h.lines { + var lineWidth int + if l.before != nil { + codeWidth := ansi.StringWidth(strings.TrimSuffix(l.before.Content, "\n")) + 1 + dv.beforeCodeWidth = max(dv.beforeCodeWidth, codeWidth, shownLines) + lineWidth += codeWidth + } + if l.after != nil { + codeWidth := ansi.StringWidth(strings.TrimSuffix(l.after.Content, "\n")) + 1 + dv.afterCodeWidth = max(dv.afterCodeWidth, codeWidth, shownLines) + lineWidth += codeWidth + } + lineWidth += leadingSymbolsSize * 2 + dv.width = max(dv.width, lineWidth, shownLines) + } + } +} diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index 7d5abeab92444c32822642decb87108310fb826a..d82488087ec79bc288f7cbe879142b453b534116 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -35,6 +35,9 @@ var ( UnifiedFunc = func(dv *diffview.DiffView) *diffview.DiffView { return dv.Unified() } + SplitFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv.Split() + } DefaultFunc = func(dv *diffview.DiffView) *diffview.DiffView { return dv. @@ -73,6 +76,7 @@ var ( LayoutFuncs = TestFuncs{ "Unified": UnifiedFunc, + "Split": SplitFunc, } BehaviorFuncs = TestFuncs{ "Default": DefaultFunc, diff --git a/internal/exp/diffview/split.go b/internal/exp/diffview/split.go new file mode 100644 index 0000000000000000000000000000000000000000..9099afb425ac9bfa2236fbc464d5370d56580f25 --- /dev/null +++ b/internal/exp/diffview/split.go @@ -0,0 +1,74 @@ +package diffview + +import ( + "slices" + + "github.com/aymanbagabas/go-udiff" + "github.com/charmbracelet/x/exp/slice" +) + +type splitHunk struct { + fromLine int + toLine int + lines []*splitLine +} + +type splitLine struct { + before *udiff.Line + after *udiff.Line +} + +func hunkToSplit(h *udiff.Hunk) (sh splitHunk) { + lines := slices.Clone(h.Lines) + sh = splitHunk{ + fromLine: h.FromLine, + toLine: h.ToLine, + lines: make([]*splitLine, 0, len(lines)), + } + + for { + var ul udiff.Line + var ok bool + ul, lines, ok = slice.Shift(lines) + if !ok { + break + } + + var sl splitLine + + switch ul.Kind { + + // For equal lines, add as is + case udiff.Equal: + sl.before = &ul + sl.after = &ul + + // For inserted lines, set after and keep before as nil + case udiff.Insert: + sl.before = nil + sl.after = &ul + + // For deleted lines, set before and loop over the next lines + // searching for the equivalent after line. + case udiff.Delete: + sl.before = &ul + + inner: + for i, l := range lines { + switch l.Kind { + case udiff.Insert: + var ll udiff.Line + ll, lines, _ = slice.DeleteAt(lines, i) + sl.after = &ll + break inner + case udiff.Equal: + break inner + } + } + } + + sh.lines = append(sh.lines, &sl) + } + + return +} diff --git a/internal/exp/diffview/style.go b/internal/exp/diffview/style.go index e8f21c75139c7fba2489feb2bd63c1aca9d2c7fa..b8c99e58e861b1acbc109d1b81cb2d6da2e39f9e 100644 --- a/internal/exp/diffview/style.go +++ b/internal/exp/diffview/style.go @@ -13,6 +13,7 @@ type LineStyle struct { type Style struct { DividerLine LineStyle + MissingLine LineStyle EqualLine LineStyle InsertLine LineStyle DeleteLine LineStyle @@ -29,6 +30,13 @@ var DefaultLightStyle = Style{ Foreground(charmtone.Oyster). Background(charmtone.Anchovy), }, + MissingLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Background(charmtone.Ash). + Padding(0, 1), + Code: lipgloss.NewStyle(). + Background(charmtone.Ash), + }, EqualLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Charcoal). @@ -78,6 +86,13 @@ var DefaultDarkStyle = Style{ Foreground(charmtone.Smoke). Background(charmtone.Ox), }, + MissingLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Background(charmtone.Charcoal). + Padding(0, 1), + Code: lipgloss.NewStyle(). + Background(charmtone.Charcoal), + }, EqualLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Ash). diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..f304f5e74493245a7f840ce0535e3af661a192aa --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden @@ -0,0 +1,16 @@ +  …  @@ -1,13 +1,15 @@    …    +  1  package main   1  package main  +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  8  fmt.Println(getContent())   9  fmt.Println(getContent())  +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..6891f469fbbd89fa9e4251c894a4047ddf5d1487 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden @@ -0,0 +1,16 @@ +  …  @@ -1,13 +1,15 @@    …    +  1  package main   1  package main  +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  8  fmt.Println(getContent())   9  fmt.Println(getContent())  +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..86acb63306bf03d4a49d540e2f9fb40cf63930fb --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5  )   5  )  +  6     6    +  7  func main() {   7  func main() {  +  8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"  +       9 +  fmt.Println(content)  +  9  }  10  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..c198639301f381e8cec717a83208953ceba99b44 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5  )   5  )  +  6     6    +  7  func main() {   7  func main() {  +  8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"  +       9 +  fmt.Println(content)  +  9  }  10  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..1c248902db22d0391e84c1a61b4168c3cc0b7576 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..32d746df6a20ca6b1ec14c2e64624b4e41aa845b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..0ed25532003a24bf7bf393f8139fdb776359ad8f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden @@ -0,0 +1,4 @@ + …  @@ -1,3 +1,3 @@   …    + 1 - a  1 + d  + 2 - b  2 + e  + 3 - c  3 + f  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..287db708282839969d39a5fea0d87d2c27b74851 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden @@ -0,0 +1,4 @@ + …  @@ -1,3 +1,3 @@   …    + 1 - a  1 + d  + 2 - b  2 + e  + 3 - c  3 + f  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..270a701b16895e3210f1b52a6666ab81a50dd09b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden @@ -0,0 +1,7 @@ + @@ -5,5 +5,6 @@     + )  )  +     + func main() {  func main() {  +-  fmt.Println("Hello, world!") +  content := "Hello, world!"  +  +  fmt.Println(content)  + }  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..f637b85c434a03924001d94c753c684ffeb2926e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden @@ -0,0 +1,7 @@ + @@ -5,5 +5,6 @@     + )  )  +     + func main() {  func main() {  +-  fmt.Println("Hello, world!") +  content := "Hello, world!"  +  +  fmt.Println(content)  + }  }  From 498210c01e2783fa6f6f71db89df8a896c4ec487 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 9 Jun 2025 13:00:07 -0300 Subject: [PATCH 17/64] chore(diffview): fix lint --- internal/exp/diffview/diffview.go | 2 +- internal/exp/diffview/udiff_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 7a7a0b90538d58b0ac4d60ade8486edd04c00179..2f83fa01e2a383a2cabfa73bcaf43c3a318bfb17 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -282,7 +282,7 @@ func (dv *DiffView) computeDiff() error { return dv.err } dv.isComputed = true - dv.edits = myers.ComputeEdits( + dv.edits = myers.ComputeEdits( //nolint:staticcheck dv.before.content, dv.after.content, ) diff --git a/internal/exp/diffview/udiff_test.go b/internal/exp/diffview/udiff_test.go index d98b04e7dbf4870f354ea55592ecfba9186b2e37..400c5ba0cd143ec5398316f1910b884479cde2b7 100644 --- a/internal/exp/diffview/udiff_test.go +++ b/internal/exp/diffview/udiff_test.go @@ -39,7 +39,7 @@ func TestUdiff(t *testing.T) { t.Run("ToUnifiedDiff", func(t *testing.T) { toUnifiedDiff := func(t *testing.T, before, after string, contextLines int) udiff.UnifiedDiff { - edits := myers.ComputeEdits(before, after) + edits := myers.ComputeEdits(before, after) //nolint:staticcheck unifiedDiff, err := udiff.ToUnifiedDiff("main.go", "main.go", before, edits, contextLines) if err != nil { t.Fatalf("ToUnifiedDiff failed: %v", err) From eb50c9215037acb8546bb7c86e62661a8bb82e46 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 9 Jun 2025 14:54:43 -0300 Subject: [PATCH 18/64] fix(diffview): improve code width and make it half space on each side --- internal/exp/diffview/diffview.go | 77 ++++++++++--------- .../Split/CustomContextLines/DarkMode.golden | 32 ++++---- .../Split/CustomContextLines/LightMode.golden | 32 ++++---- .../Split/Default/DarkMode.golden | 14 ++-- .../Split/Default/LightMode.golden | 14 ++-- .../Split/MultipleHunks/DarkMode.golden | 30 ++++---- .../Split/MultipleHunks/LightMode.golden | 30 ++++---- .../Split/NoLineNumbers/DarkMode.golden | 14 ++-- .../Split/NoLineNumbers/LightMode.golden | 14 ++-- .../CustomContextLines/DarkMode.golden | 34 ++++---- .../CustomContextLines/LightMode.golden | 34 ++++---- .../Unified/Default/DarkMode.golden | 16 ++-- .../Unified/Default/LightMode.golden | 16 ++-- .../Unified/MultipleHunks/DarkMode.golden | 32 ++++---- .../Unified/MultipleHunks/LightMode.golden | 32 ++++---- .../Unified/Narrow/DarkMode.golden | 14 ++-- .../Unified/Narrow/LightMode.golden | 14 ++-- .../Unified/NoLineNumbers/DarkMode.golden | 16 ++-- .../Unified/NoLineNumbers/LightMode.golden | 16 ++-- 19 files changed, 241 insertions(+), 240 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 2f83fa01e2a383a2cabfa73bcaf43c3a318bfb17..19fc3b638d18e2442ce578ae2aa38f0be0eec582 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -43,9 +43,10 @@ type DiffView struct { unified udiff.UnifiedDiff edits []udiff.Edit - splitHunks []splitHunk - beforeCodeWidth int - afterCodeWidth int + splitHunks []splitHunk + + codeWidth int + fullCodeWidth int // with leading symbols } // New creates a new DiffView with default settings. @@ -128,6 +129,8 @@ func (dv *DiffView) String() string { if err := dv.computeDiff(); err != nil { return err.Error() } + dv.convertDiffToSplit() + dv.detectCodeWidth() switch dv.layout { case layoutUnified: @@ -141,9 +144,6 @@ func (dv *DiffView) String() string { // renderUnified renders the unified diff view as a string. func (dv *DiffView) renderUnified() string { - dv.detectUnifiedWidth() - - codeWidth := dv.width - leadingSymbolsSize beforeNumDigits, afterNumDigits := dv.lineNumberDigits() var b strings.Builder @@ -153,7 +153,7 @@ func (dv *DiffView) renderUnified() string { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", beforeNumDigits))) b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", afterNumDigits))) } - b.WriteString(dv.style.DividerLine.Code.Width(codeWidth + leadingSymbolsSize).Render(dv.hunkLineFor(h))) + b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(dv.hunkLineFor(h))) b.WriteRune('\n') beforeLine := h.FromLine @@ -168,7 +168,7 @@ func (dv *DiffView) renderUnified() string { b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, afterNumDigits))) } - b.WriteString(dv.style.EqualLine.Code.Width(codeWidth + leadingSymbolsSize).Render(" " + content)) + b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + content)) beforeLine++ afterLine++ case udiff.Insert: @@ -177,7 +177,7 @@ func (dv *DiffView) renderUnified() string { b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, afterNumDigits))) } b.WriteString(dv.style.InsertLine.Symbol.Render("+ ")) - b.WriteString(dv.style.InsertLine.Code.Width(codeWidth).Render(content)) + b.WriteString(dv.style.InsertLine.Code.Width(dv.codeWidth).Render(content)) afterLine++ case udiff.Delete: if dv.lineNumbers { @@ -185,7 +185,7 @@ func (dv *DiffView) renderUnified() string { b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(" ", afterNumDigits))) } b.WriteString(dv.style.DeleteLine.Symbol.Render("- ")) - b.WriteString(dv.style.DeleteLine.Code.Width(codeWidth).Render(content)) + b.WriteString(dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(content)) beforeLine++ } b.WriteRune('\n') @@ -197,9 +197,6 @@ func (dv *DiffView) renderUnified() string { // renderSplit renders the split (side-by-side) diff view as a string. func (dv *DiffView) renderSplit() string { - dv.convertDiffToSplit() - dv.detectSplitWidth() - beforeNumDigits, afterNumDigits := dv.lineNumberDigits() var b strings.Builder @@ -208,11 +205,11 @@ func (dv *DiffView) renderSplit() string { if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", beforeNumDigits))) } - b.WriteString(dv.style.DividerLine.Code.Width(dv.beforeCodeWidth + leadingSymbolsSize).Render(dv.hunkLineFor(dv.unified.Hunks[i]))) + b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(dv.hunkLineFor(dv.unified.Hunks[i]))) if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", afterNumDigits))) } - b.WriteString(dv.style.DividerLine.Code.Width(dv.afterCodeWidth + leadingSymbolsSize).Render(" ")) + b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(" ")) b.WriteRune('\n') beforeLine := h.fromLine @@ -233,19 +230,19 @@ func (dv *DiffView) renderSplit() string { if dv.lineNumbers { b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", beforeNumDigits))) } - b.WriteString(dv.style.MissingLine.Code.Width(dv.beforeCodeWidth + leadingSymbolsSize).Render(" ")) + b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) case l.before.Kind == udiff.Equal: if dv.lineNumbers { b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) } - b.WriteString(dv.style.EqualLine.Code.Width(dv.beforeCodeWidth + leadingSymbolsSize).Render(" " + beforeContent)) + b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + beforeContent)) beforeLine++ case l.before.Kind == udiff.Delete: if dv.lineNumbers { b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) } b.WriteString(dv.style.DeleteLine.Symbol.Render("- ")) - b.WriteString(dv.style.DeleteLine.Code.Width(dv.beforeCodeWidth).Render(beforeContent)) + b.WriteString(dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(beforeContent)) beforeLine++ } @@ -254,19 +251,19 @@ func (dv *DiffView) renderSplit() string { if dv.lineNumbers { b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", afterNumDigits))) } - b.WriteString(dv.style.MissingLine.Code.Width(dv.afterCodeWidth + leadingSymbolsSize).Render(" ")) + b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) case l.after.Kind == udiff.Equal: if dv.lineNumbers { b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, afterNumDigits))) } - b.WriteString(dv.style.EqualLine.Code.Width(dv.afterCodeWidth + leadingSymbolsSize).Render(" " + afterContent)) + b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + afterContent)) afterLine++ case l.after.Kind == udiff.Insert: if dv.lineNumbers { b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, afterNumDigits))) } b.WriteString(dv.style.InsertLine.Symbol.Render("+ ")) - b.WriteString(dv.style.InsertLine.Code.Width(dv.afterCodeWidth).Render(afterContent)) + b.WriteString(dv.style.InsertLine.Code.Width(dv.codeWidth).Render(afterContent)) afterLine++ } @@ -335,51 +332,55 @@ func (dv *DiffView) hunkShownLines(h *udiff.Hunk) (before, after int) { return } -func (dv *DiffView) detectUnifiedWidth() { - if dv.width > 0 { - return +func (dv *DiffView) detectCodeWidth() { + switch dv.layout { + case layoutUnified: + dv.detectUnifiedCodeWidth() + case layoutSplit: + dv.detectSplitCodeWidth() } + dv.fullCodeWidth = dv.codeWidth + leadingSymbolsSize +} + +func (dv *DiffView) detectUnifiedCodeWidth() { + dv.codeWidth = 0 for _, h := range dv.unified.Hunks { shownLines := ansi.StringWidth(dv.hunkLineFor(h)) for _, l := range h.Lines { - lineWidth := ansi.StringWidth(strings.TrimSuffix(l.Content, "\n")) - lineWidth += leadingSymbolsSize - dv.width = max(dv.width, lineWidth, shownLines) + lineWidth := ansi.StringWidth(strings.TrimSuffix(l.Content, "\n")) + 1 + dv.codeWidth = max(dv.codeWidth, lineWidth, shownLines) } } } func (dv *DiffView) convertDiffToSplit() { + if dv.layout != layoutSplit { + return + } + dv.splitHunks = make([]splitHunk, len(dv.unified.Hunks)) for i, h := range dv.unified.Hunks { dv.splitHunks[i] = hunkToSplit(h) } } -func (dv *DiffView) detectSplitWidth() { - if dv.width > 0 { - return - } +func (dv *DiffView) detectSplitCodeWidth() { + dv.codeWidth = 0 for i, h := range dv.splitHunks { shownLines := ansi.StringWidth(dv.hunkLineFor(dv.unified.Hunks[i])) for _, l := range h.lines { - var lineWidth int if l.before != nil { codeWidth := ansi.StringWidth(strings.TrimSuffix(l.before.Content, "\n")) + 1 - dv.beforeCodeWidth = max(dv.beforeCodeWidth, codeWidth, shownLines) - lineWidth += codeWidth + dv.codeWidth = max(dv.codeWidth, codeWidth, shownLines) } if l.after != nil { codeWidth := ansi.StringWidth(strings.TrimSuffix(l.after.Content, "\n")) + 1 - dv.afterCodeWidth = max(dv.afterCodeWidth, codeWidth, shownLines) - lineWidth += codeWidth + dv.codeWidth = max(dv.codeWidth, codeWidth, shownLines) } - lineWidth += leadingSymbolsSize * 2 - dv.width = max(dv.width, lineWidth, shownLines) } } } diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden index f304f5e74493245a7f840ce0535e3af661a192aa..ba018ffa9791596a3c488e7c3405411d010e2ee8 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden @@ -1,16 +1,16 @@ -  …  @@ -1,13 +1,15 @@    …    -  1  package main   1  package main  -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  8  fmt.Println(getContent())   9  fmt.Println(getContent())  -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  +  …  @@ -1,13 +1,15 @@    …    +  1  package main   1  package main  +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  8  fmt.Println(getContent())   9  fmt.Println(getContent())  +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden index 6891f469fbbd89fa9e4251c894a4047ddf5d1487..a8cf6d43702328efa72fdba33677e4e90e33aa7a 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden @@ -1,16 +1,16 @@ -  …  @@ -1,13 +1,15 @@    …    -  1  package main   1  package main  -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  8  fmt.Println(getContent())   9  fmt.Println(getContent())  -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  +  …  @@ -1,13 +1,15 @@    …    +  1  package main   1  package main  +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  8  fmt.Println(getContent())   9  fmt.Println(getContent())  +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden index 86acb63306bf03d4a49d540e2f9fb40cf63930fb..8d4ebc3c7e9969369c83ae8f555d622429e7855e 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden @@ -1,7 +1,7 @@ -  …  @@ -5,5 +5,6 @@    …    -  5  )   5  )  -  6     6    -  7  func main() {   7  func main() {  -  8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"  -       9 +  fmt.Println(content)  -  9  }  10  }  +  …  @@ -5,5 +5,6 @@    …    +  5  )   5  )  +  6     6    +  7  func main() {   7  func main() {  +  8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"  +       9 +  fmt.Println(content)  +  9  }  10  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden index c198639301f381e8cec717a83208953ceba99b44..e6d7d3a69e481c226b1af6c27d54ece49029628c 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden @@ -1,7 +1,7 @@ -  …  @@ -5,5 +5,6 @@    …    -  5  )   5  )  -  6     6    -  7  func main() {   7  func main() {  -  8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"  -       9 +  fmt.Println(content)  -  9  }  10  }  +  …  @@ -5,5 +5,6 @@    …    +  5  )   5  )  +  6     6    +  7  func main() {   7  func main() {  +  8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"  +       9 +  fmt.Println(content)  +  9  }  10  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden index 1c248902db22d0391e84c1a61b4168c3cc0b7576..d708f0d8998ff022460cf87a17c46f6314d98f7a 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden @@ -1,15 +1,15 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden index 32d746df6a20ca6b1ec14c2e64624b4e41aa845b..722e9e4dc4f1c4884e3b4cf7c6a36a54804efedb 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden @@ -1,15 +1,15 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden index 270a701b16895e3210f1b52a6666ab81a50dd09b..1b4cf06e3389646e255b40dee08d421645fc0319 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden @@ -1,7 +1,7 @@ - @@ -5,5 +5,6 @@     - )  )  -     - func main() {  func main() {  --  fmt.Println("Hello, world!") +  content := "Hello, world!"  -  +  fmt.Println(content)  - }  }  + @@ -5,5 +5,6 @@     + )  )  +     + func main() {  func main() {  +-  fmt.Println("Hello, world!") +  content := "Hello, world!"  +  +  fmt.Println(content)  + }  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden index f637b85c434a03924001d94c753c684ffeb2926e..e051c052ba83b1c6e55a57aa6c9ab371fc33294e 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden @@ -1,7 +1,7 @@ - @@ -5,5 +5,6 @@     - )  )  -     - func main() {  func main() {  --  fmt.Println("Hello, world!") +  content := "Hello, world!"  -  +  fmt.Println(content)  - }  }  + @@ -5,5 +5,6 @@     + )  )  +     + func main() {  func main() {  +-  fmt.Println("Hello, world!") +  content := "Hello, world!"  +  +  fmt.Println(content)  + }  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden index 476034952acfa039a8fa4d91cb55fb51797d8846..6c989ee2e605e2a4ab403daf161f17b55d0e57df 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden @@ -1,17 +1,17 @@ -  …   …  @@ -1,13 +1,15 @@   -  1   1  package main  -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  8   9  fmt.Println(getContent())  -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!") -    14 +  return content  - 13  15  }  +  …   …  @@ -1,13 +1,15 @@   +  1   1  package main  +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  8   9  fmt.Println(getContent())  +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden index 10ca5458cb5fae3c7f2a716fb2d6c10065ed66da..3b2b70055fe7543a682016b7cc2bdaf7a1ed98a4 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden @@ -1,17 +1,17 @@ -  …   …  @@ -1,13 +1,15 @@   -  1   1  package main  -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  8   9  fmt.Println(getContent())  -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!") -    14 +  return content  - 13  15  }  +  …   …  @@ -1,13 +1,15 @@   +  1   1  package main  +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  8   9  fmt.Println(getContent())  +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden index 50445f4e0ba2228fef78161b2d655b5dd4031921..4695927cc8485cb6362fcc8afccd0ada070197fa 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden @@ -1,8 +1,8 @@ -  …   …  @@ -5,5 +5,6 @@   -  5   5  )  -  6   6    -  7   7  func main() {  -  8    -  fmt.Println("Hello, world!") -     8 +  content := "Hello, world!"  -     9 +  fmt.Println(content)  -  9  10  }  +  …   …  @@ -5,5 +5,6 @@   +  5   5  )  +  6   6    +  7   7  func main() {  +  8    -  fmt.Println("Hello, world!")  +     8 +  content := "Hello, world!"  +     9 +  fmt.Println(content)  +  9  10  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden index fffc7209f0939e453d402fd3d512ca00870dee1a..c554fc2027e7341b548859cbbff00dd489f27455 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden @@ -1,8 +1,8 @@ -  …   …  @@ -5,5 +5,6 @@   -  5   5  )  -  6   6    -  7   7  func main() {  -  8    -  fmt.Println("Hello, world!") -     8 +  content := "Hello, world!"  -     9 +  fmt.Println(content)  -  9  10  }  +  …   …  @@ -5,5 +5,6 @@   +  5   5  )  +  6   6    +  7   7  func main() {  +  8    -  fmt.Println("Hello, world!")  +     8 +  content := "Hello, world!"  +     9 +  fmt.Println(content)  +  9  10  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden index 8d96732f3f3a43891fc6e86e95a2f002a5639b26..ceb45a3ee43527597b38816a4c0e85e7f662be8c 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden @@ -1,16 +1,16 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!") -    14 +  return content  - 13  15  }  +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden index 3b17cd9eab064dc286b0e3196b7dbcc160afde59..49f277689dcd1711d0043387c1d48af75c410abf 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden @@ -1,16 +1,16 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!") -    14 +  return content  - 13  15  }  +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden index 6bea8fb809ed316716bff912221081340d05edad..82686b43274e8f8cd03d5499fdc0f7c78f2e4850 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden @@ -1,7 +1,7 @@ - …  …  @@ -1,3 +1,3 @@  - 1    - a  - 2    - b  - 3    - c  -    1 + d  -    2 + e  -    3 + f  + …  …  @@ -1,3 +1,3 @@   + 1    - a  + 2    - b  + 3    - c  +    1 + d  +    2 + e  +    3 + f  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden index 6820053e41bc12c3e262d7817e5673e4583f7e70..cfc5925412c5899c6a1bef4444816d80ebf27871 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden @@ -1,7 +1,7 @@ - …  …  @@ -1,3 +1,3 @@  - 1    - a  - 2    - b  - 3    - c  -    1 + d  -    2 + e  -    3 + f  + …  …  @@ -1,3 +1,3 @@   + 1    - a  + 2    - b  + 3    - c  +    1 + d  +    2 + e  +    3 + f  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden index 1a971eb0896a7232d0ea03718fb677b310b50348..400304aee45ef3bc75abe12cc416195fd18e78c2 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden @@ -1,8 +1,8 @@ - @@ -5,5 +5,6 @@   - )  -   - func main() {  --  fmt.Println("Hello, world!") -+  content := "Hello, world!"  -+  fmt.Println(content)  - }  + @@ -5,5 +5,6 @@   + )  +   + func main() {  +-  fmt.Println("Hello, world!")  ++  content := "Hello, world!"  ++  fmt.Println(content)  + }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden index 878ec69d9194d52b0c161f417c06926e3752cc18..07aa5236f2274b4bb645076f511a3b5c87b99586 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden @@ -1,8 +1,8 @@ - @@ -5,5 +5,6 @@   - )  -   - func main() {  --  fmt.Println("Hello, world!") -+  content := "Hello, world!"  -+  fmt.Println(content)  - }  + @@ -5,5 +5,6 @@   + )  +   + func main() {  +-  fmt.Println("Hello, world!")  ++  content := "Hello, world!"  ++  fmt.Println(content)  + }  From 864735a540a0fb141dc6f67a8eff44a4df2488aa Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 9 Jun 2025 16:50:55 -0300 Subject: [PATCH 19/64] refactor(diffview): cache num digits on a struct variable --- internal/exp/diffview/diffview.go | 55 ++++++++++++++++--------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 19fc3b638d18e2442ce578ae2aa38f0be0eec582..c519223532c4e8eac851d1e8763f368bcbf0861a 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -45,8 +45,10 @@ type DiffView struct { splitHunks []splitHunk - codeWidth int - fullCodeWidth int // with leading symbols + codeWidth int + fullCodeWidth int // with leading symbols + beforeNumDigits int + afterNumDigits int } // New creates a new DiffView with default settings. @@ -130,6 +132,7 @@ func (dv *DiffView) String() string { return err.Error() } dv.convertDiffToSplit() + dv.detectNumDigits() dv.detectCodeWidth() switch dv.layout { @@ -144,14 +147,12 @@ func (dv *DiffView) String() string { // renderUnified renders the unified diff view as a string. func (dv *DiffView) renderUnified() string { - beforeNumDigits, afterNumDigits := dv.lineNumberDigits() - var b strings.Builder for _, h := range dv.unified.Hunks { if dv.lineNumbers { - b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", beforeNumDigits))) - b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", afterNumDigits))) + b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) } b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(dv.hunkLineFor(h))) b.WriteRune('\n') @@ -165,24 +166,24 @@ func (dv *DiffView) renderUnified() string { switch l.Kind { case udiff.Equal: if dv.lineNumbers { - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, afterNumDigits))) + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + content)) beforeLine++ afterLine++ case udiff.Insert: if dv.lineNumbers { - b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(" ", beforeNumDigits))) - b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, afterNumDigits))) + b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) + b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } b.WriteString(dv.style.InsertLine.Symbol.Render("+ ")) b.WriteString(dv.style.InsertLine.Code.Width(dv.codeWidth).Render(content)) afterLine++ case udiff.Delete: if dv.lineNumbers { - b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) - b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(" ", afterNumDigits))) + b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) + b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } b.WriteString(dv.style.DeleteLine.Symbol.Render("- ")) b.WriteString(dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(content)) @@ -197,17 +198,15 @@ func (dv *DiffView) renderUnified() string { // renderSplit renders the split (side-by-side) diff view as a string. func (dv *DiffView) renderSplit() string { - beforeNumDigits, afterNumDigits := dv.lineNumberDigits() - var b strings.Builder for i, h := range dv.splitHunks { if dv.lineNumbers { - b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", beforeNumDigits))) + b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) } b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(dv.hunkLineFor(dv.unified.Hunks[i]))) if dv.lineNumbers { - b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", afterNumDigits))) + b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) } b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(" ")) b.WriteRune('\n') @@ -228,18 +227,18 @@ func (dv *DiffView) renderSplit() string { switch { case l.before == nil: if dv.lineNumbers { - b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", beforeNumDigits))) + b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) } b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) case l.before.Kind == udiff.Equal: if dv.lineNumbers { - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + beforeContent)) beforeLine++ case l.before.Kind == udiff.Delete: if dv.lineNumbers { - b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, beforeNumDigits))) + b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } b.WriteString(dv.style.DeleteLine.Symbol.Render("- ")) b.WriteString(dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(beforeContent)) @@ -249,18 +248,18 @@ func (dv *DiffView) renderSplit() string { switch { case l.after == nil: if dv.lineNumbers { - b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", afterNumDigits))) + b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) case l.after.Kind == udiff.Equal: if dv.lineNumbers { - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, afterNumDigits))) + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + afterContent)) afterLine++ case l.after.Kind == udiff.Insert: if dv.lineNumbers { - b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, afterNumDigits))) + b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } b.WriteString(dv.style.InsertLine.Symbol.Render("+ ")) b.WriteString(dv.style.InsertLine.Code.Width(dv.codeWidth).Render(afterContent)) @@ -293,14 +292,16 @@ func (dv *DiffView) computeDiff() error { return dv.err } -// lineNumberDigits calculates the maximum number of digits needed for before and +// detectNumDigits calculates the maximum number of digits needed for before and // after line numbers. -func (dv *DiffView) lineNumberDigits() (maxBefore, maxAfter int) { +func (dv *DiffView) detectNumDigits() { + dv.beforeNumDigits = 0 + dv.afterNumDigits = 0 + for _, h := range dv.unified.Hunks { - maxBefore = max(maxBefore, len(strconv.Itoa(h.FromLine+len(h.Lines)))) - maxAfter = max(maxAfter, len(strconv.Itoa(h.ToLine+len(h.Lines)))) + dv.beforeNumDigits = max(dv.beforeNumDigits, len(strconv.Itoa(h.FromLine+len(h.Lines)))) + dv.afterNumDigits = max(dv.afterNumDigits, len(strconv.Itoa(h.ToLine+len(h.Lines)))) } - return } func (dv *DiffView) hunkLineFor(h *udiff.Hunk) string { From bbc3122d841a97fc3c6a69ac79889946d9f231a6 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 9 Jun 2025 17:13:36 -0300 Subject: [PATCH 20/64] refactor(diffview): move padding out of `styles.go` --- internal/exp/diffview/diffview.go | 18 ++++++++++++++- internal/exp/diffview/style.go | 38 ++++++++----------------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index c519223532c4e8eac851d1e8763f368bcbf0861a..034e7200e155b510383ad8dd1f2349217d2ef04f 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -12,7 +12,10 @@ import ( "github.com/charmbracelet/x/ansi" ) -const leadingSymbolsSize = 2 +const ( + leadingSymbolsSize = 2 + lineNumPadding = 1 +) type file struct { path string @@ -132,6 +135,7 @@ func (dv *DiffView) String() string { return err.Error() } dv.convertDiffToSplit() + dv.adjustStyles() dv.detectNumDigits() dv.detectCodeWidth() @@ -145,6 +149,18 @@ func (dv *DiffView) String() string { } } +func (dv *DiffView) adjustStyles() { + dv.style.MissingLine.LineNumber = setPadding(dv.style.MissingLine.LineNumber) + dv.style.DividerLine.LineNumber = setPadding(dv.style.DividerLine.LineNumber) + dv.style.EqualLine.LineNumber = setPadding(dv.style.EqualLine.LineNumber) + dv.style.InsertLine.LineNumber = setPadding(dv.style.InsertLine.LineNumber) + dv.style.DeleteLine.LineNumber = setPadding(dv.style.DeleteLine.LineNumber) +} + +func setPadding(s lipgloss.Style) lipgloss.Style { + return s.Padding(0, lineNumPadding).Align(lipgloss.Right) +} + // renderUnified renders the unified diff view as a string. func (dv *DiffView) renderUnified() string { var b strings.Builder diff --git a/internal/exp/diffview/style.go b/internal/exp/diffview/style.go index b8c99e58e861b1acbc109d1b81cb2d6da2e39f9e..2c083175ebed768255cefda436a083dfd6f3d6c5 100644 --- a/internal/exp/diffview/style.go +++ b/internal/exp/diffview/style.go @@ -23,26 +23,21 @@ var DefaultLightStyle = Style{ DividerLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Iron). - Background(charmtone.Thunder). - Align(lipgloss.Right). - Padding(0, 1), + Background(charmtone.Thunder), Code: lipgloss.NewStyle(). Foreground(charmtone.Oyster). Background(charmtone.Anchovy), }, MissingLine: LineStyle{ LineNumber: lipgloss.NewStyle(). - Background(charmtone.Ash). - Padding(0, 1), + Background(charmtone.Ash), Code: lipgloss.NewStyle(). Background(charmtone.Ash), }, EqualLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Charcoal). - Background(charmtone.Ash). - Align(lipgloss.Right). - Padding(0, 1), + Background(charmtone.Ash), Code: lipgloss.NewStyle(). Foreground(charmtone.Pepper). Background(charmtone.Salt), @@ -50,9 +45,7 @@ var DefaultLightStyle = Style{ InsertLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Turtle). - Background(lipgloss.Color("#c8e6c9")). - Align(lipgloss.Right). - Padding(0, 1), + Background(lipgloss.Color("#c8e6c9")), Symbol: lipgloss.NewStyle(). Foreground(charmtone.Turtle). Background(lipgloss.Color("#e8f5e9")), @@ -63,9 +56,7 @@ var DefaultLightStyle = Style{ DeleteLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Cherry). - Background(lipgloss.Color("#ffcdd2")). - Align(lipgloss.Left). - Padding(0, 1), + Background(lipgloss.Color("#ffcdd2")), Symbol: lipgloss.NewStyle(). Foreground(charmtone.Cherry). Background(lipgloss.Color("#ffebee")), @@ -79,26 +70,21 @@ var DefaultDarkStyle = Style{ DividerLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Smoke). - Background(charmtone.Sapphire). - Align(lipgloss.Right). - Padding(0, 1), + Background(charmtone.Sapphire), Code: lipgloss.NewStyle(). Foreground(charmtone.Smoke). Background(charmtone.Ox), }, MissingLine: LineStyle{ LineNumber: lipgloss.NewStyle(). - Background(charmtone.Charcoal). - Padding(0, 1), + Background(charmtone.Charcoal), Code: lipgloss.NewStyle(). Background(charmtone.Charcoal), }, EqualLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Ash). - Background(charmtone.Charcoal). - Align(lipgloss.Right). - Padding(0, 1), + Background(charmtone.Charcoal), Code: lipgloss.NewStyle(). Foreground(charmtone.Salt). Background(charmtone.Pepper), @@ -106,9 +92,7 @@ var DefaultDarkStyle = Style{ InsertLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Turtle). - Background(lipgloss.Color("#293229")). - Align(lipgloss.Right). - Padding(0, 1), + Background(lipgloss.Color("#293229")), Symbol: lipgloss.NewStyle(). Foreground(charmtone.Turtle). Background(lipgloss.Color("#303a30")), @@ -119,9 +103,7 @@ var DefaultDarkStyle = Style{ DeleteLine: LineStyle{ LineNumber: lipgloss.NewStyle(). Foreground(charmtone.Cherry). - Background(lipgloss.Color("#332929")). - Align(lipgloss.Left). - Padding(0, 1), + Background(lipgloss.Color("#332929")), Symbol: lipgloss.NewStyle(). Foreground(charmtone.Cherry). Background(lipgloss.Color("#3a3030")), From ac33d35a98e81f0b133f6e8b1dc1aa29787a2995 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 9 Jun 2025 17:19:22 -0300 Subject: [PATCH 21/64] refactor(diffview): refactor order of functions to match call order --- internal/exp/diffview/diffview.go | 178 ++++++++++++++++-------------- 1 file changed, 94 insertions(+), 84 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 034e7200e155b510383ad8dd1f2349217d2ef04f..7949d00b544eb0f141aa76cd3126df32b05345fe 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -149,6 +149,40 @@ func (dv *DiffView) String() string { } } +// computeDiff computes the differences between the "before" and "after" files. +func (dv *DiffView) computeDiff() error { + if dv.isComputed { + return dv.err + } + dv.isComputed = true + dv.edits = myers.ComputeEdits( //nolint:staticcheck + dv.before.content, + dv.after.content, + ) + dv.unified, dv.err = udiff.ToUnifiedDiff( + dv.before.path, + dv.after.path, + dv.before.content, + dv.edits, + dv.contextLines, + ) + return dv.err +} + +// convertDiffToSplit converts the unified diff to a split diff if the layout is +// set to split. +func (dv *DiffView) convertDiffToSplit() { + if dv.layout != layoutSplit { + return + } + + dv.splitHunks = make([]splitHunk, len(dv.unified.Hunks)) + for i, h := range dv.unified.Hunks { + dv.splitHunks[i] = hunkToSplit(h) + } +} + +// adjustStyles adjusts adds padding and alignment to the styles. func (dv *DiffView) adjustStyles() { dv.style.MissingLine.LineNumber = setPadding(dv.style.MissingLine.LineNumber) dv.style.DividerLine.LineNumber = setPadding(dv.style.DividerLine.LineNumber) @@ -157,10 +191,69 @@ func (dv *DiffView) adjustStyles() { dv.style.DeleteLine.LineNumber = setPadding(dv.style.DeleteLine.LineNumber) } +// detectNumDigits calculates the maximum number of digits needed for before and +// after line numbers. +func (dv *DiffView) detectNumDigits() { + dv.beforeNumDigits = 0 + dv.afterNumDigits = 0 + + for _, h := range dv.unified.Hunks { + dv.beforeNumDigits = max(dv.beforeNumDigits, len(strconv.Itoa(h.FromLine+len(h.Lines)))) + dv.afterNumDigits = max(dv.afterNumDigits, len(strconv.Itoa(h.ToLine+len(h.Lines)))) + } +} + func setPadding(s lipgloss.Style) lipgloss.Style { return s.Padding(0, lineNumPadding).Align(lipgloss.Right) } +// detectCodeWidth calculates the maximum width of code lines in the diff view. +func (dv *DiffView) detectCodeWidth() { + switch dv.layout { + case layoutUnified: + dv.detectUnifiedCodeWidth() + case layoutSplit: + dv.detectSplitCodeWidth() + } + dv.fullCodeWidth = dv.codeWidth + leadingSymbolsSize +} + +// detectUnifiedCodeWidth calculates the maximum width of code lines in a +// unified diff. +func (dv *DiffView) detectUnifiedCodeWidth() { + dv.codeWidth = 0 + + for _, h := range dv.unified.Hunks { + shownLines := ansi.StringWidth(dv.hunkLineFor(h)) + + for _, l := range h.Lines { + lineWidth := ansi.StringWidth(strings.TrimSuffix(l.Content, "\n")) + 1 + dv.codeWidth = max(dv.codeWidth, lineWidth, shownLines) + } + } +} + +// detectSplitCodeWidth calculates the maximum width of code lines in a +// split diff. +func (dv *DiffView) detectSplitCodeWidth() { + dv.codeWidth = 0 + + for i, h := range dv.splitHunks { + shownLines := ansi.StringWidth(dv.hunkLineFor(dv.unified.Hunks[i])) + + for _, l := range h.lines { + if l.before != nil { + codeWidth := ansi.StringWidth(strings.TrimSuffix(l.before.Content, "\n")) + 1 + dv.codeWidth = max(dv.codeWidth, codeWidth, shownLines) + } + if l.after != nil { + codeWidth := ansi.StringWidth(strings.TrimSuffix(l.after.Content, "\n")) + 1 + dv.codeWidth = max(dv.codeWidth, codeWidth, shownLines) + } + } + } +} + // renderUnified renders the unified diff view as a string. func (dv *DiffView) renderUnified() string { var b strings.Builder @@ -289,37 +382,7 @@ func (dv *DiffView) renderSplit() string { return b.String() } -func (dv *DiffView) computeDiff() error { - if dv.isComputed { - return dv.err - } - dv.isComputed = true - dv.edits = myers.ComputeEdits( //nolint:staticcheck - dv.before.content, - dv.after.content, - ) - dv.unified, dv.err = udiff.ToUnifiedDiff( - dv.before.path, - dv.after.path, - dv.before.content, - dv.edits, - dv.contextLines, - ) - return dv.err -} - -// detectNumDigits calculates the maximum number of digits needed for before and -// after line numbers. -func (dv *DiffView) detectNumDigits() { - dv.beforeNumDigits = 0 - dv.afterNumDigits = 0 - - for _, h := range dv.unified.Hunks { - dv.beforeNumDigits = max(dv.beforeNumDigits, len(strconv.Itoa(h.FromLine+len(h.Lines)))) - dv.afterNumDigits = max(dv.afterNumDigits, len(strconv.Itoa(h.ToLine+len(h.Lines)))) - } -} - +// hunkLineFor formats the header line for a hunk in the unified diff view. func (dv *DiffView) hunkLineFor(h *udiff.Hunk) string { beforeShownLines, afterShownLines := dv.hunkShownLines(h) @@ -348,56 +411,3 @@ func (dv *DiffView) hunkShownLines(h *udiff.Hunk) (before, after int) { } return } - -func (dv *DiffView) detectCodeWidth() { - switch dv.layout { - case layoutUnified: - dv.detectUnifiedCodeWidth() - case layoutSplit: - dv.detectSplitCodeWidth() - } - dv.fullCodeWidth = dv.codeWidth + leadingSymbolsSize -} - -func (dv *DiffView) detectUnifiedCodeWidth() { - dv.codeWidth = 0 - - for _, h := range dv.unified.Hunks { - shownLines := ansi.StringWidth(dv.hunkLineFor(h)) - - for _, l := range h.Lines { - lineWidth := ansi.StringWidth(strings.TrimSuffix(l.Content, "\n")) + 1 - dv.codeWidth = max(dv.codeWidth, lineWidth, shownLines) - } - } -} - -func (dv *DiffView) convertDiffToSplit() { - if dv.layout != layoutSplit { - return - } - - dv.splitHunks = make([]splitHunk, len(dv.unified.Hunks)) - for i, h := range dv.unified.Hunks { - dv.splitHunks[i] = hunkToSplit(h) - } -} - -func (dv *DiffView) detectSplitCodeWidth() { - dv.codeWidth = 0 - - for i, h := range dv.splitHunks { - shownLines := ansi.StringWidth(dv.hunkLineFor(dv.unified.Hunks[i])) - - for _, l := range h.lines { - if l.before != nil { - codeWidth := ansi.StringWidth(strings.TrimSuffix(l.before.Content, "\n")) + 1 - dv.codeWidth = max(dv.codeWidth, codeWidth, shownLines) - } - if l.after != nil { - codeWidth := ansi.StringWidth(strings.TrimSuffix(l.after.Content, "\n")) + 1 - dv.codeWidth = max(dv.codeWidth, codeWidth, shownLines) - } - } - } -} From c608d8f06e95d3e0a7c1990bd36cc6da62599426 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 9 Jun 2025 18:15:37 -0300 Subject: [PATCH 22/64] feat(diffview): implement resizer to make diff wider or shorter as asked --- internal/exp/diffview/diffview.go | 31 ++++++++++++++-- internal/exp/diffview/diffview_test.go | 37 ++++++++++++++++++- .../Split/LargeWidth/DarkMode.golden | 15 ++++++++ .../Split/LargeWidth/LightMode.golden | 15 ++++++++ .../Split/SmallWidth/DarkMode.golden | 15 ++++++++ .../Split/SmallWidth/LightMode.golden | 15 ++++++++ .../Unified/LargeWidth/DarkMode.golden | 16 ++++++++ .../Unified/LargeWidth/LightMode.golden | 16 ++++++++ .../Unified/SmallWidth/DarkMode.golden | 16 ++++++++ .../Unified/SmallWidth/LightMode.golden | 16 ++++++++ 10 files changed, 188 insertions(+), 4 deletions(-) create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 7949d00b544eb0f141aa76cd3126df32b05345fe..6ec44fddebc7fc25938de54a8b4268efeed403ca 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -137,7 +137,12 @@ func (dv *DiffView) String() string { dv.convertDiffToSplit() dv.adjustStyles() dv.detectNumDigits() - dv.detectCodeWidth() + + if dv.width <= 0 { + dv.detectCodeWidth() + } else { + dv.resizeCodeWidth() + } switch dv.layout { case layoutUnified: @@ -254,6 +259,21 @@ func (dv *DiffView) detectSplitCodeWidth() { } } +// resizeCodeWidth resizes the code width to fit within the specified width. +func (dv *DiffView) resizeCodeWidth() { + fullNumWidth := dv.beforeNumDigits + dv.afterNumDigits + fullNumWidth += lineNumPadding * 4 // left and right padding for both line numbers + + switch dv.layout { + case layoutUnified: + dv.codeWidth = dv.width - fullNumWidth - leadingSymbolsSize + case layoutSplit: + dv.codeWidth = (dv.width - fullNumWidth - leadingSymbolsSize*2) / 2 + } + + dv.fullCodeWidth = dv.codeWidth + leadingSymbolsSize +} + // renderUnified renders the unified diff view as a string. func (dv *DiffView) renderUnified() string { var b strings.Builder @@ -263,7 +283,8 @@ func (dv *DiffView) renderUnified() string { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) } - b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(dv.hunkLineFor(h))) + content := ansi.Truncate(dv.hunkLineFor(h), dv.fullCodeWidth, "…") + b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(content)) b.WriteRune('\n') beforeLine := h.FromLine @@ -271,6 +292,7 @@ func (dv *DiffView) renderUnified() string { for _, l := range h.Lines { content := strings.TrimSuffix(l.Content, "\n") + content = ansi.Truncate(content, dv.codeWidth, "…") switch l.Kind { case udiff.Equal: @@ -313,7 +335,8 @@ func (dv *DiffView) renderSplit() string { if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) } - b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(dv.hunkLineFor(dv.unified.Hunks[i]))) + content := ansi.Truncate(dv.hunkLineFor(dv.unified.Hunks[i]), dv.fullCodeWidth, "…") + b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(content)) if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) } @@ -328,9 +351,11 @@ func (dv *DiffView) renderSplit() string { var afterContent string if l.before != nil { beforeContent = strings.TrimSuffix(l.before.Content, "\n") + beforeContent = ansi.Truncate(beforeContent, dv.codeWidth, "…") } if l.after != nil { afterContent = strings.TrimSuffix(l.after.Content, "\n") + afterContent = ansi.Truncate(afterContent, dv.codeWidth, "…") } switch { diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index d82488087ec79bc288f7cbe879142b453b534116..cd60838244a7504b6ca12cdd692dd7f4d7fe37df 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -2,8 +2,10 @@ package diffview_test import ( _ "embed" + "strings" "testing" + "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/x/exp/golden" "github.com/opencode-ai/opencode/internal/exp/diffview" ) @@ -66,6 +68,18 @@ var ( Before("text.txt", TestNarrowBefore). After("text.txt", TestNarrowAfter) } + SmallWidthFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv. + Before("text.txt", TestMultipleHunksBefore). + After("text.txt", TestMultipleHunksAfter). + Width(40) + } + LargeWidthFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv. + Before("text.txt", TestMultipleHunksBefore). + After("text.txt", TestMultipleHunksAfter). + Width(120) + } LightModeFunc = func(dv *diffview.DiffView) *diffview.DiffView { return dv.Style(diffview.DefaultLightStyle) @@ -84,6 +98,8 @@ var ( "MultipleHunks": MultipleHunksFunc, "CustomContextLines": CustomContextLinesFunc, "Narrow": NarrowFunc, + "SmallWidth": SmallWidthFunc, + "LargeWidth": LargeWidthFunc, } ThemeFuncs = TestFuncs{ "LightMode": LightModeFunc, @@ -102,7 +118,16 @@ func TestDiffView(t *testing.T) { dv = layoutFunc(dv) dv = behaviorFunc(dv) dv = themeFunc(dv) - golden.RequireEqual(t, []byte(dv.String())) + + output := dv.String() + golden.RequireEqual(t, []byte(output)) + + switch behaviorName { + case "SmallWidth": + assertLineWidth(t, 40, output) + case "LargeWidth": + assertLineWidth(t, 120, output) + } }) } }) @@ -110,3 +135,13 @@ func TestDiffView(t *testing.T) { }) } } + +func assertLineWidth(t *testing.T, expected int, output string) { + var lineWidth int + for line := range strings.SplitSeq(output, "\n") { + lineWidth = max(lineWidth, ansi.StringWidth(line)) + } + if lineWidth != expected { + t.Errorf("expected output width to be == %d, got %d", expected, lineWidth) + } +} diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..b1a8869156d23676e0dfd4a25834dc8a6abae39f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..b393fd4a20aa07ac97b92e3452804a748531591a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..715847b3dc4e38453f46d3e310e70d023408adb6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 …  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6…  …    +  9  }  10  }  + 10    11    + 11  func getConte… 12  func getConte… + 12 -  return "H… 13 +  content :… +      14 +  return co… + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..fd74ac5c3d1b0b0cac6bc5a5e03f0f95aaca2c50 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 …  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6…  …    +  9  }  10  }  + 10    11    + 11  func getConte… 12  func getConte… + 12 -  return "H… 13 +  content :… +      14 +  return co… + 13  }  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..f1cc58546cffe8aafbade71b3bf29fd86b39ac5f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..1040c45ae865825b6742b4f191032c7ff7bb96c3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..3bc330b1a1fc0e8643257a99bcb7e3337eafc752 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUppe… +    14 +  return content  + 13  15  }  diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..fc8745b8676b6270375bbdc06266bf590c791b04 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUppe… +    14 +  return content  + 13  15  }  From 371662c626cb361d42cb28ddcdd15ee0e88877df Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 10 Jun 2025 13:41:29 -0300 Subject: [PATCH 23/64] test(diffview): fix file name in test --- internal/exp/diffview/diffview_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index cd60838244a7504b6ca12cdd692dd7f4d7fe37df..af15e5f2821bc29ddc38d07f2d0b0c0a782166a9 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -70,14 +70,14 @@ var ( } SmallWidthFunc = func(dv *diffview.DiffView) *diffview.DiffView { return dv. - Before("text.txt", TestMultipleHunksBefore). - After("text.txt", TestMultipleHunksAfter). + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter). Width(40) } LargeWidthFunc = func(dv *diffview.DiffView) *diffview.DiffView { return dv. - Before("text.txt", TestMultipleHunksBefore). - After("text.txt", TestMultipleHunksAfter). + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter). Width(120) } From 0da19d841fbaccac813708d940d5ccacbc85cd00 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 10 Jun 2025 15:01:01 -0300 Subject: [PATCH 24/64] fix(diffview): add fixes + more extensive testing for width handling --- internal/exp/diffview/Taskfile.yaml | 20 +++++++++++++++++ internal/exp/diffview/diffview.go | 26 +++++++++++++-------- internal/exp/diffview/diffview_test.go | 31 ++++++++++++++++++++++++++ internal/exp/diffview/util.go | 15 +++++++++++++ 4 files changed, 83 insertions(+), 9 deletions(-) diff --git a/internal/exp/diffview/Taskfile.yaml b/internal/exp/diffview/Taskfile.yaml index 33083d02f7686f3792e27aed0f2ed83d039e9a42..50cb6a04600fcfc640a4910d5bd1b718984eecda 100644 --- a/internal/exp/diffview/Taskfile.yaml +++ b/internal/exp/diffview/Taskfile.yaml @@ -20,3 +20,23 @@ tasks: - for: sources cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} silent: true + + test:print:width:unified: + desc: Print golden files for debugging + method: none + sources: + - ./testdata/TestDiffViewWidth/Unified/LightMode/*.golden + cmds: + - for: sources + cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} + silent: true + + test:print:width:split: + desc: Print golden files for debugging + method: none + sources: + - ./testdata/TestDiffViewWidth/Split/LightMode/*.golden + cmds: + - for: sources + cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} + silent: true diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 6ec44fddebc7fc25938de54a8b4268efeed403ca..d14152bcb5dede1b6eb681b8897c7ac3d8987aa7 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -49,7 +49,8 @@ type DiffView struct { splitHunks []splitHunk codeWidth int - fullCodeWidth int // with leading symbols + fullCodeWidth int // with leading symbols + extraColOnAfter bool // add extra column on after panel beforeNumDigits int afterNumDigits int } @@ -144,11 +145,16 @@ func (dv *DiffView) String() string { dv.resizeCodeWidth() } + style := lipgloss.NewStyle() + if dv.width > 0 { + style = style.MaxWidth(dv.width) + } + switch dv.layout { case layoutUnified: - return dv.renderUnified() + return style.Render(strings.TrimSuffix(dv.renderUnified(), "\n")) case layoutSplit: - return dv.renderSplit() + return style.Render(strings.TrimSuffix(dv.renderSplit(), "\n")) default: panic("unknown diffview layout") } @@ -268,7 +274,9 @@ func (dv *DiffView) resizeCodeWidth() { case layoutUnified: dv.codeWidth = dv.width - fullNumWidth - leadingSymbolsSize case layoutSplit: - dv.codeWidth = (dv.width - fullNumWidth - leadingSymbolsSize*2) / 2 + remainingWidth := dv.width - fullNumWidth - leadingSymbolsSize*2 + dv.codeWidth = remainingWidth / 2 + dv.extraColOnAfter = isOdd(remainingWidth) } dv.fullCodeWidth = dv.codeWidth + leadingSymbolsSize @@ -340,7 +348,7 @@ func (dv *DiffView) renderSplit() string { if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) } - b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(" ")) + b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) b.WriteRune('\n') beforeLine := h.fromLine @@ -355,7 +363,7 @@ func (dv *DiffView) renderSplit() string { } if l.after != nil { afterContent = strings.TrimSuffix(l.after.Content, "\n") - afterContent = ansi.Truncate(afterContent, dv.codeWidth, "…") + afterContent = ansi.Truncate(afterContent, dv.codeWidth+btoi(dv.extraColOnAfter), "…") } switch { @@ -384,19 +392,19 @@ func (dv *DiffView) renderSplit() string { if dv.lineNumbers { b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } - b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) + b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) case l.after.Kind == udiff.Equal: if dv.lineNumbers { b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } - b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + afterContent)) + b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" " + afterContent)) afterLine++ case l.after.Kind == udiff.Insert: if dv.lineNumbers { b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } b.WriteString(dv.style.InsertLine.Symbol.Render("+ ")) - b.WriteString(dv.style.InsertLine.Code.Width(dv.codeWidth).Render(afterContent)) + b.WriteString(dv.style.InsertLine.Code.Width(dv.codeWidth + btoi(dv.extraColOnAfter)).Render(afterContent)) afterLine++ } diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index af15e5f2821bc29ddc38d07f2d0b0c0a782166a9..c26e89c58194f43725f05096cc4ee5e3afa2ae25 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -2,6 +2,7 @@ package diffview_test import ( _ "embed" + "fmt" "strings" "testing" @@ -136,6 +137,36 @@ func TestDiffView(t *testing.T) { } } +func TestDiffViewWidth(t *testing.T) { + for layoutName, layoutFunc := range LayoutFuncs { + t.Run(layoutName, func(t *testing.T) { + for themeName, themeFunc := range ThemeFuncs { + t.Run(themeName, func(t *testing.T) { + for width := 1; width <= 110; width++ { + if layoutName == "Unified" && width > 60 { + continue + } + + t.Run(fmt.Sprintf("WidthOf%03d", width), func(t *testing.T) { + dv := diffview.New(). + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter). + Width(width) + dv = layoutFunc(dv) + dv = themeFunc(dv) + + output := dv.String() + golden.RequireEqual(t, []byte(output)) + + assertLineWidth(t, width, output) + }) + } + }) + } + }) + } +} + func assertLineWidth(t *testing.T, expected int, output string) { var lineWidth int for line := range strings.SplitSeq(output, "\n") { diff --git a/internal/exp/diffview/util.go b/internal/exp/diffview/util.go index 4834cc53377fd345aab8dfa2b7a7d59a674dbab6..7ad3b880135216e668225a83859ff4866a7a2640 100644 --- a/internal/exp/diffview/util.go +++ b/internal/exp/diffview/util.go @@ -15,3 +15,18 @@ func pad(v any, width int) string { } return strings.Repeat(" ", width-w) + s } + +func isEven(n int) bool { + return n%2 == 0 +} + +func isOdd(n int) bool { + return !isEven(n) +} + +func btoi(b bool) int { + if b { + return 1 + } + return 0 +} From 6d22a5beea89beb2ee7e57235099717a54026f7a Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 10 Jun 2025 15:02:04 -0300 Subject: [PATCH 25/64] test(diffview): update golden files to remove final line breaks --- .../TestDiffView/Split/CustomContextLines/DarkMode.golden | 2 +- .../TestDiffView/Split/CustomContextLines/LightMode.golden | 2 +- .../testdata/TestDiffView/Split/Default/DarkMode.golden | 2 +- .../testdata/TestDiffView/Split/Default/LightMode.golden | 2 +- .../testdata/TestDiffView/Split/LargeWidth/DarkMode.golden | 2 +- .../testdata/TestDiffView/Split/LargeWidth/LightMode.golden | 2 +- .../testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden | 2 +- .../testdata/TestDiffView/Split/MultipleHunks/LightMode.golden | 2 +- .../diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden | 2 +- .../testdata/TestDiffView/Split/Narrow/LightMode.golden | 2 +- .../testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden | 2 +- .../testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden | 2 +- .../testdata/TestDiffView/Split/SmallWidth/DarkMode.golden | 2 +- .../testdata/TestDiffView/Split/SmallWidth/LightMode.golden | 2 +- .../TestDiffView/Unified/CustomContextLines/DarkMode.golden | 2 +- .../TestDiffView/Unified/CustomContextLines/LightMode.golden | 2 +- .../testdata/TestDiffView/Unified/Default/DarkMode.golden | 2 +- .../testdata/TestDiffView/Unified/Default/LightMode.golden | 2 +- .../testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden | 2 +- .../testdata/TestDiffView/Unified/LargeWidth/LightMode.golden | 2 +- .../testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden | 2 +- .../TestDiffView/Unified/MultipleHunks/LightMode.golden | 2 +- .../testdata/TestDiffView/Unified/Narrow/DarkMode.golden | 2 +- .../testdata/TestDiffView/Unified/Narrow/LightMode.golden | 2 +- .../testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden | 2 +- .../TestDiffView/Unified/NoLineNumbers/LightMode.golden | 2 +- .../testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden | 2 +- .../testdata/TestDiffView/Unified/SmallWidth/LightMode.golden | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden index ba018ffa9791596a3c488e7c3405411d010e2ee8..9e5916468e51758ed037f9203a9bd9fd2a428e69 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden @@ -13,4 +13,4 @@  11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content  - 13  }  15  }  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden index a8cf6d43702328efa72fdba33677e4e90e33aa7a..62d07f55af461a1b611c00199338265bb1af91c4 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden @@ -13,4 +13,4 @@  11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content  - 13  }  15  }  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden index 8d4ebc3c7e9969369c83ae8f555d622429e7855e..3d750b4e1ecafd7d0c1dd7648876fd1634b1f9cf 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden @@ -4,4 +4,4 @@   7  func main() {   7  func main() {    8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"         9 +  fmt.Println(content)  -  9  }  10  }  +  9  }  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden index e6d7d3a69e481c226b1af6c27d54ece49029628c..949a3f02dfe832ebc0463e6da038a96f4ba15473 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden @@ -4,4 +4,4 @@   7  func main() {   7  func main() {    8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"         9 +  fmt.Println(content)  -  9  }  10  }  +  9  }  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden index b1a8869156d23676e0dfd4a25834dc8a6abae39f..b7e699e4460fa9db9db6e45779bb5204b22dec27 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden @@ -12,4 +12,4 @@  11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content  - 13  }  15  }  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden index b393fd4a20aa07ac97b92e3452804a748531591a..731461ee0a7abb1999946259a56694429ded9b9a 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden @@ -12,4 +12,4 @@  11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content  - 13  }  15  }  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden index d708f0d8998ff022460cf87a17c46f6314d98f7a..c69efe614a04aba3f680d6cf9af91112af13560b 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden @@ -12,4 +12,4 @@  11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content  - 13  }  15  }  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden index 722e9e4dc4f1c4884e3b4cf7c6a36a54804efedb..e22a98ecf771bc651d26af440a361286dcb167f7 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden @@ -12,4 +12,4 @@  11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content  - 13  }  15  }  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden index 0ed25532003a24bf7bf393f8139fdb776359ad8f..bc4ad0d0f01fd89833feddd4d0af1c32c6a635c8 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden @@ -1,4 +1,4 @@  …  @@ -1,3 +1,3 @@   …     1 - a  1 + d   2 - b  2 + e  - 3 - c  3 + f  + 3 - c  3 + f  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden index 287db708282839969d39a5fea0d87d2c27b74851..287773c442a2a8a3987661a26e8e3596ccdfe27d 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden @@ -1,4 +1,4 @@  …  @@ -1,3 +1,3 @@   …     1 - a  1 + d   2 - b  2 + e  - 3 - c  3 + f  + 3 - c  3 + f  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden index 1b4cf06e3389646e255b40dee08d421645fc0319..615a74ccea34ea981a523d94fc709c74c21954c7 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden @@ -4,4 +4,4 @@  func main() {  func main() {  -  fmt.Println("Hello, world!") +  content := "Hello, world!"    +  fmt.Println(content)  - }  }  + }  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden index e051c052ba83b1c6e55a57aa6c9ab371fc33294e..b3df58f0576c5c62f22fe79bf4040326bdbec7e6 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden @@ -4,4 +4,4 @@  func main() {  func main() {  -  fmt.Println("Hello, world!") +  content := "Hello, world!"    +  fmt.Println(content)  - }  }  + }  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden index 715847b3dc4e38453f46d3e310e70d023408adb6..1c8e9fa4b8a906b6baaf787501fa0d6d41e5595c 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden @@ -12,4 +12,4 @@  11  func getConte… 12  func getConte…  12 -  return "H… 13 +  content :…       14 +  return co… - 13  }  15  }  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden index fd74ac5c3d1b0b0cac6bc5a5e03f0f95aaca2c50..d0ca9dd0d86109752758fb32f20222a26b265b9c 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden @@ -12,4 +12,4 @@  11  func getConte… 12  func getConte…  12 -  return "H… 13 +  content :…       14 +  return co… - 13  }  15  }  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden index 6c989ee2e605e2a4ab403daf161f17b55d0e57df..35da9718499b2acf8c88bf12a338eb2f7563e8a3 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden @@ -14,4 +14,4 @@  12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")      14 +  return content  - 13  15  }  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden index 3b2b70055fe7543a682016b7cc2bdaf7a1ed98a4..f46db4b259c797f76955aabe369d38b9306a9ee6 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden @@ -14,4 +14,4 @@  12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")      14 +  return content  - 13  15  }  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden index 4695927cc8485cb6362fcc8afccd0ada070197fa..9579770c5db427b2f7a062a0572dcac142f1c03a 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden @@ -5,4 +5,4 @@   8    -  fmt.Println("Hello, world!")       8 +  content := "Hello, world!"       9 +  fmt.Println(content)  -  9  10  }  +  9  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden index c554fc2027e7341b548859cbbff00dd489f27455..51e44bba27edb87f7867c8f431d0454fdf3c62ba 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden @@ -5,4 +5,4 @@   8    -  fmt.Println("Hello, world!")       8 +  content := "Hello, world!"       9 +  fmt.Println(content)  -  9  10  }  +  9  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden index f1cc58546cffe8aafbade71b3bf29fd86b39ac5f..1eae42a5bb9a03d64703a4620a0c1810c332cdab 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden @@ -13,4 +13,4 @@  12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")      14 +  return content  - 13  15  }  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden index 1040c45ae865825b6742b4f191032c7ff7bb96c3..1a2bffc13aef1ca84426076417ca75d1fa7bffbe 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden @@ -13,4 +13,4 @@  12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")      14 +  return content  - 13  15  }  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden index ceb45a3ee43527597b38816a4c0e85e7f662be8c..18c9c363f3952bda8537f96496405edce5684485 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden @@ -13,4 +13,4 @@  12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")      14 +  return content  - 13  15  }  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden index 49f277689dcd1711d0043387c1d48af75c410abf..285caf3659ba538e0c12da796836045311ecad67 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden @@ -13,4 +13,4 @@  12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")      14 +  return content  - 13  15  }  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden index 82686b43274e8f8cd03d5499fdc0f7c78f2e4850..8de3cebc908067f19420536239a26d8b513f1407 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden @@ -4,4 +4,4 @@  3    - c      1 + d      2 + e  -    3 + f  +    3 + f  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden index cfc5925412c5899c6a1bef4444816d80ebf27871..5ba43a7d9161a4e96349280a41709d52501d60bc 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden @@ -4,4 +4,4 @@  3    - c      1 + d      2 + e  -    3 + f  +    3 + f  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden index 400304aee45ef3bc75abe12cc416195fd18e78c2..817b0ef6562e0c8d434babdd40cb2219fa188575 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden @@ -5,4 +5,4 @@ -  fmt.Println("Hello, world!")  +  content := "Hello, world!"  +  fmt.Println(content)  - }  + }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden index 07aa5236f2274b4bb645076f511a3b5c87b99586..b3955c92994f9561c035631a6b1c99f3f7695a14 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden @@ -5,4 +5,4 @@ -  fmt.Println("Hello, world!")  +  content := "Hello, world!"  +  fmt.Println(content)  - }  + }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden index 3bc330b1a1fc0e8643257a99bcb7e3337eafc752..19b8e852925c5fa1377e9fa3a2460e3ccc466357 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden @@ -13,4 +13,4 @@  12    -  return "Hello, world!"      13 +  content := strings.ToUppe…     14 +  return content  - 13  15  }  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden index fc8745b8676b6270375bbdc06266bf590c791b04..1fa51a9e2840438aa94f306a294a82d22d0f5482 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden @@ -13,4 +13,4 @@  12    -  return "Hello, world!"      13 +  content := strings.ToUppe…     14 +  return content  - 13  15  }  + 13  15  }  \ No newline at end of file From a5a1ba2d210366b57d226643e87bd3dbf68815c4 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 10 Jun 2025 15:03:00 -0300 Subject: [PATCH 26/64] test(diffview): add golden files for width testing --- .../Split/DarkMode/WidthOf001.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf002.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf003.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf004.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf005.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf006.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf007.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf008.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf009.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf010.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf011.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf012.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf013.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf014.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf015.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf016.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf017.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf018.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf019.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf020.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf021.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf022.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf023.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf024.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf025.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf026.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf027.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf028.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf029.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf030.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf031.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf032.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf033.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf034.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf035.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf036.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf037.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf038.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf039.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf040.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf041.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf042.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf043.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf044.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf045.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf046.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf047.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf048.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf049.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf050.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf051.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf052.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf053.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf054.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf055.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf056.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf057.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf058.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf059.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf060.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf061.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf062.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf063.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf064.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf065.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf066.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf067.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf068.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf069.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf070.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf071.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf072.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf073.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf074.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf075.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf076.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf077.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf078.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf079.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf080.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf081.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf082.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf083.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf084.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf085.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf086.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf087.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf088.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf089.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf090.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf091.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf092.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf093.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf094.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf095.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf096.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf097.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf098.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf099.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf100.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf101.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf102.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf103.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf104.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf105.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf106.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf107.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf108.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf109.golden | 15 +++++++++++++++ .../Split/DarkMode/WidthOf110.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf001.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf002.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf003.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf004.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf005.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf006.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf007.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf008.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf009.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf010.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf011.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf012.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf013.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf014.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf015.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf016.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf017.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf018.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf019.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf020.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf021.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf022.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf023.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf024.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf025.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf026.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf027.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf028.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf029.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf030.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf031.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf032.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf033.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf034.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf035.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf036.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf037.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf038.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf039.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf040.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf041.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf042.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf043.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf044.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf045.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf046.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf047.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf048.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf049.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf050.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf051.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf052.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf053.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf054.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf055.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf056.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf057.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf058.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf059.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf060.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf061.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf062.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf063.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf064.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf065.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf066.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf067.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf068.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf069.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf070.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf071.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf072.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf073.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf074.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf075.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf076.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf077.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf078.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf079.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf080.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf081.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf082.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf083.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf084.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf085.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf086.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf087.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf088.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf089.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf090.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf091.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf092.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf093.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf094.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf095.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf096.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf097.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf098.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf099.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf100.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf101.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf102.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf103.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf104.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf105.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf106.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf107.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf108.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf109.golden | 15 +++++++++++++++ .../Split/LightMode/WidthOf110.golden | 15 +++++++++++++++ .../Unified/DarkMode/WidthOf001.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf002.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf003.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf004.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf005.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf006.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf007.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf008.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf009.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf010.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf011.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf012.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf013.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf014.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf015.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf016.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf017.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf018.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf019.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf020.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf021.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf022.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf023.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf024.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf025.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf026.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf027.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf028.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf029.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf030.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf031.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf032.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf033.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf034.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf035.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf036.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf037.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf038.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf039.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf040.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf041.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf042.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf043.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf044.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf045.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf046.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf047.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf048.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf049.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf050.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf051.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf052.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf053.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf054.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf055.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf056.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf057.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf058.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf059.golden | 16 ++++++++++++++++ .../Unified/DarkMode/WidthOf060.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf001.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf002.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf003.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf004.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf005.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf006.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf007.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf008.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf009.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf010.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf011.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf012.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf013.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf014.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf015.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf016.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf017.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf018.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf019.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf020.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf021.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf022.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf023.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf024.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf025.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf026.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf027.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf028.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf029.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf030.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf031.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf032.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf033.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf034.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf035.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf036.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf037.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf038.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf039.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf040.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf041.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf042.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf043.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf044.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf045.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf046.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf047.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf048.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf049.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf050.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf051.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf052.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf053.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf054.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf055.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf056.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf057.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf058.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf059.golden | 16 ++++++++++++++++ .../Unified/LightMode/WidthOf060.golden | 16 ++++++++++++++++ 340 files changed, 5220 insertions(+) create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf001.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf002.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf003.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf004.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf005.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf006.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf007.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf008.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf011.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf012.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf013.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf014.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf015.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf016.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf017.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf018.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf019.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf020.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf021.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf022.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf023.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf024.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf025.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf026.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf027.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf028.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf029.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf030.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf031.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf032.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf033.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf034.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf035.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf036.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf037.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf038.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf039.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf040.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf041.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf042.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf043.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf044.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf045.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf046.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf047.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf048.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf049.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf050.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf051.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf052.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf053.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf054.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf055.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf056.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf057.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf058.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf059.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf060.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf061.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf062.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf063.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf064.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf065.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf066.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf067.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf068.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf069.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf070.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf071.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf072.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf073.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf074.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf075.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf076.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf077.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf078.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf079.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf080.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf081.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf082.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf083.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf084.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf085.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf086.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf087.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf088.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf089.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf090.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf091.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf092.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf093.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf094.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf095.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf096.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf097.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf098.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf099.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf100.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf101.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf102.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf103.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf104.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf105.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf106.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf107.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf108.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf109.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf110.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf001.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf002.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf003.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf004.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf005.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf006.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf007.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf008.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf009.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf010.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf011.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf012.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf013.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf014.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf015.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf016.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf017.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf018.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf019.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf020.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf021.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf022.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf023.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf024.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf025.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf026.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf027.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf028.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf029.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf030.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf031.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf032.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf033.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf034.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf035.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf036.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf037.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf038.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf039.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf040.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf041.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf042.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf043.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf044.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf045.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf046.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf047.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf048.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf049.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf050.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf051.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf052.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf053.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf054.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf055.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf056.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf057.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf058.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf059.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf060.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf061.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf062.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf063.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf064.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf065.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf066.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf067.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf068.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf069.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf070.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf071.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf072.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf073.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf074.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf075.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf076.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf077.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf078.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf079.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf080.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf081.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf082.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf083.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf084.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf085.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf086.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf087.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf088.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf089.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf090.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf091.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf092.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf093.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf094.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf095.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf096.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf097.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf098.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf099.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf100.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf101.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf102.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf103.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf104.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf105.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf106.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf107.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf108.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf109.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf110.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf001.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf002.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf003.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf004.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf005.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf006.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf007.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf008.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf009.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf010.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf011.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf012.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf013.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf014.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf015.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf016.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf017.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf018.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf019.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf020.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf021.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf022.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf023.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf024.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf025.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf026.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf027.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf028.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf029.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf030.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf031.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf032.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf033.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf034.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf035.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf036.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf037.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf038.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf039.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf040.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf041.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf042.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf043.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf044.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf045.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf046.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf047.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf048.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf049.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf050.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf051.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf052.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf053.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf054.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf055.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf056.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf057.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf058.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf059.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf060.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf001.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf002.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf003.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf004.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf005.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf006.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf007.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf008.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf009.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf010.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf011.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf012.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf013.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf014.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf015.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf016.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf017.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf018.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf019.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf020.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf021.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf022.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf023.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf024.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf025.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf026.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf027.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf028.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf029.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf030.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf031.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf032.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf033.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf034.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf035.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf036.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf037.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf038.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf039.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf040.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf041.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf042.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf043.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf044.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf045.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf046.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf047.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf048.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf049.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf050.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf051.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf052.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf053.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf054.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf055.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf056.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf057.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf058.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf059.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf060.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf001.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf001.golden new file mode 100644 index 0000000000000000000000000000000000000000..3f0fb19faa2c936073b3eb4a1cd5ee2224221845 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf001.golden @@ -0,0 +1,15 @@ +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf002.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf002.golden new file mode 100644 index 0000000000000000000000000000000000000000..3d4d277689633144e26a6c58725b0672aa36b0fe --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf002.golden @@ -0,0 +1,15 @@ +   +   +   +   +   +   +   +   +   +   + 1 + 1 + 1 +   + 1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf003.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf003.golden new file mode 100644 index 0000000000000000000000000000000000000000..0e6d1110d23c809c16870f4b298f6bbc41d1dc63 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf003.golden @@ -0,0 +1,15 @@ +  … +  2 +  3 +  4 +   +  5 +  6 +  7 +  … +  9 + 10 + 11 + 12 +   + 13 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf004.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf004.golden new file mode 100644 index 0000000000000000000000000000000000000000..ee8fe5e741cf0a9f6b1293084eb1434497beb7ac --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf004.golden @@ -0,0 +1,15 @@ +  …  +  2  +  3  +  4  +    +  5  +  6  +  7  +  …  +  9  + 10  + 11  + 12  +    + 13  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf005.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf005.golden new file mode 100644 index 0000000000000000000000000000000000000000..eda67bf724a6a3e1fe5871ff2d59ad913163cf23 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf005.golden @@ -0,0 +1,15 @@ +  …   +  2   +  3   +  4   +     +  5   +  6   +  7   +  …   +  9   + 10   + 11   + 12 - +     + 13   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf006.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf006.golden new file mode 100644 index 0000000000000000000000000000000000000000..5666a407097b7ca00b5de701ad0c5c09e073b07b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf006.golden @@ -0,0 +1,15 @@ +  …    +  2   +  3   +  4   +     +  5   +  6   +  7   +  …    +  9   + 10   + 11   + 12 -  +     + 13   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf007.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf007.golden new file mode 100644 index 0000000000000000000000000000000000000000..bfa5cde6aa78beee96f342a8e506538f42cdfb70 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf007.golden @@ -0,0 +1,15 @@ +  …   … +  2    +  3    +  4    +      +  5    +  6    +  7    +  …   … +  9    + 10    + 11    + 12 -   +      + 13    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf008.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf008.golden new file mode 100644 index 0000000000000000000000000000000000000000..ba4b00fa463958ecb94296755136e897ff1db17f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf008.golden @@ -0,0 +1,15 @@ +  …   …  +  2     +  3     +  4     +       +  5     +  6     +  7     +  …   …  +  9   1 + 10   1 + 11   1 + 12 -  1 +     1 + 13   1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden new file mode 100644 index 0000000000000000000000000000000000000000..492b2a9752bfc766e2fe6b649f19d2315f3b3a20 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden @@ -0,0 +1,15 @@ +  … …  …  +  2    2  +  3    3  +  4    4  +      5  +  5    6  +  6    7  +  7    8  +  … …  …  +  9   10  + 10   11  + 11   12  + 12 -  13 +     14  + 13   15  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden new file mode 100644 index 0000000000000000000000000000000000000000..08015f590123b93c52341af11ca85d5fa67030d5 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden @@ -0,0 +1,15 @@ +  … …  …   +  2    2   +  3    3   +  4    4   +      5 + +  5    6   +  6    7   +  7    8   +  … …  …   +  9   10   + 10   11   + 11   12   + 12 -  13  +     14 + + 13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf011.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf011.golden new file mode 100644 index 0000000000000000000000000000000000000000..c808c3d9a4d15073c6d921066beb1291954f16c5 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf011.golden @@ -0,0 +1,15 @@ +  …  …  …   +  2    2   +  3    3   +  4    4   +      5 + +  5    6   +  6    7   +  7    8   +  …  …  …   +  9   10   + 10   11   + 11   12   + 12 -  13 + +     14 + + 13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf012.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf012.golden new file mode 100644 index 0000000000000000000000000000000000000000..031cd9ec5a358c5ff84438bbc4a20ecea2cca91c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf012.golden @@ -0,0 +1,15 @@ +  …  …  …    +  2    2   +  3    3   +  4    4   +      5 +  +  5    6   +  6    7   +  7    8   +  …  …  …    +  9   10   + 10   11   + 11   12   + 12 -  13 +  +     14 +  + 13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf013.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf013.golden new file mode 100644 index 0000000000000000000000000000000000000000..cd6ac7321e5628829f80654e9bf4a88abb0e3432 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf013.golden @@ -0,0 +1,15 @@ +  …  …  …    +  2    2    +  3    3  … +  4    4  … +      5 + … +  5    6  ) +  6    7    +  7    8  … +  …  …  …    +  9   10  } + 10   11    + 11   12  … + 12 -  13 + … +     14 + … + 13   15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf014.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf014.golden new file mode 100644 index 0000000000000000000000000000000000000000..8c707fb4c7803da6550b521a0df310f3c96764ef --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf014.golden @@ -0,0 +1,15 @@ +  …  …  …    +  2     2    +  3  …  3  … +  4  …  4  … +       5 + … +  5  )  6  ) +  6     7    +  7  …  8  … +  …  …  …    +  9  } 10  } + 10    11    + 11  … 12  … + 12 - … 13 + … +      14 + … + 13  } 15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf015.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf015.golden new file mode 100644 index 0000000000000000000000000000000000000000..1a7b2c4d5ddaac1982beac69c12cf358c024fb17 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf015.golden @@ -0,0 +1,15 @@ +  …  …  …    +  2     2    +  3  …  3  i… +  4  …  4  … +       5 +  … +  5  )  6  )  +  6     7    +  7  …  8  f… +  …  …  …    +  9  } 10  }  + 10    11    + 11  … 12  f… + 12 - … 13 +  … +      14 +  … + 13  } 15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf016.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf016.golden new file mode 100644 index 0000000000000000000000000000000000000000..5d9a23842c5e195ee98757d25efbe3e3e84f5934 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf016.golden @@ -0,0 +1,15 @@ +  …  @…  …    +  2     2    +  3  i…  3  i… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  f…  8  f… +  …  @…  …    +  9  }  10  }  + 10    11    + 11  f… 12  f… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf017.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf017.golden new file mode 100644 index 0000000000000000000000000000000000000000..9cd9e4e522bac69a59f8b64d6f6a74bd93948793 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf017.golden @@ -0,0 +1,15 @@ +  …  @…  …    +  2     2    +  3  i…  3  im… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  f…  8  fu… +  …  @…  …    +  9  }  10  }  + 10    11    + 11  f… 12  fu… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf018.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf018.golden new file mode 100644 index 0000000000000000000000000000000000000000..3b553749e0dc8afc126ce8e0b8178ffe6fd1a661 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf018.golden @@ -0,0 +1,15 @@ +  …  @@…  …    +  2     2    +  3  im…  3  im… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  fu…  8  fu… +  …  @@…  …    +  9  }  10  }  + 10    11    + 11  fu… 12  fu… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf019.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf019.golden new file mode 100644 index 0000000000000000000000000000000000000000..0ae7207641c9eb8d9fd3fd0b52b946bcf458581a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf019.golden @@ -0,0 +1,15 @@ +  …  @@…  …    +  2     2    +  3  im…  3  imp… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  fu…  8  fun… +  …  @@…  …    +  9  }  10  }  + 10    11    + 11  fu… 12  fun… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf020.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf020.golden new file mode 100644 index 0000000000000000000000000000000000000000..48879334950a8674b4400f08ed4fec236b97f653 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf020.golden @@ -0,0 +1,15 @@ +  …  @@ …  …    +  2     2    +  3  imp…  3  imp… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  fun…  8  fun… +  …  @@ …  …    +  9  }  10  }  + 10    11    + 11  fun… 12  fun… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf021.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf021.golden new file mode 100644 index 0000000000000000000000000000000000000000..743209f504d5734917f6872023aaf3c8fa35d050 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf021.golden @@ -0,0 +1,15 @@ +  …  @@ …  …    +  2     2    +  3  imp…  3  impo… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  fun…  8  func… +  …  @@ …  …    +  9  }  10  }  + 10    11    + 11  fun… 12  func… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf022.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf022.golden new file mode 100644 index 0000000000000000000000000000000000000000..3d31118daaf623b2d24ddf076120c778fba83f3e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf022.golden @@ -0,0 +1,15 @@ +  …  @@ -…  …    +  2     2    +  3  impo…  3  impo… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  func…  8  func… +  …  @@ -…  …    +  9  }  10  }  + 10    11    + 11  func… 12  func… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf023.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf023.golden new file mode 100644 index 0000000000000000000000000000000000000000..9e1a2f26f88110a2eae20bff129f8c2099ca6de3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf023.golden @@ -0,0 +1,15 @@ +  …  @@ -…  …    +  2     2    +  3  impo…  3  impor… +  4  …  4  "… +       5 +  "… +  5  )   6  )  +  6     7    +  7  func…  8  func … +  …  @@ -…  …    +  9  }  10  }  + 10    11    + 11  func… 12  func … + 12 -  … 13 +  c… +      14 +  r… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf024.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf024.golden new file mode 100644 index 0000000000000000000000000000000000000000..179f406d4766932cf48dc5c89600a4c17028ad0a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf024.golden @@ -0,0 +1,15 @@ +  …  @@ -2…  …    +  2     2    +  3  impor…  3  impor… +  4  "…  4  "… +       5 +  "… +  5  )   6  )  +  6     7    +  7  func …  8  func … +  …  @@ -9…  …    +  9  }  10  }  + 10    11    + 11  func … 12  func … + 12 -  r… 13 +  c… +      14 +  r… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf025.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf025.golden new file mode 100644 index 0000000000000000000000000000000000000000..fb89714a4f10eb2d4ec50820e0a722309da54c2b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf025.golden @@ -0,0 +1,15 @@ +  …  @@ -2…  …    +  2     2    +  3  impor…  3  import… +  4  "…  4  "f… +       5 +  "s… +  5  )   6  )  +  6     7    +  7  func …  8  func m… +  …  @@ -9…  …    +  9  }  10  }  + 10    11    + 11  func … 12  func g… + 12 -  r… 13 +  co… +      14 +  re… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf026.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf026.golden new file mode 100644 index 0000000000000000000000000000000000000000..a846931170021545570539a324f1f6b39283cfef --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf026.golden @@ -0,0 +1,15 @@ +  …  @@ -2,…  …    +  2     2    +  3  import…  3  import… +  4  "f…  4  "f… +       5 +  "s… +  5  )   6  )  +  6     7    +  7  func m…  8  func m… +  …  @@ -9,…  …    +  9  }  10  }  + 10    11    + 11  func g… 12  func g… + 12 -  re… 13 +  co… +      14 +  re… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf027.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf027.golden new file mode 100644 index 0000000000000000000000000000000000000000..0dd8b722218b90b7489240fd2f9fc47c6222060c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf027.golden @@ -0,0 +1,15 @@ +  …  @@ -2,…  …    +  2     2    +  3  import…  3  import ( +  4  "f…  4  "fm… +       5 +  "st… +  5  )   6  )  +  6     7    +  7  func m…  8  func ma… +  …  @@ -9,…  …    +  9  }  10  }  + 10    11    + 11  func g… 12  func ge… + 12 -  re… 13 +  con… +      14 +  ret… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf028.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf028.golden new file mode 100644 index 0000000000000000000000000000000000000000..84d888514dc55b2a3820ad91dd900cb104af0bf4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf028.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6…  …    +  2     2    +  3  import (  3  import ( +  4  "fm…  4  "fm… +       5 +  "st… +  5  )   6  )  +  6     7    +  7  func ma…  8  func ma… +  …  @@ -9,5…  …    +  9  }  10  }  + 10    11    + 11  func ge… 12  func ge… + 12 -  ret… 13 +  con… +      14 +  ret… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf029.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf029.golden new file mode 100644 index 0000000000000000000000000000000000000000..538886b363764a67dca2949861ed5f081055e037 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf029.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6…  …    +  2     2    +  3  import (  3  import (  +  4  "fm…  4  "fmt" +       5 +  "str… +  5  )   6  )  +  6     7    +  7  func ma…  8  func mai… +  …  @@ -9,5…  …    +  9  }  10  }  + 10    11    + 11  func ge… 12  func get… + 12 -  ret… 13 +  cont… +      14 +  retu… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf030.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf030.golden new file mode 100644 index 0000000000000000000000000000000000000000..3bec03e201df802afe674260fb7aff16b81fecf3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf030.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 …  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"  4  "fmt" +       5 +  "str… +  5  )   6  )  +  6     7    +  7  func mai…  8  func mai… +  …  @@ -9,5 …  …    +  9  }  10  }  + 10    11    + 11  func get… 12  func get… + 12 -  retu… 13 +  cont… +      14 +  retu… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf031.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf031.golden new file mode 100644 index 0000000000000000000000000000000000000000..cadeab14d6f48a6627f76459237e2e7b6088f25f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf031.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 …  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"  4  "fmt"  +       5 +  "stri… +  5  )   6  )  +  6     7    +  7  func mai…  8  func main… +  …  @@ -9,5 …  …    +  9  }  10  }  + 10    11    + 11  func get… 12  func getC… + 12 -  retu… 13 +  conte… +      14 +  retur… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf032.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf032.golden new file mode 100644 index 0000000000000000000000000000000000000000..aa56ada988e323ca2d5067e7a0d91093943338ca --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf032.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "stri… +  5  )   6  )  +  6     7    +  7  func main…  8  func main… +  …  @@ -9,5 +…  …    +  9  }  10  }  + 10    11    + 11  func getC… 12  func getC… + 12 -  retur… 13 +  conte… +      14 +  retur… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf033.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf033.golden new file mode 100644 index 0000000000000000000000000000000000000000..26ab24b3d3310af93038c39c49d554b9bd837ce4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf033.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strin… +  5  )   6  )  +  6     7    +  7  func main…  8  func main(… +  …  @@ -9,5 +…  …    +  9  }  10  }  + 10    11    + 11  func getC… 12  func getCo… + 12 -  retur… 13 +  conten… +      14 +  return… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf034.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf034.golden new file mode 100644 index 0000000000000000000000000000000000000000..22ff3a92f51b86f501e40a68f3e249eb052db018 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf034.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strin… +  5  )   6  )  +  6     7    +  7  func main(…  8  func main(… +  …  @@ -9,5 +1…  …    +  9  }  10  }  + 10    11    + 11  func getCo… 12  func getCo… + 12 -  return… 13 +  conten… +      14 +  return… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf035.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf035.golden new file mode 100644 index 0000000000000000000000000000000000000000..1e17891f4c4beb48c8210a88141a81838a35ecf1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf035.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "string… +  5  )   6  )  +  6     7    +  7  func main(…  8  func main()… +  …  @@ -9,5 +1…  …    +  9  }  10  }  + 10    11    + 11  func getCo… 12  func getCon… + 12 -  return… 13 +  content… +      14 +  return … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf036.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf036.golden new file mode 100644 index 0000000000000000000000000000000000000000..14c042e13c7776e8bbd6686bf1feb15086c4a991 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf036.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "string… +  5  )   6  )  +  6     7    +  7  func main()…  8  func main()… +  …  @@ -9,5 +10…  …    +  9  }  10  }  + 10    11    + 11  func getCon… 12  func getCon… + 12 -  return … 13 +  content… +      14 +  return … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf037.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf037.golden new file mode 100644 index 0000000000000000000000000000000000000000..03edc45f2dd75275bd29c22633a96f39c5dd51f5 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf037.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings" +  5  )   6  )  +  6     7    +  7  func main()…  8  func main() { +  …  @@ -9,5 +10…  …    +  9  }  10  }  + 10    11    + 11  func getCon… 12  func getCont… + 12 -  return … 13 +  content … +      14 +  return c… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf038.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf038.golden new file mode 100644 index 0000000000000000000000000000000000000000..622035ef3cceab251fc765feccbe3dcdca5946dc --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf038.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings" +  5  )   6  )  +  6     7    +  7  func main() {  8  func main() { +  …  @@ -9,5 +10,…  …    +  9  }  10  }  + 10    11    + 11  func getCont… 12  func getCont… + 12 -  return "… 13 +  content … +      14 +  return c… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf039.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf039.golden new file mode 100644 index 0000000000000000000000000000000000000000..6f956ea9f603d28e887602a454bd7420116add9d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf039.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {  8  func main() {  +  …  @@ -9,5 +10,…  …    +  9  }  10  }  + 10    11    + 11  func getCont… 12  func getConte… + 12 -  return "… 13 +  content :… +      14 +  return co… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf040.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf040.golden new file mode 100644 index 0000000000000000000000000000000000000000..1c8e9fa4b8a906b6baaf787501fa0d6d41e5595c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf040.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 …  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6…  …    +  9  }  10  }  + 10    11    + 11  func getConte… 12  func getConte… + 12 -  return "H… 13 +  content :… +      14 +  return co… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf041.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf041.golden new file mode 100644 index 0000000000000000000000000000000000000000..6efa701eefb58e95615c2f4a51e5b615d1564365 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf041.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 …  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6…  …    +  9  }  10  }  + 10    11    + 11  func getConte… 12  func getConten… + 12 -  return "H… 13 +  content :=… +      14 +  return con… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf042.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf042.golden new file mode 100644 index 0000000000000000000000000000000000000000..6621a64df572c200d8e799e1a75079b6e7329b25 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf042.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 …  …    +  9  }  10  }  + 10    11    + 11  func getConten… 12  func getConten… + 12 -  return "He… 13 +  content :=… +      14 +  return con… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf043.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf043.golden new file mode 100644 index 0000000000000000000000000000000000000000..68d7829c5f981882b4bcb735099e80f073bf386e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf043.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 …  …    +  9  }  10  }  + 10    11    + 11  func getConten… 12  func getContent… + 12 -  return "He… 13 +  content := … +      14 +  return cont… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf044.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf044.golden new file mode 100644 index 0000000000000000000000000000000000000000..ce1abcbb495ab08edae18e6ec7927fd1e0ebdeae --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf044.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@   …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @…  …    +  9  }  10  }  + 10    11    + 11  func getContent… 12  func getContent… + 12 -  return "Hel… 13 +  content := … +      14 +  return cont… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf045.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf045.golden new file mode 100644 index 0000000000000000000000000000000000000000..177dce4aa74ce9404658fbddc209d454e5cb44af --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf045.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@   …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @…  …    +  9  }  10  }  + 10    11    + 11  func getContent… 12  func getContent(… + 12 -  return "Hel… 13 +  content := s… +      14 +  return conte… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf046.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf046.golden new file mode 100644 index 0000000000000000000000000000000000000000..c5bdda3766471b424b84b56a6f6c184c0493896c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf046.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@   …    +  9  }  10  }  + 10    11    + 11  func getContent(… 12  func getContent(… + 12 -  return "Hell… 13 +  content := s… +      14 +  return conte… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf047.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf047.golden new file mode 100644 index 0000000000000000000000000000000000000000..4b9a0f161aaaffc582e27fe0ff454f9dd4f6c2f8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf047.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@   …    +  9  }  10  }  + 10    11    + 11  func getContent(… 12  func getContent()… + 12 -  return "Hell… 13 +  content := st… +      14 +  return content + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf048.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf048.golden new file mode 100644 index 0000000000000000000000000000000000000000..b8f6fc9046127244b58014ef446a96871cf7e0c7 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf048.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent()… 12  func getContent()… + 12 -  return "Hello… 13 +  content := st… +      14 +  return content + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf049.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf049.golden new file mode 100644 index 0000000000000000000000000000000000000000..d783ea79353017d1de1e102ae3df5e06bcf2dd05 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf049.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent()… 12  func getContent() … + 12 -  return "Hello… 13 +  content := str… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf050.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf050.golden new file mode 100644 index 0000000000000000000000000000000000000000..5de6b925688ed3c7143bca5258e4c3e7e5120163 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf050.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() … 12  func getContent() … + 12 -  return "Hello,… 13 +  content := str… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf051.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf051.golden new file mode 100644 index 0000000000000000000000000000000000000000..fe5bfd05adf9a7b1a97b783ad56575902621b26a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf051.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() … 12  func getContent() s… + 12 -  return "Hello,… 13 +  content := stri… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf052.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf052.golden new file mode 100644 index 0000000000000000000000000000000000000000..daffbbc997f30f484c7f705cebc79395bec642f4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf052.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() s… 12  func getContent() s… + 12 -  return "Hello, … 13 +  content := stri… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf053.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf053.golden new file mode 100644 index 0000000000000000000000000000000000000000..7a37d2a106c5f6324c4d18d11ec67923a471bb66 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf053.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() s… 12  func getContent() st… + 12 -  return "Hello, … 13 +  content := strin… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf054.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf054.golden new file mode 100644 index 0000000000000000000000000000000000000000..d4f4485c6a83afb57260068869d2cbfbedf565d4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf054.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() st… 12  func getContent() st… + 12 -  return "Hello, w… 13 +  content := strin… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf055.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf055.golden new file mode 100644 index 0000000000000000000000000000000000000000..d1c1a90e99ef2f66423ca1caa28bd6ce9f43a174 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf055.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() st… 12  func getContent() str… + 12 -  return "Hello, w… 13 +  content := string… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf056.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf056.golden new file mode 100644 index 0000000000000000000000000000000000000000..2037d25ac7a7f09044e52a0d9cd95f72925346b3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf056.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() str… 12  func getContent() str… + 12 -  return "Hello, wo… 13 +  content := string… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf057.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf057.golden new file mode 100644 index 0000000000000000000000000000000000000000..da547a2463d46085eef590ea4153bfa39c784c05 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf057.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() str… 12  func getContent() stri… + 12 -  return "Hello, wo… 13 +  content := strings… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf058.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf058.golden new file mode 100644 index 0000000000000000000000000000000000000000..1fcb6cb73b8f013c15960f728c9fef97509d6875 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf058.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() stri… 12  func getContent() stri… + 12 -  return "Hello, wor… 13 +  content := strings… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf059.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf059.golden new file mode 100644 index 0000000000000000000000000000000000000000..88d43803fd555f48ff6867b43fe18b2fc3a29a22 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf059.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() stri… 12  func getContent() strin… + 12 -  return "Hello, wor… 13 +  content := strings.… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf060.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf060.golden new file mode 100644 index 0000000000000000000000000000000000000000..2a5a32a0e3467ce28cfe08b3d3beddc04078c7bc --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf060.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() strin… 12  func getContent() strin… + 12 -  return "Hello, worl… 13 +  content := strings.… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf061.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf061.golden new file mode 100644 index 0000000000000000000000000000000000000000..6a9dc2260a954a3bdf1c4090f1ce80a281c2d2f5 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf061.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() strin… 12  func getContent() string… + 12 -  return "Hello, worl… 13 +  content := strings.T… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf062.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf062.golden new file mode 100644 index 0000000000000000000000000000000000000000..0741a16382bf7016153354d4dbf378bb045e8c68 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf062.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string… 12  func getContent() string… + 12 -  return "Hello, world… 13 +  content := strings.T… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf063.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf063.golden new file mode 100644 index 0000000000000000000000000000000000000000..2876c720e136414661e2fdac2b29a848d25e0a59 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf063.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string… 12  func getContent() string { + 12 -  return "Hello, world… 13 +  content := strings.To… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf064.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf064.golden new file mode 100644 index 0000000000000000000000000000000000000000..9a8e3724e2569600dc0a1fefc44e94017f808748 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf064.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string { 12  func getContent() string { + 12 -  return "Hello, world!" 13 +  content := strings.To… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf065.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf065.golden new file mode 100644 index 0000000000000000000000000000000000000000..b950187ab3d3e887be4a0c23018d5f1c393f2881 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf065.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string { 12  func getContent() string {  + 12 -  return "Hello, world!" 13 +  content := strings.ToU… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf066.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf066.golden new file mode 100644 index 0000000000000000000000000000000000000000..f3ae596f89c50f5f9cae4591708728958e597f69 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf066.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToU… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf067.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf067.golden new file mode 100644 index 0000000000000000000000000000000000000000..ebec6c6aff51d0c279a335152f14923a475bd447 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf067.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUp… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf068.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf068.golden new file mode 100644 index 0000000000000000000000000000000000000000..4bbb8da62e5e1843a5c3666f89ddb63272c9effc --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf068.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUp… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf069.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf069.golden new file mode 100644 index 0000000000000000000000000000000000000000..b1e6f5ad6b107290d40bf9252c36ac6c38d02aa4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf069.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpp… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf070.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf070.golden new file mode 100644 index 0000000000000000000000000000000000000000..76c0bf09487a92deb04c72fa8baac98191aa1cd2 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf070.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpp… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf071.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf071.golden new file mode 100644 index 0000000000000000000000000000000000000000..b27f452935e340cfb3efcb23fec2cea10d65c81d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf071.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUppe… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf072.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf072.golden new file mode 100644 index 0000000000000000000000000000000000000000..77a37991b01bb630846e793aa685fa9d1f24232f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf072.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUppe… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf073.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf073.golden new file mode 100644 index 0000000000000000000000000000000000000000..1dfe17b272032302cb50793c205064e9b1e1059a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf073.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf074.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf074.golden new file mode 100644 index 0000000000000000000000000000000000000000..b100d1328e48d0600a150ab4a5618cbfbbe2a151 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf074.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf075.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf075.golden new file mode 100644 index 0000000000000000000000000000000000000000..e24cdb23d386a993490f39c57178d49770c85d3b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf075.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper(… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf076.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf076.golden new file mode 100644 index 0000000000000000000000000000000000000000..5e8829d51a939889051ef21169a87e71a1661bb5 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf076.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper(… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf077.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf077.golden new file mode 100644 index 0000000000000000000000000000000000000000..b7c73f134dda2c66a8718116ae221fe5cba12cf6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf077.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf078.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf078.golden new file mode 100644 index 0000000000000000000000000000000000000000..56f55d6d43a066e430c6916d08cd8578bd9a8dde --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf078.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf079.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf079.golden new file mode 100644 index 0000000000000000000000000000000000000000..d9b6279c1511ebbaf19905097c97f4e8a9ff3923 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf079.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("H… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf080.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf080.golden new file mode 100644 index 0000000000000000000000000000000000000000..41b01d40926f703c85cfecc81f1dbbf35a0e5aed --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf080.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("H… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf081.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf081.golden new file mode 100644 index 0000000000000000000000000000000000000000..e012e6696cf24d00144b7a2d0591ec78ffc42551 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf081.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("He… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf082.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf082.golden new file mode 100644 index 0000000000000000000000000000000000000000..9139058c3e664bc8b5d0e739eedf530f650d5f3d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf082.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("He… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf083.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf083.golden new file mode 100644 index 0000000000000000000000000000000000000000..0b80966531705b5fc54336c960c7b85565ba6547 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf083.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hel… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf084.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf084.golden new file mode 100644 index 0000000000000000000000000000000000000000..d5319378486f26789347ba6ac521988f5c9992d9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf084.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hel… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf085.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf085.golden new file mode 100644 index 0000000000000000000000000000000000000000..40e2834cfc02581cdff620d6c8b6dfe502ff32a0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf085.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hell… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf086.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf086.golden new file mode 100644 index 0000000000000000000000000000000000000000..c1af836ec626347d33cb82be5eb81b9698af5b02 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf086.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hell… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf087.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf087.golden new file mode 100644 index 0000000000000000000000000000000000000000..90e06da7f06107c5b08730e3010af4ee67586af9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf087.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf088.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf088.golden new file mode 100644 index 0000000000000000000000000000000000000000..a33117d11235fc9662c9576e882719b5e08fcc04 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf088.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf089.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf089.golden new file mode 100644 index 0000000000000000000000000000000000000000..6be1ee8526622438332c7dfa5f5203acf1fd912c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf089.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello,… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf090.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf090.golden new file mode 100644 index 0000000000000000000000000000000000000000..49b388eb527b20bc400eea5ce6e64fb15bab1627 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf090.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello,… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf091.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf091.golden new file mode 100644 index 0000000000000000000000000000000000000000..db6e1840a345f648c5487ed13ffd408f060d5611 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf091.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, … +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf092.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf092.golden new file mode 100644 index 0000000000000000000000000000000000000000..bb5b478b90473be851d9e22117728d78f0c52ec3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf092.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, … +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf093.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf093.golden new file mode 100644 index 0000000000000000000000000000000000000000..7114ee69020ba3d575757c9b8f334a21f848d777 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf093.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, W… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf094.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf094.golden new file mode 100644 index 0000000000000000000000000000000000000000..c133e9e0e55692497a0d275043d45080f51e68b7 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf094.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, W… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf095.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf095.golden new file mode 100644 index 0000000000000000000000000000000000000000..3edf2198f9b7a2c85fb2eec4ffb14792e2bdfeab --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf095.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wo… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf096.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf096.golden new file mode 100644 index 0000000000000000000000000000000000000000..a2fad78b8ee1b5a30af5cdb9b847d65e829a5809 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf096.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wo… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf097.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf097.golden new file mode 100644 index 0000000000000000000000000000000000000000..2671fb4106b17973355a61c9661a660ea8ff74e6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf097.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wor… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf098.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf098.golden new file mode 100644 index 0000000000000000000000000000000000000000..47408c13a8acd9f9ba998762e5746b8e95a2ee35 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf098.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wor… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf099.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf099.golden new file mode 100644 index 0000000000000000000000000000000000000000..a3f907fd60ec55bf3d92e59294457f3ff3054dee --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf099.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Worl… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf100.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf100.golden new file mode 100644 index 0000000000000000000000000000000000000000..8df214df69a0c3af76a1ac0878e1345d5918a3aa --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf100.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Worl… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf101.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf101.golden new file mode 100644 index 0000000000000000000000000000000000000000..511606f7ae59a70c750c6a2a9ccec1022b4e23c6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf101.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf102.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf102.golden new file mode 100644 index 0000000000000000000000000000000000000000..7091f90878b86597bb85677d5f9fb3e1a514b754 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf102.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf103.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf103.golden new file mode 100644 index 0000000000000000000000000000000000000000..1a50be6289e7fe0a22f2ba707e34e99fbcda588c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf103.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf104.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf104.golden new file mode 100644 index 0000000000000000000000000000000000000000..6b5bd3510c3e41af6e004e8354b5ac119b36a804 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf104.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf105.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf105.golden new file mode 100644 index 0000000000000000000000000000000000000000..36645e654ee50deccbb1c07bddfd3d6da020cc7b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf105.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!") +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf106.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf106.golden new file mode 100644 index 0000000000000000000000000000000000000000..4101ff8d5ff48ae05763bb84b9599927fe223c9e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf106.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!") +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf107.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf107.golden new file mode 100644 index 0000000000000000000000000000000000000000..96763fdf2fa5e966678b235475ae318581dfe80d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf107.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf108.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf108.golden new file mode 100644 index 0000000000000000000000000000000000000000..c69efe614a04aba3f680d6cf9af91112af13560b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf108.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf109.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf109.golden new file mode 100644 index 0000000000000000000000000000000000000000..cbb3322bbe19b0655c6b439f0affa71d511a684b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf109.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf110.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf110.golden new file mode 100644 index 0000000000000000000000000000000000000000..61d56b34ce17751079aab8c2f00a80397cb80627 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf110.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf001.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf001.golden new file mode 100644 index 0000000000000000000000000000000000000000..3fc43d9cabb64c1de963ffc5fb229bb6a853690e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf001.golden @@ -0,0 +1,15 @@ +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf002.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf002.golden new file mode 100644 index 0000000000000000000000000000000000000000..e9ff4178d144232d7c64aa08f98235174ae6171a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf002.golden @@ -0,0 +1,15 @@ +   +   +   +   +   +   +   +   +   +   + 1 + 1 + 1 +   + 1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf003.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf003.golden new file mode 100644 index 0000000000000000000000000000000000000000..e4793972aaef14ebd0efdd95899a412b7afd88fe --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf003.golden @@ -0,0 +1,15 @@ +  … +  2 +  3 +  4 +   +  5 +  6 +  7 +  … +  9 + 10 + 11 + 12 +   + 13 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf004.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf004.golden new file mode 100644 index 0000000000000000000000000000000000000000..ea92f5ceffc1e6c99381064d731ac9321f09ce3e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf004.golden @@ -0,0 +1,15 @@ +  …  +  2  +  3  +  4  +    +  5  +  6  +  7  +  …  +  9  + 10  + 11  + 12  +    + 13  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf005.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf005.golden new file mode 100644 index 0000000000000000000000000000000000000000..52d7f5f1a76707802fbc4426c0004f5c618cf887 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf005.golden @@ -0,0 +1,15 @@ +  …   +  2   +  3   +  4   +     +  5   +  6   +  7   +  …   +  9   + 10   + 11   + 12 - +     + 13   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf006.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf006.golden new file mode 100644 index 0000000000000000000000000000000000000000..7d4c531980e2af3a94cd612e2fcb5bb672ceb553 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf006.golden @@ -0,0 +1,15 @@ +  …    +  2   +  3   +  4   +     + [38;2;58;57;67;48;2;223;219;221m 5   +  6   +  7   +  …    +  9   + 10   + 11   + 12 -  +     + 13   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf007.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf007.golden new file mode 100644 index 0000000000000000000000000000000000000000..5d837eeb27466b95efdb8fd65f9a39ca9d27e3f4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf007.golden @@ -0,0 +1,15 @@ +  …   … +  2    +  3    +  4    +      +  5    +  6    +  7    +  …   … +  9    + 10    + 11    + 12 -   +      + 13    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf008.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf008.golden new file mode 100644 index 0000000000000000000000000000000000000000..1a34fe59526ac61809752750759bfd894c9fdbb7 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf008.golden @@ -0,0 +1,15 @@ +  …   …  +  2     +  3     +  4     +       +  5     +  6     +  7     +  …   …  +  9   1 + 10   1 + 11   1 + 12 -  1 +     1 + 13   1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf009.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf009.golden new file mode 100644 index 0000000000000000000000000000000000000000..7fc162af8586a55b5b3f89782d5ebf608a6a4a75 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf009.golden @@ -0,0 +1,15 @@ +  … …  …  +  2    2  +  3    3  +  4    4  +      5  +  5    6  +  6    7  +  7    8  +  … …  …  +  9   10  + 10   11  + 11   12  + 12 -  13 +     14  + 13   15  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf010.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf010.golden new file mode 100644 index 0000000000000000000000000000000000000000..41828b4edca8816b1de26248b20e65f11e7abebb --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf010.golden @@ -0,0 +1,15 @@ +  … …  …   +  2    2   +  3    3   +  4    4   +      5 + +  5    6   +  6    7   +  7    8   +  … …  …   +  9   10   + 10   11   + 11   12   + 12 -  13  +     14 + + 13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf011.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf011.golden new file mode 100644 index 0000000000000000000000000000000000000000..502334c77d0f58af035bf4998cf69f0344309a0a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf011.golden @@ -0,0 +1,15 @@ +  …  …  …   +  2    2   +  3    3   +  4    4   +      5 + +  5    6   +  6    7   +  7    8   +  …  …  …   +  9   10   + 10   11   + 11   12   + 12 -  13 + +     14 + + 13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf012.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf012.golden new file mode 100644 index 0000000000000000000000000000000000000000..70e872896752b131d9c42289a062f2ac7b0069cb --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf012.golden @@ -0,0 +1,15 @@ +  …  …  …    +  2    2   +  3    3   +  4    4   +      5 +  +  5    6   +  6    7   +  7    8   +  …  …  …    +  9   10   + 10   11   + 11   12   + 12 -  13 +  +     14 +  + 13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf013.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf013.golden new file mode 100644 index 0000000000000000000000000000000000000000..7eda447090c6b85ca3502f7371afc57022c1b850 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf013.golden @@ -0,0 +1,15 @@ +  …  …  …    +  2    2    +  3    3  … +  4    4  … +      5 + … +  5    6  ) +  6    7    +  7    8  … +  …  …  …    +  9   10  } + 10   11    + 11   12  … + 12 -  13 + … +     14 + … + 13   15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf014.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf014.golden new file mode 100644 index 0000000000000000000000000000000000000000..caf23c7a2a5d9aa605db14b60e521c30ca4e56f4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf014.golden @@ -0,0 +1,15 @@ +  …  …  …    +  2     2    +  3  …  3  … +  4  …  4  … +       5 + … +  5  )  6  ) +  6     7    +  7  …  8  … +  …  …  …    +  9  } 10  } + 10    11    + 11  … 12  … + 12 - … 13 + … +      14 + … + 13  } 15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf015.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf015.golden new file mode 100644 index 0000000000000000000000000000000000000000..659cd730961e5a3e8b9209eee543b2079a7ad2de --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf015.golden @@ -0,0 +1,15 @@ +  …  …  …    +  2     2    +  3  …  3  i… +  4  …  4  … +       5 +  … +  5  )  6  )  +  6     7    +  7  …  8  f… +  …  …  …    +  9  } 10  }  + 10    11    + 11  … 12  f… + 12 - … 13 +  … +      14 +  … + 13  } 15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf016.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf016.golden new file mode 100644 index 0000000000000000000000000000000000000000..ef8a363a37fbf919ae2411e086e6297d84abc3dd --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf016.golden @@ -0,0 +1,15 @@ +  …  @…  …    +  2     2    +  3  i…  3  i… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  f…  8  f… +  …  @…  …    +  9  }  10  }  + 10    11    + 11  f… 12  f… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf017.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf017.golden new file mode 100644 index 0000000000000000000000000000000000000000..b8e0ae759f76d18649f7792fbfd68480e184eeff --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf017.golden @@ -0,0 +1,15 @@ +  …  @…  …    +  2     2    +  3  i…  3  im… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  f…  8  fu… +  …  @…  …    +  9  }  10  }  + 10    11    + 11  f… 12  fu… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf018.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf018.golden new file mode 100644 index 0000000000000000000000000000000000000000..df04245f6e8553a181ecad314bff57872e5fc88e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf018.golden @@ -0,0 +1,15 @@ +  …  @@…  …    +  2     2    +  3  im…  3  im… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  fu…  8  fu… +  …  @@…  …    +  9  }  10  }  + 10    11    + 11  fu… 12  fu… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf019.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf019.golden new file mode 100644 index 0000000000000000000000000000000000000000..4d092a8e67a39be0b827a58c8c2f58919e55921c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf019.golden @@ -0,0 +1,15 @@ +  …  @@…  …    +  2     2    +  3  im…  3  imp… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  fu…  8  fun… +  …  @@…  …    +  9  }  10  }  + 10    11    + 11  fu… 12  fun… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf020.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf020.golden new file mode 100644 index 0000000000000000000000000000000000000000..715b049eb2afff0ad2e5667c39ea2b6943095edf --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf020.golden @@ -0,0 +1,15 @@ +  …  @@ …  …    +  2     2    +  3  imp…  3  imp… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  fun…  8  fun… +  …  @@ …  …    +  9  }  10  }  + 10    11    + 11  fun… 12  fun… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf021.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf021.golden new file mode 100644 index 0000000000000000000000000000000000000000..5683fcb58bacc835218a2ea38ab0c3f3d122cffb --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf021.golden @@ -0,0 +1,15 @@ +  …  @@ …  …    +  2     2    +  3  imp…  3  impo… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  fun…  8  func… +  …  @@ …  …    +  9  }  10  }  + 10    11    + 11  fun… 12  func… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf022.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf022.golden new file mode 100644 index 0000000000000000000000000000000000000000..30dd46b6cabf0f76f6b7142e5752117c9018f81b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf022.golden @@ -0,0 +1,15 @@ +  …  @@ -…  …    +  2     2    +  3  impo…  3  impo… +  4  …  4  … +       5 +  … +  5  )   6  )  +  6     7    +  7  func…  8  func… +  …  @@ -…  …    +  9  }  10  }  + 10    11    + 11  func… 12  func… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf023.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf023.golden new file mode 100644 index 0000000000000000000000000000000000000000..bb7c9e917f28e363ae2bb5ebf19207ec2089bd4e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf023.golden @@ -0,0 +1,15 @@ +  …  @@ -…  …    +  2     2    +  3  impo…  3  impor… +  4  …  4  "… +       5 +  "… +  5  )   6  )  +  6     7    +  7  func…  8  func … +  …  @@ -…  …    +  9  }  10  }  + 10    11    + 11  func… 12  func … + 12 -  … 13 +  c… +      14 +  r… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf024.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf024.golden new file mode 100644 index 0000000000000000000000000000000000000000..4ddf59235fefa2be91a7d978b7f9b7a2b130547c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf024.golden @@ -0,0 +1,15 @@ +  …  @@ -2…  …    +  2     2    +  3  impor…  3  impor… +  4  "…  4  "… +       5 +  "… +  5  )   6  )  +  6     7    +  7  func …  8  func … +  …  @@ -9…  …    +  9  }  10  }  + 10    11    + 11  func … 12  func … + 12 -  r… 13 +  c… +      14 +  r… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf025.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf025.golden new file mode 100644 index 0000000000000000000000000000000000000000..0c5ee8b923134c00c43df76d3f85f302a760e1c0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf025.golden @@ -0,0 +1,15 @@ +  …  @@ -2…  …    +  2     2    +  3  impor…  3  import… +  4  "…  4  "f… +       5 +  "s… +  5  )   6  )  +  6     7    +  7  func …  8  func m… +  …  @@ -9…  …    +  9  }  10  }  + 10    11    + 11  func … 12  func g… + 12 -  r… 13 +  co… +      14 +  re… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf026.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf026.golden new file mode 100644 index 0000000000000000000000000000000000000000..11de5247c53a11bfb08922c82fc8d3a8f4a110b4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf026.golden @@ -0,0 +1,15 @@ +  …  @@ -2,…  …    +  2     2    +  3  import…  3  import… +  4  "f…  4  "f… +       5 +  "s… +  5  )   6  )  +  6     7    +  7  func m…  8  func m… +  …  @@ -9,…  …    +  9  }  10  }  + 10    11    + 11  func g… 12  func g… + 12 -  re… 13 +  co… +      14 +  re… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf027.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf027.golden new file mode 100644 index 0000000000000000000000000000000000000000..269025e9ce89ce2ed97d863bb9223d1a374da97f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf027.golden @@ -0,0 +1,15 @@ +  …  @@ -2,…  …    +  2     2    +  3  import…  3  import ( +  4  "f…  4  "fm… +       5 +  "st… +  5  )   6  )  +  6     7    +  7  func m…  8  func ma… +  …  @@ -9,…  …    +  9  }  10  }  + 10    11    + 11  func g… 12  func ge… + 12 -  re… 13 +  con… +      14 +  ret… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf028.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf028.golden new file mode 100644 index 0000000000000000000000000000000000000000..bd6e917b2fabea1a818c2cc63dfee8ee62eb2c7e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf028.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6…  …    +  2     2    +  3  import (  3  import ( +  4  "fm…  4  "fm… +       5 +  "st… +  5  )   6  )  +  6     7    +  7  func ma…  8  func ma… +  …  @@ -9,5…  …    +  9  }  10  }  + 10    11    + 11  func ge… 12  func ge… + 12 -  ret… 13 +  con… +      14 +  ret… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf029.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf029.golden new file mode 100644 index 0000000000000000000000000000000000000000..f98f2bfc17aaa46e946d0830cd9a75f65c5bede0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf029.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6…  …    +  2     2    +  3  import (  3  import (  +  4  "fm…  4  "fmt" +       5 +  "str… +  5  )   6  )  +  6     7    +  7  func ma…  8  func mai… +  …  @@ -9,5…  …    +  9  }  10  }  + 10    11    + 11  func ge… 12  func get… + 12 -  ret… 13 +  cont… +      14 +  retu… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf030.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf030.golden new file mode 100644 index 0000000000000000000000000000000000000000..b7a4024f2c282cbd95296f1248609f97156e50e6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf030.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 …  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"  4  "fmt" +       5 +  "str… +  5  )   6  )  +  6     7    +  7  func mai…  8  func mai… +  …  @@ -9,5 …  …    +  9  }  10  }  + 10    11    + 11  func get… 12  func get… + 12 -  retu… 13 +  cont… +      14 +  retu… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf031.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf031.golden new file mode 100644 index 0000000000000000000000000000000000000000..2cf24437d4223cd6ee449f2c73004c9e26a3c8c4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf031.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 …  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"  4  "fmt"  +       5 +  "stri… +  5  )   6  )  +  6     7    +  7  func mai…  8  func main… +  …  @@ -9,5 …  …    +  9  }  10  }  + 10    11    + 11  func get… 12  func getC… + 12 -  retu… 13 +  conte… +      14 +  retur… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf032.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf032.golden new file mode 100644 index 0000000000000000000000000000000000000000..b449f59eca2ece529c135498aa6fb2390bdcb57c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf032.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "stri… +  5  )   6  )  +  6     7    +  7  func main…  8  func main… +  …  @@ -9,5 +…  …    +  9  }  10  }  + 10    11    + 11  func getC… 12  func getC… + 12 -  retur… 13 +  conte… +      14 +  retur… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf033.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf033.golden new file mode 100644 index 0000000000000000000000000000000000000000..461b215a58fad21d566f89245afc09ba5369d6a1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf033.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strin… +  5  )   6  )  +  6     7    +  7  func main…  8  func main(… +  …  @@ -9,5 +…  …    +  9  }  10  }  + 10    11    + 11  func getC… 12  func getCo… + 12 -  retur… 13 +  conten… +      14 +  return… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf034.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf034.golden new file mode 100644 index 0000000000000000000000000000000000000000..32f90649da12531bd2cb6fa45ff44fba7552e8f5 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf034.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strin… +  5  )   6  )  +  6     7    +  7  func main(…  8  func main(… +  …  @@ -9,5 +1…  …    +  9  }  10  }  + 10    11    + 11  func getCo… 12  func getCo… + 12 -  return… 13 +  conten… +      14 +  return… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf035.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf035.golden new file mode 100644 index 0000000000000000000000000000000000000000..94ec837f15afc57c55f11843c7200a7fce454222 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf035.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "string… +  5  )   6  )  +  6     7    +  7  func main(…  8  func main()… +  …  @@ -9,5 +1…  …    +  9  }  10  }  + 10    11    + 11  func getCo… 12  func getCon… + 12 -  return… 13 +  content… +      14 +  return … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf036.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf036.golden new file mode 100644 index 0000000000000000000000000000000000000000..ec7781a0cc6c81e034ec87566795e43b1a26ff01 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf036.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "string… +  5  )   6  )  +  6     7    +  7  func main()…  8  func main()… +  …  @@ -9,5 +10…  …    +  9  }  10  }  + 10    11    + 11  func getCon… 12  func getCon… + 12 -  return … 13 +  content… +      14 +  return … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf037.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf037.golden new file mode 100644 index 0000000000000000000000000000000000000000..ddfe2db319abb6e53aa35bd99b5fa7a5faf4031a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf037.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings" +  5  )   6  )  +  6     7    +  7  func main()…  8  func main() { +  …  @@ -9,5 +10…  …    +  9  }  10  }  + 10    11    + 11  func getCon… 12  func getCont… + 12 -  return … 13 +  content … +      14 +  return c… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf038.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf038.golden new file mode 100644 index 0000000000000000000000000000000000000000..b577f654b09fa3bb14586154377a342fdd1863de --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf038.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings" +  5  )   6  )  +  6     7    +  7  func main() {  8  func main() { +  …  @@ -9,5 +10,…  …    +  9  }  10  }  + 10    11    + 11  func getCont… 12  func getCont… + 12 -  return "… 13 +  content … +      14 +  return c… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf039.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf039.golden new file mode 100644 index 0000000000000000000000000000000000000000..4a73ba8c7996260c7aeec5c1b3c112dfbcc7223a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf039.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {  8  func main() {  +  …  @@ -9,5 +10,…  …    +  9  }  10  }  + 10    11    + 11  func getCont… 12  func getConte… + 12 -  return "… 13 +  content :… +      14 +  return co… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf040.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf040.golden new file mode 100644 index 0000000000000000000000000000000000000000..d0ca9dd0d86109752758fb32f20222a26b265b9c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf040.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 …  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6…  …    +  9  }  10  }  + 10    11    + 11  func getConte… 12  func getConte… + 12 -  return "H… 13 +  content :… +      14 +  return co… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf041.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf041.golden new file mode 100644 index 0000000000000000000000000000000000000000..99d3354d5c221f3b2be2929e8f7a298ebcf3e703 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf041.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 …  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6…  …    +  9  }  10  }  + 10    11    + 11  func getConte… 12  func getConten… + 12 -  return "H… 13 +  content :=… +      14 +  return con… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf042.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf042.golden new file mode 100644 index 0000000000000000000000000000000000000000..c8a77bd140fc69c7a61a41ec236e685304e4f89e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf042.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 …  …    +  9  }  10  }  + 10    11    + 11  func getConten… 12  func getConten… + 12 -  return "He… 13 +  content :=… +      14 +  return con… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf043.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf043.golden new file mode 100644 index 0000000000000000000000000000000000000000..8ade1d1ea2b3cefc7a21e4f910fffe3ab5a1d89b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf043.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @…  …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 …  …    +  9  }  10  }  + 10    11    + 11  func getConten… 12  func getContent… + 12 -  return "He… 13 +  content := … +      14 +  return cont… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf044.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf044.golden new file mode 100644 index 0000000000000000000000000000000000000000..1ad6b5535fa110765d18bd5e2caf0b70e90e48e1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf044.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@   …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @…  …    +  9  }  10  }  + 10    11    + 11  func getContent… 12  func getContent… + 12 -  return "Hel… 13 +  content := … +      14 +  return cont… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf045.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf045.golden new file mode 100644 index 0000000000000000000000000000000000000000..8ca1f58abdbcb8349874759a0c5524a52ad96be9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf045.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@   …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @…  …    +  9  }  10  }  + 10    11    + 11  func getContent… 12  func getContent(… + 12 -  return "Hel… 13 +  content := s… +      14 +  return conte… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf046.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf046.golden new file mode 100644 index 0000000000000000000000000000000000000000..03d1b9c64c67d800b91081b4e859338373f88f25 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf046.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@   …    +  9  }  10  }  + 10    11    + 11  func getContent(… 12  func getContent(… + 12 -  return "Hell… 13 +  content := s… +      14 +  return conte… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf047.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf047.golden new file mode 100644 index 0000000000000000000000000000000000000000..f004da12761c69ed654ff734ac766c3c8fea02eb --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf047.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@   …    +  9  }  10  }  + 10    11    + 11  func getContent(… 12  func getContent()… + 12 -  return "Hell… 13 +  content := st… +      14 +  return content + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf048.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf048.golden new file mode 100644 index 0000000000000000000000000000000000000000..680fa666a5aef23bfa545dde302a09fa4f713b89 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf048.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent()… 12  func getContent()… + 12 -  return "Hello… 13 +  content := st… +      14 +  return content + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf049.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf049.golden new file mode 100644 index 0000000000000000000000000000000000000000..94761fc143dfc6db4fd0235b9fe6bd3a62042c20 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf049.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent()… 12  func getContent() … + 12 -  return "Hello… 13 +  content := str… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf050.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf050.golden new file mode 100644 index 0000000000000000000000000000000000000000..ecaa8650163d8a8e7ef7310cb948b4053f744d19 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf050.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() … 12  func getContent() … + 12 -  return "Hello,… 13 +  content := str… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf051.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf051.golden new file mode 100644 index 0000000000000000000000000000000000000000..d51fb42d579badf489df6296ac367285bd8eb6a3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf051.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() … 12  func getContent() s… + 12 -  return "Hello,… 13 +  content := stri… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf052.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf052.golden new file mode 100644 index 0000000000000000000000000000000000000000..425969f00c9e4b1e675d3f49171d321760148506 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf052.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() s… 12  func getContent() s… + 12 -  return "Hello, … 13 +  content := stri… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf053.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf053.golden new file mode 100644 index 0000000000000000000000000000000000000000..bdc318e5a6aba0b930a3b6ee64341a6c072dc00b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf053.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() s… 12  func getContent() st… + 12 -  return "Hello, … 13 +  content := strin… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf054.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf054.golden new file mode 100644 index 0000000000000000000000000000000000000000..6de336844a81e870ee71da54807aeccfde9900e2 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf054.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() st… 12  func getContent() st… + 12 -  return "Hello, w… 13 +  content := strin… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf055.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf055.golden new file mode 100644 index 0000000000000000000000000000000000000000..fc3fd550e3a1510ea22cf0bdc0eb203d9eda19b2 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf055.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() st… 12  func getContent() str… + 12 -  return "Hello, w… 13 +  content := string… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf056.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf056.golden new file mode 100644 index 0000000000000000000000000000000000000000..f401fd97cd95a5708429a0af399a774616ae2cdf --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf056.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() str… 12  func getContent() str… + 12 -  return "Hello, wo… 13 +  content := string… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf057.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf057.golden new file mode 100644 index 0000000000000000000000000000000000000000..642474089eb8438137eddce59242c8156678ae56 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf057.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() str… 12  func getContent() stri… + 12 -  return "Hello, wo… 13 +  content := strings… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf058.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf058.golden new file mode 100644 index 0000000000000000000000000000000000000000..7020f20533466599c9eae92c692641e75aace894 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf058.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() stri… 12  func getContent() stri… + 12 -  return "Hello, wor… 13 +  content := strings… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf059.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf059.golden new file mode 100644 index 0000000000000000000000000000000000000000..3739c41cdd63edac3c99d0ff7e0f72b8bad57868 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf059.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() stri… 12  func getContent() strin… + 12 -  return "Hello, wor… 13 +  content := strings.… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf060.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf060.golden new file mode 100644 index 0000000000000000000000000000000000000000..88bee32f8faacc3d3070eea75045d963bcb3cd43 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf060.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() strin… 12  func getContent() strin… + 12 -  return "Hello, worl… 13 +  content := strings.… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf061.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf061.golden new file mode 100644 index 0000000000000000000000000000000000000000..ed76c34d49e9456c9c2b706256a60c4e637464ba --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf061.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() strin… 12  func getContent() string… + 12 -  return "Hello, worl… 13 +  content := strings.T… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf062.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf062.golden new file mode 100644 index 0000000000000000000000000000000000000000..68cbde591ebe1686710fa0192a56ea2ac0f3d4ab --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf062.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string… 12  func getContent() string… + 12 -  return "Hello, world… 13 +  content := strings.T… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf063.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf063.golden new file mode 100644 index 0000000000000000000000000000000000000000..270624fb371a3586c3ccf639b85f9f5e8169c42a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf063.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string… 12  func getContent() string { + 12 -  return "Hello, world… 13 +  content := strings.To… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf064.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf064.golden new file mode 100644 index 0000000000000000000000000000000000000000..742ba611866c933ef59811466ed9cf5a38d1d1db --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf064.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string { 12  func getContent() string { + 12 -  return "Hello, world!" 13 +  content := strings.To… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf065.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf065.golden new file mode 100644 index 0000000000000000000000000000000000000000..730da08d4d6b3b5232df61c7d9021a7d2a8f135e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf065.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string { 12  func getContent() string {  + 12 -  return "Hello, world!" 13 +  content := strings.ToU… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf066.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf066.golden new file mode 100644 index 0000000000000000000000000000000000000000..2fbccef307eda98ec1b2ff5c5e32fd9dc90a69b7 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf066.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToU… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf067.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf067.golden new file mode 100644 index 0000000000000000000000000000000000000000..ecc226a80c7a442b1cccc55233909617fd327532 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf067.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUp… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf068.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf068.golden new file mode 100644 index 0000000000000000000000000000000000000000..d9d30f9898e51307420665a76f5ab0cd1405f38c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf068.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUp… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf069.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf069.golden new file mode 100644 index 0000000000000000000000000000000000000000..1f796501fc35398bacbab2414be5d1b1ca1ffda2 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf069.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpp… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf070.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf070.golden new file mode 100644 index 0000000000000000000000000000000000000000..6e75a491e398f6215bc1e3473f26a4d8c8727aff --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf070.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpp… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf071.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf071.golden new file mode 100644 index 0000000000000000000000000000000000000000..5598999b53f0444ec82a84aab31d5050e22a0c5d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf071.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUppe… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf072.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf072.golden new file mode 100644 index 0000000000000000000000000000000000000000..1a62bde3ad9bcd11a320aebaa706234e05237bc8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf072.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUppe… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf073.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf073.golden new file mode 100644 index 0000000000000000000000000000000000000000..f07b0b6f73330a23f59c28058e09893447c9a748 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf073.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf074.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf074.golden new file mode 100644 index 0000000000000000000000000000000000000000..e9b81c3709c5d0a587156b0570a9f82f71556a08 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf074.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf075.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf075.golden new file mode 100644 index 0000000000000000000000000000000000000000..695e08b6de2977a87f4201d4bb65c645cdf25b22 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf075.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper(… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf076.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf076.golden new file mode 100644 index 0000000000000000000000000000000000000000..f947ca0edb808b63b782b60e4754ae4ceb8ae349 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf076.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper(… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf077.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf077.golden new file mode 100644 index 0000000000000000000000000000000000000000..34889805ca9a6b10ab165e8772a8d2a440a4024a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf077.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf078.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf078.golden new file mode 100644 index 0000000000000000000000000000000000000000..a38efeccbeeb6f433ed37c6dcd9f4040307c1bcf --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf078.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf079.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf079.golden new file mode 100644 index 0000000000000000000000000000000000000000..7c5ad6184ecc5ca6c9aaf319cd19dd8952cbfb1e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf079.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("H… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf080.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf080.golden new file mode 100644 index 0000000000000000000000000000000000000000..9f8268b85a3304fe9c02b4933c462614b6641971 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf080.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("H… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf081.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf081.golden new file mode 100644 index 0000000000000000000000000000000000000000..9b196dde1502783cbfecf8f2eccf69929ff7d0e3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf081.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("He… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf082.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf082.golden new file mode 100644 index 0000000000000000000000000000000000000000..beb31c279cafd0d4057a934df7e8b9cfb97b2add --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf082.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("He… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf083.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf083.golden new file mode 100644 index 0000000000000000000000000000000000000000..3cc4e51554c89c1f92f95c3cf9e765206802e1a7 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf083.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hel… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf084.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf084.golden new file mode 100644 index 0000000000000000000000000000000000000000..e1088062d155a0c8d6060ccf086b123cb8bc83f8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf084.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hel… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf085.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf085.golden new file mode 100644 index 0000000000000000000000000000000000000000..ae34624943ffc9720e459c116e9a52eefe64dbf0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf085.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hell… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf086.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf086.golden new file mode 100644 index 0000000000000000000000000000000000000000..c796ddbb7d60951efa1075f19f631063c4344d1c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf086.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hell… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf087.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf087.golden new file mode 100644 index 0000000000000000000000000000000000000000..150c205dea385ef8f435f4a1997162dada5ef6e2 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf087.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf088.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf088.golden new file mode 100644 index 0000000000000000000000000000000000000000..e7732246f361500be015ff355ac2a22969dc234e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf088.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf089.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf089.golden new file mode 100644 index 0000000000000000000000000000000000000000..2e87019222c8c9d9ab35a2edba051d9abbb35758 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf089.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello,… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf090.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf090.golden new file mode 100644 index 0000000000000000000000000000000000000000..4b6f5af7ad23fa326e64e5bc153cdca5131c9370 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf090.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello,… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf091.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf091.golden new file mode 100644 index 0000000000000000000000000000000000000000..c91af1fe7772558f51e193f97fd6b1fafd0b4bd6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf091.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, … +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf092.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf092.golden new file mode 100644 index 0000000000000000000000000000000000000000..3cccf9fe7856dec65a3ded19be178c1ef6310427 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf092.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, … +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf093.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf093.golden new file mode 100644 index 0000000000000000000000000000000000000000..526df4c34ce93abc73c69815f35c50dc2cf22f86 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf093.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, W… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf094.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf094.golden new file mode 100644 index 0000000000000000000000000000000000000000..898b7fe69ccc18803a86e5a8ddfa64628878f40d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf094.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, W… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf095.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf095.golden new file mode 100644 index 0000000000000000000000000000000000000000..08da2f518c583e2aaa8a3e5553535403b0e882c8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf095.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wo… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf096.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf096.golden new file mode 100644 index 0000000000000000000000000000000000000000..6572fd06f0ccd045a3b0c732550f61bea6212a5e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf096.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wo… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf097.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf097.golden new file mode 100644 index 0000000000000000000000000000000000000000..4fe8a543581660bec84bb36c6c69e5662b602bbd --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf097.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wor… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf098.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf098.golden new file mode 100644 index 0000000000000000000000000000000000000000..9f58d145e7c51d0fe33620aa32e67b4913a06bc4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf098.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wor… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf099.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf099.golden new file mode 100644 index 0000000000000000000000000000000000000000..d1d405ae0735057efb1a86972b1604c55932adb9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf099.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Worl… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf100.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf100.golden new file mode 100644 index 0000000000000000000000000000000000000000..0d98b2832ff12bd4758fe352ac7faef59f774b75 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf100.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Worl… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf101.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf101.golden new file mode 100644 index 0000000000000000000000000000000000000000..09b06341a6d3ef10ab389e7fbbdcd2dfb6b18277 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf101.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf102.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf102.golden new file mode 100644 index 0000000000000000000000000000000000000000..0c41c9283b62a11f644cfa3d48d36bd451b0ab86 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf102.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf103.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf103.golden new file mode 100644 index 0000000000000000000000000000000000000000..080691afe7d95b7f375e804ef94ea040327adb32 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf103.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf104.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf104.golden new file mode 100644 index 0000000000000000000000000000000000000000..49660f90c921295bd85669649c42f990cc5fb8ab --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf104.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf105.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf105.golden new file mode 100644 index 0000000000000000000000000000000000000000..4cc20b9bb78466888aedcd5d77610c67ea2b4129 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf105.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!") +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf106.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf106.golden new file mode 100644 index 0000000000000000000000000000000000000000..1d297be1126e10392c6098f912f1fa7f21108fb2 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf106.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!") +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf107.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf107.golden new file mode 100644 index 0000000000000000000000000000000000000000..1bd852aeafb29570bf7712877a082f2a4ee75efb --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf107.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf108.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf108.golden new file mode 100644 index 0000000000000000000000000000000000000000..e22a98ecf771bc651d26af440a361286dcb167f7 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf108.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf109.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf109.golden new file mode 100644 index 0000000000000000000000000000000000000000..f9c4df3820188b745ecbf7a3ce6ad03b76ae3fdc --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf109.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf110.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf110.golden new file mode 100644 index 0000000000000000000000000000000000000000..23a88346fe130912de771815531d4cdd7d930899 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf110.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf001.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf001.golden new file mode 100644 index 0000000000000000000000000000000000000000..9a7bdad6f5b2f9cb38d8f8bc0fcf004ccb08901d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf001.golden @@ -0,0 +1,16 @@ +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf002.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf002.golden new file mode 100644 index 0000000000000000000000000000000000000000..6513e62b9232e2d6e816de15aa6d2c63959a5962 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf002.golden @@ -0,0 +1,16 @@ +   +   +   +   +   +   +   +   +   +   + 1 + 1 + 1 +   +   + 1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf003.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf003.golden new file mode 100644 index 0000000000000000000000000000000000000000..566a9af900df24c579ef44d316967f8f843f656e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf003.golden @@ -0,0 +1,16 @@ +  … +  2 +  3 +  4 +   +  5 +  6 +  7 +  … +  9 + 10 + 11 + 12 +   +   + 13 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf004.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf004.golden new file mode 100644 index 0000000000000000000000000000000000000000..fce6310c3df72138d7e56b61960c7f8b74b04a4e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf004.golden @@ -0,0 +1,16 @@ +  …  +  2  +  3  +  4  +    +  5  +  6  +  7  +  …  +  9  + 10  + 11  + 12  +    +    + 13  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf005.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf005.golden new file mode 100644 index 0000000000000000000000000000000000000000..7c2bf669b3c6cfa396285a32f2f1156f78272a54 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf005.golden @@ -0,0 +1,16 @@ +  …   +  2   +  3   +  4   +     +  5   +  6   +  7   +  …   +  9   + 10   + 11   + 12   +     +     + 13   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf006.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf006.golden new file mode 100644 index 0000000000000000000000000000000000000000..1bdbd29f40ac635e1bbfabb4aeefefc347f59404 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf006.golden @@ -0,0 +1,16 @@ +  …    +  2    +  3    +  4    +      +  5    +  6    +  7    +  …    +  9  1 + 10  1 + 11  1 + 12    +    1 +    1 + 13  1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf007.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf007.golden new file mode 100644 index 0000000000000000000000000000000000000000..97f17ee54d312322761c406f2e1bb47edebe7be0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf007.golden @@ -0,0 +1,16 @@ +  …   … +  2   2 +  3   3 +  4   4 +     5 +  5   6 +  6   7 +  7   8 +  …   … +  9  10 + 10  11 + 11  12 + 12    +    13 +    14 + 13  15 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf008.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf008.golden new file mode 100644 index 0000000000000000000000000000000000000000..b79fae38ae84b77f229de1117a267204126ff49b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf008.golden @@ -0,0 +1,16 @@ +  …   …  +  2   2  +  3   3  +  4   4  +     5  +  5   6  +  6   7  +  7   8  +  …   …  +  9  10  + 10  11  + 11  12  + 12     +    13  +    14  + 13  15  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf009.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf009.golden new file mode 100644 index 0000000000000000000000000000000000000000..e95e0e46d24ffe78393dd2ec9cd0b861761dd37f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf009.golden @@ -0,0 +1,16 @@ +  …   … … +  2   2   +  3   3   +  4   4   +     5 + +  5   6   +  6   7   +  7   8   +  …   … … +  9  10   + 10  11   + 11  12   + 12    - +    13 + +    14 + + 13  15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf010.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf010.golden new file mode 100644 index 0000000000000000000000000000000000000000..d59ab2214fa3ec7daf40629b1b6b0160ce0adc98 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf010.golden @@ -0,0 +1,16 @@ +  …   …  … +  2   2   +  3   3   +  4   4   +     5 +  +  5   6   +  6   7   +  7   8   +  …   …  … +  9  10   + 10  11   + 11  12   + 12    -  +    13 +  +    14 +  + 13  15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf011.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf011.golden new file mode 100644 index 0000000000000000000000000000000000000000..a8676f40abeb41e1a88f7ca08a5e7964e35af9ac --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf011.golden @@ -0,0 +1,16 @@ +  …   …  … +  2   2    +  3   3  … +  4   4  … +     5 + … +  5   6  ) +  6   7    +  7   8  … +  …   …  … +  9  10  } + 10  11    + 11  12  … + 12    - … +    13 + … +    14 + … + 13  15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf012.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf012.golden new file mode 100644 index 0000000000000000000000000000000000000000..773f6576a0c68976165dd39ae3db0ab5b824cd19 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf012.golden @@ -0,0 +1,16 @@ +  …   …  @… +  2   2    +  3   3  i… +  4   4  … +     5 +  … +  5   6  )  +  6   7    +  7   8  f… +  …   …  @… +  9  10  }  + 10  11    + 11  12  f… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf013.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf013.golden new file mode 100644 index 0000000000000000000000000000000000000000..2b06b5f49a9c66dad210c1b4d6fac2dcaa065acc --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf013.golden @@ -0,0 +1,16 @@ +  …   …  @@… +  2   2    +  3   3  im… +  4   4  … +     5 +  … +  5   6  )  +  6   7    +  7   8  fu… +  …   …  @@… +  9  10  }  + 10  11    + 11  12  fu… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf014.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf014.golden new file mode 100644 index 0000000000000000000000000000000000000000..b8a298f6716309e4ebe0b848f9f8f606fc580f5b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf014.golden @@ -0,0 +1,16 @@ +  …   …  @@ … +  2   2    +  3   3  imp… +  4   4  … +     5 +  … +  5   6  )  +  6   7    +  7   8  fun… +  …   …  @@ … +  9  10  }  + 10  11    + 11  12  fun… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf015.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf015.golden new file mode 100644 index 0000000000000000000000000000000000000000..b6425e1badbf2e5d84c4864789eac5a715ef4f9a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf015.golden @@ -0,0 +1,16 @@ +  …   …  @@ -… +  2   2    +  3   3  impo… +  4   4  … +     5 +  … +  5   6  )  +  6   7    +  7   8  func… +  …   …  @@ -… +  9  10  }  + 10  11    + 11  12  func… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf016.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf016.golden new file mode 100644 index 0000000000000000000000000000000000000000..86f7d2742a9ab6e0e311c9b5e76b9d379335927f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf016.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2… +  2   2    +  3   3  impor… +  4   4  "… +     5 +  "… +  5   6  )  +  6   7    +  7   8  func … +  …   …  @@ -9… +  9  10  }  + 10  11    + 11  12  func … + 12    -  r… +    13 +  c… +    14 +  r… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf017.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf017.golden new file mode 100644 index 0000000000000000000000000000000000000000..fdcbc103bd46afbbe40e0b1d5b977450435c09ad --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf017.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,… +  2   2    +  3   3  import… +  4   4  "f… +     5 +  "s… +  5   6  )  +  6   7    +  7   8  func m… +  …   …  @@ -9,… +  9  10  }  + 10  11    + 11  12  func g… + 12    -  re… +    13 +  co… +    14 +  re… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf018.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf018.golden new file mode 100644 index 0000000000000000000000000000000000000000..ddedac5bf511cd41579595d872d3fd101db537a4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf018.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6… +  2   2    +  3   3  import ( +  4   4  "fm… +     5 +  "st… +  5   6  )  +  6   7    +  7   8  func ma… +  …   …  @@ -9,5… +  9  10  }  + 10  11    + 11  12  func ge… + 12    -  ret… +    13 +  con… +    14 +  ret… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf019.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf019.golden new file mode 100644 index 0000000000000000000000000000000000000000..ad2c1a16d6bbfad461af79c1fa1f6efa195bceb1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf019.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 … +  2   2    +  3   3  import (  +  4   4  "fmt" +     5 +  "str… +  5   6  )  +  6   7    +  7   8  func mai… +  …   …  @@ -9,5 … +  9  10  }  + 10  11    + 11  12  func get… + 12    -  retu… +    13 +  cont… +    14 +  retu… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf020.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf020.golden new file mode 100644 index 0000000000000000000000000000000000000000..b8c70916234fb76905bfc89919f5053a9303051e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf020.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +… +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "stri… +  5   6  )  +  6   7    +  7   8  func main… +  …   …  @@ -9,5 +… +  9  10  }  + 10  11    + 11  12  func getC… + 12    -  retur… +    13 +  conte… +    14 +  retur… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf021.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf021.golden new file mode 100644 index 0000000000000000000000000000000000000000..3208c32580d4868f230a7a7a803a95913e790888 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf021.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2… +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strin… +  5   6  )  +  6   7    +  7   8  func main(… +  …   …  @@ -9,5 +1… +  9  10  }  + 10  11    + 11  12  func getCo… + 12    -  return… +    13 +  conten… +    14 +  return… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf022.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf022.golden new file mode 100644 index 0000000000000000000000000000000000000000..d90d4e52fa08156733ab185585c80aceff6e9b14 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf022.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,… +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "string… +  5   6  )  +  6   7    +  7   8  func main()… +  …   …  @@ -9,5 +10… +  9  10  }  + 10  11    + 11  12  func getCon… + 12    -  return … +    13 +  content… +    14 +  return … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf023.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf023.golden new file mode 100644 index 0000000000000000000000000000000000000000..77c0a5e41ce46529cf0c3190464666bf7837e431 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf023.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7… +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings" +  5   6  )  +  6   7    +  7   8  func main() { +  …   …  @@ -9,5 +10,… +  9  10  }  + 10  11    + 11  12  func getCont… + 12    -  return "… +    13 +  content … +    14 +  return c… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf024.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf024.golden new file mode 100644 index 0000000000000000000000000000000000000000..7a45157cf5f64d36618f7f21b57a7993af2765e4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf024.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 … +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6… +  9  10  }  + 10  11    + 11  12  func getConte… + 12    -  return "H… +    13 +  content :… +    14 +  return co… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf025.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf025.golden new file mode 100644 index 0000000000000000000000000000000000000000..da525ded0901fb24e7836b1144a8849c095943a6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf025.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @… +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 … +  9  10  }  + 10  11    + 11  12  func getConten… + 12    -  return "He… +    13 +  content :=… +    14 +  return con… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf026.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf026.golden new file mode 100644 index 0000000000000000000000000000000000000000..6d9ce9a6374b6519b423fbf77406f6a192f7119d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf026.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@  +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @… +  9  10  }  + 10  11    + 11  12  func getContent… + 12    -  return "Hel… +    13 +  content := … +    14 +  return cont… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf027.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf027.golden new file mode 100644 index 0000000000000000000000000000000000000000..bfe3bc58f2645c587804d9656477aad783546062 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf027.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@  +  9  10  }  + 10  11    + 11  12  func getContent(… + 12    -  return "Hell… +    13 +  content := s… +    14 +  return conte… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf028.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf028.golden new file mode 100644 index 0000000000000000000000000000000000000000..cb96f8dd77ebcc808ae0b252db9f71eec4fd7001 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf028.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent()… + 12    -  return "Hello… +    13 +  content := st… +    14 +  return content + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf029.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf029.golden new file mode 100644 index 0000000000000000000000000000000000000000..cd3e2e748d3bddcbfdb3b54854841552ffe7aadf --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf029.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() … + 12    -  return "Hello,… +    13 +  content := str… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf030.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf030.golden new file mode 100644 index 0000000000000000000000000000000000000000..7591a228fb7b47901a7f8f10625de567fc48f94b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf030.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() s… + 12    -  return "Hello, … +    13 +  content := stri… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf031.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf031.golden new file mode 100644 index 0000000000000000000000000000000000000000..b3bf06b2803a6202e60ff3f282522573d0c0d0f9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf031.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() st… + 12    -  return "Hello, w… +    13 +  content := strin… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf032.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf032.golden new file mode 100644 index 0000000000000000000000000000000000000000..35be5aad6c987a92adfdd1bbaab3f477af3be5d9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf032.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() str… + 12    -  return "Hello, wo… +    13 +  content := string… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf033.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf033.golden new file mode 100644 index 0000000000000000000000000000000000000000..8f40f08a11932f23164e6d06f3a85aa84de105fe --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf033.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() stri… + 12    -  return "Hello, wor… +    13 +  content := strings… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf034.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf034.golden new file mode 100644 index 0000000000000000000000000000000000000000..4ab5554094071ab509f173e40d424ea6bdd5d09a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf034.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() strin… + 12    -  return "Hello, worl… +    13 +  content := strings.… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf035.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf035.golden new file mode 100644 index 0000000000000000000000000000000000000000..8b5d22bf529e2f65ecc20459847bd23e83e06cdd --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf035.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string… + 12    -  return "Hello, world… +    13 +  content := strings.T… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf036.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf036.golden new file mode 100644 index 0000000000000000000000000000000000000000..6d84e4e7f8e57ea18e8b8e5c5d832fd87a2ee3f0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf036.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string { + 12    -  return "Hello, world!" +    13 +  content := strings.To… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf037.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf037.golden new file mode 100644 index 0000000000000000000000000000000000000000..1359537ddefe4bd80ff5d87c9ada0a75ba21b0d9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf037.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToU… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf038.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf038.golden new file mode 100644 index 0000000000000000000000000000000000000000..e4a2f4a0c982bec091dec295d876a51432100fb6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf038.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUp… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf039.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf039.golden new file mode 100644 index 0000000000000000000000000000000000000000..c54fae5c27246659eed3c6fc3d3357d98044a993 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf039.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpp… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf040.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf040.golden new file mode 100644 index 0000000000000000000000000000000000000000..19b8e852925c5fa1377e9fa3a2460e3ccc466357 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf040.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUppe… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf041.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf041.golden new file mode 100644 index 0000000000000000000000000000000000000000..5686067dfd30a7e74d7f4a569604f03d104cffdf --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf041.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf042.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf042.golden new file mode 100644 index 0000000000000000000000000000000000000000..e875732de1dc3297ae4dd98b26b502500c4eb8d9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf042.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper(… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf043.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf043.golden new file mode 100644 index 0000000000000000000000000000000000000000..65d0b222cdb58da9cfe4e02879ce9007d00068d5 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf043.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf044.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf044.golden new file mode 100644 index 0000000000000000000000000000000000000000..b32501a8e9a2d4ba4b22e426b012cb415d801fa9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf044.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("H… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf045.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf045.golden new file mode 100644 index 0000000000000000000000000000000000000000..acb03c5a10e492ce419385ae995c04048afa4228 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf045.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("He… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf046.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf046.golden new file mode 100644 index 0000000000000000000000000000000000000000..58f9479cb425a438ac02872e12494272f237b0c4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf046.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hel… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf047.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf047.golden new file mode 100644 index 0000000000000000000000000000000000000000..ee034691189129d8abff177ce0448592de41ea75 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf047.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hell… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf048.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf048.golden new file mode 100644 index 0000000000000000000000000000000000000000..798187a12d43fcc028ae2805056edf4880b58b1f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf048.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf049.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf049.golden new file mode 100644 index 0000000000000000000000000000000000000000..beec5d58d8b8d3328a7d27eb18f6587dd863a62c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf049.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello,… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf050.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf050.golden new file mode 100644 index 0000000000000000000000000000000000000000..25805d05004e9d2eb95762d550d153ac7a8b60ec --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf050.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, … +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf051.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf051.golden new file mode 100644 index 0000000000000000000000000000000000000000..1cf1103801fc397ba2c464b3c77a3cc7fe869efb --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf051.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, W… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf052.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf052.golden new file mode 100644 index 0000000000000000000000000000000000000000..65eb1d35a8f61c82a7c2d66b0dc93648a3b67948 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf052.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, Wo… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf053.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf053.golden new file mode 100644 index 0000000000000000000000000000000000000000..c5394a62af59659a8a321ad741f7423432c3e984 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf053.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, Wor… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf054.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf054.golden new file mode 100644 index 0000000000000000000000000000000000000000..cd9e4e10b7797d8f5e396a0e5ac7b058be9b6be6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf054.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, Worl… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf055.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf055.golden new file mode 100644 index 0000000000000000000000000000000000000000..875dec6833b96e1bfa12cd7a70557722c97f1232 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf055.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf056.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf056.golden new file mode 100644 index 0000000000000000000000000000000000000000..0dd41dfc87da203b350761eb99046ac4c092e68b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf056.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf057.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf057.golden new file mode 100644 index 0000000000000000000000000000000000000000..97d7f009a147b8b09373cf34501828d8d87e6036 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf057.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!") +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf058.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf058.golden new file mode 100644 index 0000000000000000000000000000000000000000..18c9c363f3952bda8537f96496405edce5684485 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf058.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf059.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf059.golden new file mode 100644 index 0000000000000000000000000000000000000000..6bd8b8bad98d380338ee5020fa349202bc4b5242 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf059.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf060.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf060.golden new file mode 100644 index 0000000000000000000000000000000000000000..30f192c422ad261b81cfe2fb3ffce84797b3fdb5 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf060.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf001.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf001.golden new file mode 100644 index 0000000000000000000000000000000000000000..f5ae08f760e597d50e72dcb4c99fe13136fcad89 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf001.golden @@ -0,0 +1,16 @@ +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf002.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf002.golden new file mode 100644 index 0000000000000000000000000000000000000000..905f4640bb21bb8c092c0ca5fcab313591cb1796 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf002.golden @@ -0,0 +1,16 @@ +   +   +   +   +   +   +   +   +   +   + 1 + 1 + 1 +   +   + 1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf003.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf003.golden new file mode 100644 index 0000000000000000000000000000000000000000..c9e63d8c4abc76931039144b413cb824f8ff9bb2 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf003.golden @@ -0,0 +1,16 @@ +  … +  2 +  3 +  4 +   +  5 +  6 +  7 +  … +  9 + 10 + 11 + 12 +   +   + 13 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf004.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf004.golden new file mode 100644 index 0000000000000000000000000000000000000000..7cdf60705770462ea57c0f4c1a1e0fe58ae167eb --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf004.golden @@ -0,0 +1,16 @@ +  …  +  2  +  3  +  4  +    +  5  +  6  +  7  +  …  +  9  + 10  + 11  + 12  +    +    + 13  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf005.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf005.golden new file mode 100644 index 0000000000000000000000000000000000000000..092ad8837b7435ac3870ec87a0ddbdaceb48282c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf005.golden @@ -0,0 +1,16 @@ +  …   +  2   +  3   +  4   +     +  5   +  6   +  7   +  …   +  9   + 10   + 11   + 12   +     +     + 13   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf006.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf006.golden new file mode 100644 index 0000000000000000000000000000000000000000..f31fccda9d0728eea91654a89623c27442cfbe60 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf006.golden @@ -0,0 +1,16 @@ +  …    +  2    +  3    +  4    +      +  5    +  6    +  7    +  …    +  9  1 + 10  1 + 11  1 + 12    +    1 +    1 + 13  1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf007.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf007.golden new file mode 100644 index 0000000000000000000000000000000000000000..3c4ec8dbc951a899dc681f2b0774a9d66523c85b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf007.golden @@ -0,0 +1,16 @@ +  …   … +  2   2 +  3   3 +  4   4 +     5 +  5   6 +  6   7 +  7   8 +  …   … +  9  10 + 10  11 + 11  12 + 12    +    13 +    14 + 13  15 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf008.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf008.golden new file mode 100644 index 0000000000000000000000000000000000000000..f5ec574408debd36b433aed72b3e8881e4a47fd4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf008.golden @@ -0,0 +1,16 @@ +  …   …  +  2   2  +  3   3  +  4   4  +     5  +  5   6  +  6   7  +  7   8  +  …   …  +  9  10  + 10  11  + 11  12  + 12     +    13  +    14  + 13  15  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf009.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf009.golden new file mode 100644 index 0000000000000000000000000000000000000000..7badb5543980ec3a8bb31512ecb69da2396aef5e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf009.golden @@ -0,0 +1,16 @@ +  …   … … +  2   2   +  3   3   +  4   4   +     5 + +  5   6   +  6   7   +  7   8   +  …   … … +  9  10   + 10  11   + 11  12   + 12    - +    13 + +    14 + + 13  15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf010.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf010.golden new file mode 100644 index 0000000000000000000000000000000000000000..fa3542fb89a9cdfa58e94fc27e8d6e7650176e40 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf010.golden @@ -0,0 +1,16 @@ +  …   …  … +  2   2   +  3   3   +  4   4   +     5 +  +  5   6   +  6   7   +  7   8   +  …   …  … +  9  10   + 10  11   + 11  12   + 12    -  +    13 +  +    14 +  + 13  15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf011.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf011.golden new file mode 100644 index 0000000000000000000000000000000000000000..6d9e7fb12dbc617fec93ba909fc18c6e4db889c6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf011.golden @@ -0,0 +1,16 @@ +  …   …  … +  2   2    +  3   3  … +  4   4  … +     5 + … +  5   6  ) +  6   7    +  7   8  … +  …   …  … +  9  10  } + 10  11    + 11  12  … + 12    - … +    13 + … +    14 + … + 13  15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf012.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf012.golden new file mode 100644 index 0000000000000000000000000000000000000000..748489c58f16c60d1f8517cdd494acf8a0029800 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf012.golden @@ -0,0 +1,16 @@ +  …   …  @… +  2   2    +  3   3  i… +  4   4  … +     5 +  … +  5   6  )  +  6   7    +  7   8  f… +  …   …  @… +  9  10  }  + 10  11    + 11  12  f… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf013.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf013.golden new file mode 100644 index 0000000000000000000000000000000000000000..bb95009a65b7290bf9ee59d1f23981ea7e40e2c6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf013.golden @@ -0,0 +1,16 @@ +  …   …  @@… +  2   2    +  3   3  im… +  4   4  … +     5 +  … +  5   6  )  +  6   7    +  7   8  fu… +  …   …  @@… +  9  10  }  + 10  11    + 11  12  fu… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf014.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf014.golden new file mode 100644 index 0000000000000000000000000000000000000000..3fe21e837dad1bb327f40dbbb1dced49a67517f9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf014.golden @@ -0,0 +1,16 @@ +  …   …  @@ … +  2   2    +  3   3  imp… +  4   4  … +     5 +  … +  5   6  )  +  6   7    +  7   8  fun… +  …   …  @@ … +  9  10  }  + 10  11    + 11  12  fun… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf015.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf015.golden new file mode 100644 index 0000000000000000000000000000000000000000..ef2d752d9bf77ca4bf0bfe918f97247f8ff4a227 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf015.golden @@ -0,0 +1,16 @@ +  …   …  @@ -… +  2   2    +  3   3  impo… +  4   4  … +     5 +  … +  5   6  )  +  6   7    +  7   8  func… +  …   …  @@ -… +  9  10  }  + 10  11    + 11  12  func… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf016.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf016.golden new file mode 100644 index 0000000000000000000000000000000000000000..02215b20ab147994f0b2912bae955476bb22f256 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf016.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2… +  2   2    +  3   3  impor… +  4   4  "… +     5 +  "… +  5   6  )  +  6   7    +  7   8  func … +  …   …  @@ -9… +  9  10  }  + 10  11    + 11  12  func … + 12    -  r… +    13 +  c… +    14 +  r… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf017.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf017.golden new file mode 100644 index 0000000000000000000000000000000000000000..75fb9e340f6ba08d9a75c2070f47cbc4f204a807 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf017.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,… +  2   2    +  3   3  import… +  4   4  "f… +     5 +  "s… +  5   6  )  +  6   7    +  7   8  func m… +  …   …  @@ -9,… +  9  10  }  + 10  11    + 11  12  func g… + 12    -  re… +    13 +  co… +    14 +  re… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf018.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf018.golden new file mode 100644 index 0000000000000000000000000000000000000000..b88efe67b7c2bfa9fc4b21673335d62bcff4d670 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf018.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6… +  2   2    +  3   3  import ( +  4   4  "fm… +     5 +  "st… +  5   6  )  +  6   7    +  7   8  func ma… +  …   …  @@ -9,5… +  9  10  }  + 10  11    + 11  12  func ge… + 12    -  ret… +    13 +  con… +    14 +  ret… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf019.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf019.golden new file mode 100644 index 0000000000000000000000000000000000000000..7674dc6548331bd0f3525aa576887aa9d2a2a08d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf019.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 … +  2   2    +  3   3  import (  +  4   4  "fmt" +     5 +  "str… +  5   6  )  +  6   7    +  7   8  func mai… +  …   …  @@ -9,5 … +  9  10  }  + 10  11    + 11  12  func get… + 12    -  retu… +    13 +  cont… +    14 +  retu… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf020.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf020.golden new file mode 100644 index 0000000000000000000000000000000000000000..b09286df1c10dad61c1125d79ff3b309ba681835 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf020.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +… +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "stri… +  5   6  )  +  6   7    +  7   8  func main… +  …   …  @@ -9,5 +… +  9  10  }  + 10  11    + 11  12  func getC… + 12    -  retur… +    13 +  conte… +    14 +  retur… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf021.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf021.golden new file mode 100644 index 0000000000000000000000000000000000000000..fe16360c1bbb5a60342a23e8e893518a428a6758 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf021.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2… +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strin… +  5   6  )  +  6   7    +  7   8  func main(… +  …   …  @@ -9,5 +1… +  9  10  }  + 10  11    + 11  12  func getCo… + 12    -  return… +    13 +  conten… +    14 +  return… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf022.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf022.golden new file mode 100644 index 0000000000000000000000000000000000000000..b06eb126c1d5120653f99761747b34a739019774 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf022.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,… +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "string… +  5   6  )  +  6   7    +  7   8  func main()… +  …   …  @@ -9,5 +10… +  9  10  }  + 10  11    + 11  12  func getCon… + 12    -  return … +    13 +  content… +    14 +  return … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf023.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf023.golden new file mode 100644 index 0000000000000000000000000000000000000000..7f6fb654f9e4db70cae4bd5d9cd543f2e93874e1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf023.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7… +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings" +  5   6  )  +  6   7    +  7   8  func main() { +  …   …  @@ -9,5 +10,… +  9  10  }  + 10  11    + 11  12  func getCont… + 12    -  return "… +    13 +  content … +    14 +  return c… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf024.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf024.golden new file mode 100644 index 0000000000000000000000000000000000000000..9b9ca147e01cd264439e57272794584726f4b55c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf024.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 … +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6… +  9  10  }  + 10  11    + 11  12  func getConte… + 12    -  return "H… +    13 +  content :… +    14 +  return co… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf025.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf025.golden new file mode 100644 index 0000000000000000000000000000000000000000..2b2a75a47ff2868ffe9a226c4b26a199a71377a0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf025.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @… +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 … +  9  10  }  + 10  11    + 11  12  func getConten… + 12    -  return "He… +    13 +  content :=… +    14 +  return con… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf026.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf026.golden new file mode 100644 index 0000000000000000000000000000000000000000..f3b513a268e51e80540d2f3234ac3ea8a0083457 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf026.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@  +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @… +  9  10  }  + 10  11    + 11  12  func getContent… + 12    -  return "Hel… +    13 +  content := … +    14 +  return cont… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf027.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf027.golden new file mode 100644 index 0000000000000000000000000000000000000000..efcdc287e72e527f8a7ca6fe96b9a69a17fbfdef --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf027.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@  +  9  10  }  + 10  11    + 11  12  func getContent(… + 12    -  return "Hell… +    13 +  content := s… +    14 +  return conte… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf028.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf028.golden new file mode 100644 index 0000000000000000000000000000000000000000..5e93bd89799535cc8adc78443f5ceb1fd2906e9a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf028.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent()… + 12    -  return "Hello… +    13 +  content := st… +    14 +  return content + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf029.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf029.golden new file mode 100644 index 0000000000000000000000000000000000000000..31d19ed9ea527f53243b5cf29dc43601e5eedc47 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf029.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() … + 12    -  return "Hello,… +    13 +  content := str… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf030.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf030.golden new file mode 100644 index 0000000000000000000000000000000000000000..c6f75f81c34d5a7009ae8e21b98ef04bb5569014 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf030.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() s… + 12    -  return "Hello, … +    13 +  content := stri… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf031.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf031.golden new file mode 100644 index 0000000000000000000000000000000000000000..eac4baf479645e413a609c06fb2ee8593e08daa7 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf031.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() st… + 12    -  return "Hello, w… +    13 +  content := strin… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf032.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf032.golden new file mode 100644 index 0000000000000000000000000000000000000000..6ae377659bd78c0a0675678679d5961ce1d81b29 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf032.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() str… + 12    -  return "Hello, wo… +    13 +  content := string… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf033.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf033.golden new file mode 100644 index 0000000000000000000000000000000000000000..69b1579b4b0ac62c4f322d2b8f0c69cefb60dc55 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf033.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() stri… + 12    -  return "Hello, wor… +    13 +  content := strings… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf034.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf034.golden new file mode 100644 index 0000000000000000000000000000000000000000..9424324d0be67db8976097d5514426c771cdc113 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf034.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() strin… + 12    -  return "Hello, worl… +    13 +  content := strings.… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf035.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf035.golden new file mode 100644 index 0000000000000000000000000000000000000000..d10efbabae25a2634d8394546d0739214809f235 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf035.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string… + 12    -  return "Hello, world… +    13 +  content := strings.T… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf036.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf036.golden new file mode 100644 index 0000000000000000000000000000000000000000..0ba4930b0ba7d3e8aedabebe42a72f20e3358cf1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf036.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string { + 12    -  return "Hello, world!" +    13 +  content := strings.To… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf037.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf037.golden new file mode 100644 index 0000000000000000000000000000000000000000..d472073751d5f12fede2c3581b472a219f4066ac --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf037.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToU… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf038.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf038.golden new file mode 100644 index 0000000000000000000000000000000000000000..0c97edfa4534ae8043aca70ecad07cb9b7950430 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf038.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUp… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf039.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf039.golden new file mode 100644 index 0000000000000000000000000000000000000000..1a69f9119aebfde0aa4dde24ae326075f69d2d62 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf039.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpp… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf040.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf040.golden new file mode 100644 index 0000000000000000000000000000000000000000..1fa51a9e2840438aa94f306a294a82d22d0f5482 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf040.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUppe… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf041.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf041.golden new file mode 100644 index 0000000000000000000000000000000000000000..6e103c6d200dedfe7c207184ffffa8a084078743 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf041.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf042.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf042.golden new file mode 100644 index 0000000000000000000000000000000000000000..5947ba3147292f9246d01fb10ae7633759e572a2 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf042.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper(… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf043.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf043.golden new file mode 100644 index 0000000000000000000000000000000000000000..26853c9f6c01987d603fbdcec1f7c899c54cebc8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf043.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf044.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf044.golden new file mode 100644 index 0000000000000000000000000000000000000000..819b8446bf1db7537c87baac7a68036199f7b51e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf044.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("H… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf045.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf045.golden new file mode 100644 index 0000000000000000000000000000000000000000..c3a25aa0dd0d83da61eab7b5fb6077bfed8f0339 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf045.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("He… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf046.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf046.golden new file mode 100644 index 0000000000000000000000000000000000000000..1066e2babf1558e32c84ff6ca62b95c1d71aa8f1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf046.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hel… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf047.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf047.golden new file mode 100644 index 0000000000000000000000000000000000000000..17a6b9b9e545377987264a54805c4d21403938bd --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf047.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hell… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf048.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf048.golden new file mode 100644 index 0000000000000000000000000000000000000000..8143d3072122759101dcf6bc9167a1fee6562dbf --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf048.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf049.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf049.golden new file mode 100644 index 0000000000000000000000000000000000000000..8996acad434b941424e18b97f3e8a5c8ef7b9dd3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf049.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello,… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf050.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf050.golden new file mode 100644 index 0000000000000000000000000000000000000000..eb97f1bcf6e3de3ef6e8142756663b00355d1284 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf050.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, … +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf051.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf051.golden new file mode 100644 index 0000000000000000000000000000000000000000..b3d8be7afe555fa8f9bf22184af5ced239efb78d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf051.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, W… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf052.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf052.golden new file mode 100644 index 0000000000000000000000000000000000000000..2d3ce57371b223e89e9ba39e22ebfcd308be6d25 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf052.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, Wo… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf053.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf053.golden new file mode 100644 index 0000000000000000000000000000000000000000..42f239edc1cbe274bc88c111e25810eb4fc6dd2a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf053.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, Wor… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf054.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf054.golden new file mode 100644 index 0000000000000000000000000000000000000000..ed1a28da0da183fbe275eb6411e6ddab4d92c6f9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf054.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, Worl… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf055.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf055.golden new file mode 100644 index 0000000000000000000000000000000000000000..1a5474f10bb0ae447c740bb0ffa8588852c47d86 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf055.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf056.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf056.golden new file mode 100644 index 0000000000000000000000000000000000000000..da13ee8e21c0a763a11d61170e669407c882523b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf056.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf057.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf057.golden new file mode 100644 index 0000000000000000000000000000000000000000..ab82a59950c59f7dddd899d591098a9c50f5888b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf057.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!") +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf058.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf058.golden new file mode 100644 index 0000000000000000000000000000000000000000..285caf3659ba538e0c12da796836045311ecad67 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf058.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf059.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf059.golden new file mode 100644 index 0000000000000000000000000000000000000000..4f27df6e9a17775b68ceabb81828878adb2d4da6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf059.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf060.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf060.golden new file mode 100644 index 0000000000000000000000000000000000000000..0131c7b18d76b8df2eb5ee0e5d2927eaff35f001 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf060.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file From 66cd9822f5715aad98e78e35066282aba861e6fa Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 10 Jun 2025 15:15:33 -0300 Subject: [PATCH 27/64] fix(diffview): fix small bug when width is very small --- internal/exp/diffview/diffview.go | 49 ++++++++++++++----- .../Split/DarkMode/WidthOf009.golden | 2 +- .../Split/DarkMode/WidthOf010.golden | 2 +- .../Split/LightMode/WidthOf009.golden | 2 +- .../Split/LightMode/WidthOf010.golden | 2 +- 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index d14152bcb5dede1b6eb681b8897c7ac3d8987aa7..7bc4206d969bb743f419949683f706c249e10c86 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -286,6 +286,8 @@ func (dv *DiffView) resizeCodeWidth() { func (dv *DiffView) renderUnified() string { var b strings.Builder + fullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth) + for _, h := range dv.unified.Hunks { if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) @@ -308,7 +310,9 @@ func (dv *DiffView) renderUnified() string { b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } - b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + content)) + b.WriteString(fullContentStyle.Render( + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + content), + )) beforeLine++ afterLine++ case udiff.Insert: @@ -316,16 +320,20 @@ func (dv *DiffView) renderUnified() string { b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } - b.WriteString(dv.style.InsertLine.Symbol.Render("+ ")) - b.WriteString(dv.style.InsertLine.Code.Width(dv.codeWidth).Render(content)) + b.WriteString(fullContentStyle.Render( + dv.style.InsertLine.Symbol.Render("+ ") + + dv.style.InsertLine.Code.Width(dv.codeWidth).Render(content), + )) afterLine++ case udiff.Delete: if dv.lineNumbers { b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } - b.WriteString(dv.style.DeleteLine.Symbol.Render("- ")) - b.WriteString(dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(content)) + b.WriteString(fullContentStyle.Render( + dv.style.DeleteLine.Symbol.Render("- ") + + dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(content), + )) beforeLine++ } b.WriteRune('\n') @@ -339,6 +347,9 @@ func (dv *DiffView) renderUnified() string { func (dv *DiffView) renderSplit() string { var b strings.Builder + beforeFullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth) + afterFullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth + btoi(dv.extraColOnAfter)) + for i, h := range dv.splitHunks { if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) @@ -371,19 +382,25 @@ func (dv *DiffView) renderSplit() string { if dv.lineNumbers { b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) } - b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) + b.WriteString(beforeFullContentStyle.Render( + dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" "), + )) case l.before.Kind == udiff.Equal: if dv.lineNumbers { b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } - b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + beforeContent)) + b.WriteString(beforeFullContentStyle.Render( + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + beforeContent), + )) beforeLine++ case l.before.Kind == udiff.Delete: if dv.lineNumbers { b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } - b.WriteString(dv.style.DeleteLine.Symbol.Render("- ")) - b.WriteString(dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(beforeContent)) + b.WriteString(beforeFullContentStyle.Render( + dv.style.DeleteLine.Symbol.Render("- ") + + dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(beforeContent), + )) beforeLine++ } @@ -392,19 +409,25 @@ func (dv *DiffView) renderSplit() string { if dv.lineNumbers { b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } - b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) + b.WriteString(afterFullContentStyle.Render( + dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" "), + )) case l.after.Kind == udiff.Equal: if dv.lineNumbers { b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } - b.WriteString(dv.style.EqualLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" " + afterContent)) + b.WriteString(afterFullContentStyle.Render( + dv.style.EqualLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" " + afterContent), + )) afterLine++ case l.after.Kind == udiff.Insert: if dv.lineNumbers { b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } - b.WriteString(dv.style.InsertLine.Symbol.Render("+ ")) - b.WriteString(dv.style.InsertLine.Code.Width(dv.codeWidth + btoi(dv.extraColOnAfter)).Render(afterContent)) + b.WriteString(afterFullContentStyle.Render( + dv.style.InsertLine.Symbol.Render("+ ") + + dv.style.InsertLine.Code.Width(dv.codeWidth+btoi(dv.extraColOnAfter)).Render(afterContent), + )) afterLine++ } diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden index 492b2a9752bfc766e2fe6b649f19d2315f3b3a20..15cc518f312e49a25a492cf9d178a051dcf94b3d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden @@ -10,6 +10,6 @@   9   10   10   11   11   12  - 12 -  13 + 12 - 13       14   13   15  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden index 08015f590123b93c52341af11ca85d5fa67030d5..95e3d48a33d0abb5a94218d2fcfe29dd3c27fcbc 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden @@ -10,6 +10,6 @@   9   10    10   11    11   12   - 12 -  13  + 12 - 13 +      14 +  13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf009.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf009.golden index 7fc162af8586a55b5b3f89782d5ebf608a6a4a75..47170f9836acbbe16f1de1fc739b1a9e32924ebf 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf009.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf009.golden @@ -10,6 +10,6 @@   9   10   10   11   11   12  - 12 -  13 + 12 - 13       14   13   15  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf010.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf010.golden index 41828b4edca8816b1de26248b20e65f11e7abebb..7de1ab70c01b038036944c1be33703eaa3ee69e2 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf010.golden @@ -10,6 +10,6 @@   9   10    10   11    11   12   - 12 -  13  + 12 - 13 +      14 +  13   15   \ No newline at end of file From 21ca2aed35aa8e771a047119127e5025f446854e Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 10 Jun 2025 17:01:18 -0300 Subject: [PATCH 28/64] fix(diffview): add fixes + more extensive testing for height handling --- internal/exp/diffview/Taskfile.yaml | 20 +++++++++++++++ internal/exp/diffview/diffview.go | 34 ++++++++++++++++++++++++++ internal/exp/diffview/diffview_test.go | 34 ++++++++++++++++++++++++++ 3 files changed, 88 insertions(+) diff --git a/internal/exp/diffview/Taskfile.yaml b/internal/exp/diffview/Taskfile.yaml index 50cb6a04600fcfc640a4910d5bd1b718984eecda..be40107e348a340eadffc7d7095c9535330faeca 100644 --- a/internal/exp/diffview/Taskfile.yaml +++ b/internal/exp/diffview/Taskfile.yaml @@ -40,3 +40,23 @@ tasks: - for: sources cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} silent: true + + test:print:height:unified: + desc: Print golden files for debugging + method: none + sources: + - ./testdata/TestDiffViewHeight/Unified/LightMode/*.golden + cmds: + - for: sources + cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} + silent: true + + test:print:height:split: + desc: Print golden files for debugging + method: none + sources: + - ./testdata/TestDiffViewHeight/Split/LightMode/*.golden + cmds: + - for: sources + cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} + silent: true diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 7bc4206d969bb743f419949683f706c249e10c86..8776c90d5c07ee00d938a990f3a1382176451016 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -149,6 +149,9 @@ func (dv *DiffView) String() string { if dv.width > 0 { style = style.MaxWidth(dv.width) } + if dv.height > 0 { + style = style.MaxHeight(dv.height) + } switch dv.layout { case layoutUnified: @@ -287,6 +290,7 @@ func (dv *DiffView) renderUnified() string { var b strings.Builder fullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth) + printedLines := 0 for _, h := range dv.unified.Hunks { if dv.lineNumbers { @@ -296,6 +300,7 @@ func (dv *DiffView) renderUnified() string { content := ansi.Truncate(dv.hunkLineFor(h), dv.fullCodeWidth, "…") b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(content)) b.WriteRune('\n') + printedLines++ beforeLine := h.FromLine afterLine := h.ToLine @@ -337,7 +342,19 @@ func (dv *DiffView) renderUnified() string { beforeLine++ } b.WriteRune('\n') + + printedLines++ + } + } + + for printedLines < dv.height { + if dv.lineNumbers { + b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) + b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } + b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) + b.WriteRune('\n') + printedLines++ } return b.String() @@ -349,6 +366,7 @@ func (dv *DiffView) renderSplit() string { beforeFullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth) afterFullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth + btoi(dv.extraColOnAfter)) + printedLines := 0 for i, h := range dv.splitHunks { if dv.lineNumbers { @@ -361,6 +379,7 @@ func (dv *DiffView) renderSplit() string { } b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) b.WriteRune('\n') + printedLines++ beforeLine := h.fromLine afterLine := h.toLine @@ -432,9 +451,24 @@ func (dv *DiffView) renderSplit() string { } b.WriteRune('\n') + + printedLines++ } } + for printedLines < dv.height { + if dv.lineNumbers { + b.WriteString(dv.style.MissingLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + } + b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) + if dv.lineNumbers { + b.WriteString(dv.style.MissingLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + } + b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) + b.WriteRune('\n') + printedLines++ + } + return b.String() } diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index c26e89c58194f43725f05096cc4ee5e3afa2ae25..fbf2661ccd269ed71aa40d46333ba5594df9078d 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -167,6 +167,32 @@ func TestDiffViewWidth(t *testing.T) { } } +func TestDiffViewHeight(t *testing.T) { + for layoutName, layoutFunc := range LayoutFuncs { + t.Run(layoutName, func(t *testing.T) { + for themeName, themeFunc := range ThemeFuncs { + t.Run(themeName, func(t *testing.T) { + for height := 1; height <= 20; height++ { + t.Run(fmt.Sprintf("HeightOf%03d", height), func(t *testing.T) { + dv := diffview.New(). + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter). + Height(height) + dv = layoutFunc(dv) + dv = themeFunc(dv) + + output := dv.String() + golden.RequireEqual(t, []byte(output)) + + assertHeight(t, height, output) + }) + } + }) + } + }) + } +} + func assertLineWidth(t *testing.T, expected int, output string) { var lineWidth int for line := range strings.SplitSeq(output, "\n") { @@ -176,3 +202,11 @@ func assertLineWidth(t *testing.T, expected int, output string) { t.Errorf("expected output width to be == %d, got %d", expected, lineWidth) } } + +func assertHeight(t *testing.T, expected int, output string) { + output = strings.TrimSuffix(output, "\n") + lines := strings.Count(output, "\n") + 1 + if lines != expected { + t.Errorf("expected output height to be == %d, got %d", expected, lines) + } +} From 8104d9151f2e251d0fc20e15d12b4eddc5451f84 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 10 Jun 2025 17:01:40 -0300 Subject: [PATCH 29/64] test(diffview): add golden files for height testing --- .../Split/DarkMode/HeightOf001.golden | 1 + .../Split/DarkMode/HeightOf002.golden | 2 ++ .../Split/DarkMode/HeightOf003.golden | 3 +++ .../Split/DarkMode/HeightOf004.golden | 4 ++++ .../Split/DarkMode/HeightOf005.golden | 5 +++++ .../Split/DarkMode/HeightOf006.golden | 6 ++++++ .../Split/DarkMode/HeightOf007.golden | 7 +++++++ .../Split/DarkMode/HeightOf008.golden | 8 ++++++++ .../Split/DarkMode/HeightOf009.golden | 9 +++++++++ .../Split/DarkMode/HeightOf010.golden | 10 ++++++++++ .../Split/DarkMode/HeightOf011.golden | 11 ++++++++++ .../Split/DarkMode/HeightOf012.golden | 12 +++++++++++ .../Split/DarkMode/HeightOf013.golden | 13 ++++++++++++ .../Split/DarkMode/HeightOf014.golden | 14 +++++++++++++ .../Split/DarkMode/HeightOf015.golden | 15 ++++++++++++++ .../Split/DarkMode/HeightOf016.golden | 16 +++++++++++++++ .../Split/DarkMode/HeightOf017.golden | 17 ++++++++++++++++ .../Split/DarkMode/HeightOf018.golden | 18 +++++++++++++++++ .../Split/DarkMode/HeightOf019.golden | 19 ++++++++++++++++++ .../Split/DarkMode/HeightOf020.golden | 20 +++++++++++++++++++ .../Split/LightMode/HeightOf001.golden | 1 + .../Split/LightMode/HeightOf002.golden | 2 ++ .../Split/LightMode/HeightOf003.golden | 3 +++ .../Split/LightMode/HeightOf004.golden | 4 ++++ .../Split/LightMode/HeightOf005.golden | 5 +++++ .../Split/LightMode/HeightOf006.golden | 6 ++++++ .../Split/LightMode/HeightOf007.golden | 7 +++++++ .../Split/LightMode/HeightOf008.golden | 8 ++++++++ .../Split/LightMode/HeightOf009.golden | 9 +++++++++ .../Split/LightMode/HeightOf010.golden | 10 ++++++++++ .../Split/LightMode/HeightOf011.golden | 11 ++++++++++ .../Split/LightMode/HeightOf012.golden | 12 +++++++++++ .../Split/LightMode/HeightOf013.golden | 13 ++++++++++++ .../Split/LightMode/HeightOf014.golden | 14 +++++++++++++ .../Split/LightMode/HeightOf015.golden | 15 ++++++++++++++ .../Split/LightMode/HeightOf016.golden | 16 +++++++++++++++ .../Split/LightMode/HeightOf017.golden | 17 ++++++++++++++++ .../Split/LightMode/HeightOf018.golden | 18 +++++++++++++++++ .../Split/LightMode/HeightOf019.golden | 19 ++++++++++++++++++ .../Split/LightMode/HeightOf020.golden | 20 +++++++++++++++++++ .../Unified/DarkMode/HeightOf001.golden | 1 + .../Unified/DarkMode/HeightOf002.golden | 2 ++ .../Unified/DarkMode/HeightOf003.golden | 3 +++ .../Unified/DarkMode/HeightOf004.golden | 4 ++++ .../Unified/DarkMode/HeightOf005.golden | 5 +++++ .../Unified/DarkMode/HeightOf006.golden | 6 ++++++ .../Unified/DarkMode/HeightOf007.golden | 7 +++++++ .../Unified/DarkMode/HeightOf008.golden | 8 ++++++++ .../Unified/DarkMode/HeightOf009.golden | 9 +++++++++ .../Unified/DarkMode/HeightOf010.golden | 10 ++++++++++ .../Unified/DarkMode/HeightOf011.golden | 11 ++++++++++ .../Unified/DarkMode/HeightOf012.golden | 12 +++++++++++ .../Unified/DarkMode/HeightOf013.golden | 13 ++++++++++++ .../Unified/DarkMode/HeightOf014.golden | 14 +++++++++++++ .../Unified/DarkMode/HeightOf015.golden | 15 ++++++++++++++ .../Unified/DarkMode/HeightOf016.golden | 16 +++++++++++++++ .../Unified/DarkMode/HeightOf017.golden | 17 ++++++++++++++++ .../Unified/DarkMode/HeightOf018.golden | 18 +++++++++++++++++ .../Unified/DarkMode/HeightOf019.golden | 19 ++++++++++++++++++ .../Unified/DarkMode/HeightOf020.golden | 20 +++++++++++++++++++ .../Unified/LightMode/HeightOf001.golden | 1 + .../Unified/LightMode/HeightOf002.golden | 2 ++ .../Unified/LightMode/HeightOf003.golden | 3 +++ .../Unified/LightMode/HeightOf004.golden | 4 ++++ .../Unified/LightMode/HeightOf005.golden | 5 +++++ .../Unified/LightMode/HeightOf006.golden | 6 ++++++ .../Unified/LightMode/HeightOf007.golden | 7 +++++++ .../Unified/LightMode/HeightOf008.golden | 8 ++++++++ .../Unified/LightMode/HeightOf009.golden | 9 +++++++++ .../Unified/LightMode/HeightOf010.golden | 10 ++++++++++ .../Unified/LightMode/HeightOf011.golden | 11 ++++++++++ .../Unified/LightMode/HeightOf012.golden | 12 +++++++++++ .../Unified/LightMode/HeightOf013.golden | 13 ++++++++++++ .../Unified/LightMode/HeightOf014.golden | 14 +++++++++++++ .../Unified/LightMode/HeightOf015.golden | 15 ++++++++++++++ .../Unified/LightMode/HeightOf016.golden | 16 +++++++++++++++ .../Unified/LightMode/HeightOf017.golden | 17 ++++++++++++++++ .../Unified/LightMode/HeightOf018.golden | 18 +++++++++++++++++ .../Unified/LightMode/HeightOf019.golden | 19 ++++++++++++++++++ .../Unified/LightMode/HeightOf020.golden | 20 +++++++++++++++++++ 80 files changed, 840 insertions(+) create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf001.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf009.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf015.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf001.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf009.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf015.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf001.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf009.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf016.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf017.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf018.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf019.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf020.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf001.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf009.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf016.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf017.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf018.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf019.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf020.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf001.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf001.golden new file mode 100644 index 0000000000000000000000000000000000000000..d31d89d16d2995027fbb7f7fd692180ad49c1807 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf001.golden @@ -0,0 +1 @@ +  …  @@ -2,6 +2,7 @@    …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden new file mode 100644 index 0000000000000000000000000000000000000000..f549eeeab4aee92d5d2bb63c38410cd1eebea9fd --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden @@ -0,0 +1,2 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden new file mode 100644 index 0000000000000000000000000000000000000000..10f9502fcb816c392861420f3d88c2514cb1bd99 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden @@ -0,0 +1,3 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden new file mode 100644 index 0000000000000000000000000000000000000000..29e41b5288bb1f14d63fdda2bb88b7eb7eb32ea1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden @@ -0,0 +1,4 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden new file mode 100644 index 0000000000000000000000000000000000000000..619338ac411b7f7af5cc7509979a82d1b1847460 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden @@ -0,0 +1,5 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden new file mode 100644 index 0000000000000000000000000000000000000000..32feede59f034251f1dc8f4c93e07796e2ad7832 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden @@ -0,0 +1,6 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden new file mode 100644 index 0000000000000000000000000000000000000000..98159050f96605563ee6941217b95a9d9d0d8146 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden @@ -0,0 +1,7 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden new file mode 100644 index 0000000000000000000000000000000000000000..90f0e1e41a2d163a5548b5c0ab552dd0a3754310 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden @@ -0,0 +1,8 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf009.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf009.golden new file mode 100644 index 0000000000000000000000000000000000000000..d8e3a28bff3cf43c84872f22cebf47e74d51d573 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf009.golden @@ -0,0 +1,9 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden new file mode 100644 index 0000000000000000000000000000000000000000..2d5414cb8e9b188ba00c4e749a6a72e8495fcb58 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden @@ -0,0 +1,10 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden new file mode 100644 index 0000000000000000000000000000000000000000..1c3a7cac7bc69e7f605ea5133e83da1589975e4a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden @@ -0,0 +1,11 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden new file mode 100644 index 0000000000000000000000000000000000000000..ddc3c7d8dfedfe272c9b0dd6657bfb046a2a0a0d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden @@ -0,0 +1,12 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden new file mode 100644 index 0000000000000000000000000000000000000000..47f76810267f82a6d74b128852cd85dba8614799 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden @@ -0,0 +1,13 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden new file mode 100644 index 0000000000000000000000000000000000000000..154b52bea62f209bb48a2a34b969f07999890047 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden @@ -0,0 +1,14 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf015.golden new file mode 100644 index 0000000000000000000000000000000000000000..c69efe614a04aba3f680d6cf9af91112af13560b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf015.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden new file mode 100644 index 0000000000000000000000000000000000000000..a773ac9ffd45048eafdd50147ca73391c219cc7c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden @@ -0,0 +1,16 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden new file mode 100644 index 0000000000000000000000000000000000000000..104d7dd7d64f4aa85c4581ac1ff88589c32c5d95 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden @@ -0,0 +1,17 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden new file mode 100644 index 0000000000000000000000000000000000000000..23da4e0335e31eaa87fec338a4de3107e78af8ed --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden @@ -0,0 +1,18 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden new file mode 100644 index 0000000000000000000000000000000000000000..2d6bded74cf72745a42cc0d15248cce161d13c86 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden @@ -0,0 +1,19 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    +  …     …    +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden new file mode 100644 index 0000000000000000000000000000000000000000..4b32f54e3b2481aa962eee1c3d77a4433a6e51c8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden @@ -0,0 +1,20 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    +  …     …    +  …     …    +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf001.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf001.golden new file mode 100644 index 0000000000000000000000000000000000000000..8ab230c57cafc11906a067ee7361e48b66ede3f9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf001.golden @@ -0,0 +1 @@ +  …  @@ -2,6 +2,7 @@    …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden new file mode 100644 index 0000000000000000000000000000000000000000..48c221580aa0472dee3f56745e3185b2d2b02eba --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden @@ -0,0 +1,2 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden new file mode 100644 index 0000000000000000000000000000000000000000..44ec83b3c19eeb2b4f2f57d6bef88aa11fc74b0a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden @@ -0,0 +1,3 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden new file mode 100644 index 0000000000000000000000000000000000000000..7d63be0dc2cc84ede9acb2957f693462de121c39 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden @@ -0,0 +1,4 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden new file mode 100644 index 0000000000000000000000000000000000000000..977891156902da565de6dec7636a7207bfac7bde --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden @@ -0,0 +1,5 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden new file mode 100644 index 0000000000000000000000000000000000000000..0312e9812a320684e88ea147d72e91479f3ee677 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden @@ -0,0 +1,6 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden new file mode 100644 index 0000000000000000000000000000000000000000..eab2005ff14cba831ebbf41dd1b616a0700b5782 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden @@ -0,0 +1,7 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden new file mode 100644 index 0000000000000000000000000000000000000000..b059c88d7cf99a4ec0581da4c9b4f7eab8fbf50c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden @@ -0,0 +1,8 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf009.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf009.golden new file mode 100644 index 0000000000000000000000000000000000000000..73b0d2d97c02dd5faf92c6a1cdad369260728fcf --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf009.golden @@ -0,0 +1,9 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden new file mode 100644 index 0000000000000000000000000000000000000000..0cca35d21a408ad949a1ab57af491699a26bd971 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden @@ -0,0 +1,10 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden new file mode 100644 index 0000000000000000000000000000000000000000..99ae20e7054f3b0385f087213d5aeded1e979a58 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden @@ -0,0 +1,11 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden new file mode 100644 index 0000000000000000000000000000000000000000..196a46c2f890ba7b87587a0462cb072383d7ed5c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden @@ -0,0 +1,12 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden new file mode 100644 index 0000000000000000000000000000000000000000..ead74e3119611a3c8588263ddd598a208f21f94d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden @@ -0,0 +1,13 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden new file mode 100644 index 0000000000000000000000000000000000000000..bee90f09e45814a15ebf6c542101167d989e2230 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden @@ -0,0 +1,14 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf015.golden new file mode 100644 index 0000000000000000000000000000000000000000..e22a98ecf771bc651d26af440a361286dcb167f7 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf015.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden new file mode 100644 index 0000000000000000000000000000000000000000..156e76239d826e3ba845a5a303633377d162e2e4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden @@ -0,0 +1,16 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden new file mode 100644 index 0000000000000000000000000000000000000000..355ffadc3f22216b2375b90f68c9b101860f2bba --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden @@ -0,0 +1,17 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden new file mode 100644 index 0000000000000000000000000000000000000000..f525be8e890a98f9b9c655ff8d2c313359fd6e08 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden @@ -0,0 +1,18 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden new file mode 100644 index 0000000000000000000000000000000000000000..7acc43329ce9815498e59409eef941ed040b78bd --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden @@ -0,0 +1,19 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    +  …     …    +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden new file mode 100644 index 0000000000000000000000000000000000000000..7af2554bf2992dde1d0af1f3f00c47294d9607ab --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden @@ -0,0 +1,20 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    +  …     …    +  …     …    +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf001.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf001.golden new file mode 100644 index 0000000000000000000000000000000000000000..568820e7c67775c70cd49aba709a52a5547d2ae9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf001.golden @@ -0,0 +1 @@ +  …   …  @@ -2,6 +2,7 @@   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden new file mode 100644 index 0000000000000000000000000000000000000000..faffac06f361089cc904bd5d39779c16559514e8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden @@ -0,0 +1,2 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden new file mode 100644 index 0000000000000000000000000000000000000000..4b08786279a0af10376ac6a4a3b2ca8861de0a1f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden @@ -0,0 +1,3 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden new file mode 100644 index 0000000000000000000000000000000000000000..539337c3373c377ea915d9033b3a0805f028e619 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden @@ -0,0 +1,4 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden new file mode 100644 index 0000000000000000000000000000000000000000..5c6a37fac3582293e7d4af5c50aa838cb06ed656 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden @@ -0,0 +1,5 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden new file mode 100644 index 0000000000000000000000000000000000000000..1dd0991ff069a060f70d6b3402c1108c11e30d15 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden @@ -0,0 +1,6 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden new file mode 100644 index 0000000000000000000000000000000000000000..06fd092d72e16243410114c721e75af3ae3ffd33 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden @@ -0,0 +1,7 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden new file mode 100644 index 0000000000000000000000000000000000000000..f1c6a0b6129115905cf93364654400bdae15dccc --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden @@ -0,0 +1,8 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf009.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf009.golden new file mode 100644 index 0000000000000000000000000000000000000000..3d674b517f8b3ea4c86fe000f7026aa55eed123f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf009.golden @@ -0,0 +1,9 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden new file mode 100644 index 0000000000000000000000000000000000000000..8aed8c8a187573ac0aa13a796426bd4b74f89f7e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden @@ -0,0 +1,10 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden new file mode 100644 index 0000000000000000000000000000000000000000..867f1a6e3fc02c8b27c0eeb67a3c9a0f4c6f34b3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden @@ -0,0 +1,11 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden new file mode 100644 index 0000000000000000000000000000000000000000..30bb3b118d9e20f0df68a348a5a887360540ba4b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden @@ -0,0 +1,12 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden new file mode 100644 index 0000000000000000000000000000000000000000..e1a253d03b1ca631cc58dd8b0d85e23ea00325b8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden @@ -0,0 +1,13 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden new file mode 100644 index 0000000000000000000000000000000000000000..7712155c3ffd6879e75b0f57939ae23012f6a78e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden @@ -0,0 +1,14 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden new file mode 100644 index 0000000000000000000000000000000000000000..b0a459603f6f739b6b7f0eaa0087ea963c7fc842 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden @@ -0,0 +1,15 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf016.golden new file mode 100644 index 0000000000000000000000000000000000000000..18c9c363f3952bda8537f96496405edce5684485 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf016.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf017.golden new file mode 100644 index 0000000000000000000000000000000000000000..5bff180379640df3d1089686145b84d9ae4f594e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf017.golden @@ -0,0 +1,17 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf018.golden new file mode 100644 index 0000000000000000000000000000000000000000..a7054d1809e2c28658a633a4e109b91389f4d762 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf018.golden @@ -0,0 +1,18 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  +         +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf019.golden new file mode 100644 index 0000000000000000000000000000000000000000..da0384b0cefc9c193df4ac07de43ece023fcde7b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf019.golden @@ -0,0 +1,19 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  +         +         +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf020.golden new file mode 100644 index 0000000000000000000000000000000000000000..71c38a98b7ddafea0864af0842261d7339161b0d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf020.golden @@ -0,0 +1,20 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  +         +         +         +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf001.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf001.golden new file mode 100644 index 0000000000000000000000000000000000000000..65e9cca91c8ced66ea2d69e111cb09cfbb8e8852 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf001.golden @@ -0,0 +1 @@ +  …   …  @@ -2,6 +2,7 @@   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden new file mode 100644 index 0000000000000000000000000000000000000000..a0f2c53692883080fda9647e3262957ba78fd236 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden @@ -0,0 +1,2 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden new file mode 100644 index 0000000000000000000000000000000000000000..4e835eb42451c4982dabf9d65d5d6e3729dc38be --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden @@ -0,0 +1,3 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden new file mode 100644 index 0000000000000000000000000000000000000000..64e6a891511c95c64bb770671118d6b47b4aa8e6 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden @@ -0,0 +1,4 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden new file mode 100644 index 0000000000000000000000000000000000000000..4589e89ef94be4afa6e26dec9bb4905dd8441ea8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden @@ -0,0 +1,5 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden new file mode 100644 index 0000000000000000000000000000000000000000..e1e8d7ee5c629f02f3e866a3d06ae62313f5e04c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden @@ -0,0 +1,6 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden new file mode 100644 index 0000000000000000000000000000000000000000..71efab2fd169bafd2294f8cc19e744bddb4321a3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden @@ -0,0 +1,7 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden new file mode 100644 index 0000000000000000000000000000000000000000..4276ebd96aca71d453f4b24a4be53b988d1ae078 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden @@ -0,0 +1,8 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf009.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf009.golden new file mode 100644 index 0000000000000000000000000000000000000000..f6d733e2c963ff0739cfdfa86d1544f64a38452a --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf009.golden @@ -0,0 +1,9 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden new file mode 100644 index 0000000000000000000000000000000000000000..1dda4a0bdbbc734da99d2f06e0f834f2d1b0a747 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden @@ -0,0 +1,10 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden new file mode 100644 index 0000000000000000000000000000000000000000..0faa9e1e32f0beadf4b265d735790e6a6b4262aa --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden @@ -0,0 +1,11 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden new file mode 100644 index 0000000000000000000000000000000000000000..bb8e59a58be13b3b3e04ade30ae35dbd9780a034 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden @@ -0,0 +1,12 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden new file mode 100644 index 0000000000000000000000000000000000000000..4d265424acdc4693196fef8c4f4b42f2a0f682e0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden @@ -0,0 +1,13 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden new file mode 100644 index 0000000000000000000000000000000000000000..c98e674b3c5ec999515f4aed9c6b2ce2363dafc5 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden @@ -0,0 +1,14 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden new file mode 100644 index 0000000000000000000000000000000000000000..62eb2afc37b63d90bef79c25518eacc08b185ff9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden @@ -0,0 +1,15 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf016.golden new file mode 100644 index 0000000000000000000000000000000000000000..285caf3659ba538e0c12da796836045311ecad67 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf016.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf017.golden new file mode 100644 index 0000000000000000000000000000000000000000..0953da169e133e86be984c7435c0413cd7952764 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf017.golden @@ -0,0 +1,17 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf018.golden new file mode 100644 index 0000000000000000000000000000000000000000..697f92d3559b5eeaf2655fe6f5599795583e5f1b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf018.golden @@ -0,0 +1,18 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  +         +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf019.golden new file mode 100644 index 0000000000000000000000000000000000000000..2457736daff4a9a3812f56d1e475889921fab870 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf019.golden @@ -0,0 +1,19 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  +         +         +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf020.golden new file mode 100644 index 0000000000000000000000000000000000000000..83f47be1f89b3e7b346d105c346d8d5ad960fe72 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf020.golden @@ -0,0 +1,20 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  +         +         +         +         \ No newline at end of file From c842c7bf66ca0a29ddc8993a6b750e64cf079401 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 10 Jun 2025 17:19:49 -0300 Subject: [PATCH 30/64] feat(diffview): show ellipsis if we reached the height limit --- internal/exp/diffview/diffview.go | 45 +++++++++++++++++-- .../Split/DarkMode/HeightOf002.golden | 2 +- .../Split/DarkMode/HeightOf003.golden | 2 +- .../Split/DarkMode/HeightOf004.golden | 2 +- .../Split/DarkMode/HeightOf005.golden | 2 +- .../Split/DarkMode/HeightOf006.golden | 2 +- .../Split/DarkMode/HeightOf007.golden | 2 +- .../Split/DarkMode/HeightOf008.golden | 2 +- .../Split/DarkMode/HeightOf010.golden | 2 +- .../Split/DarkMode/HeightOf011.golden | 2 +- .../Split/DarkMode/HeightOf012.golden | 2 +- .../Split/DarkMode/HeightOf013.golden | 2 +- .../Split/DarkMode/HeightOf014.golden | 2 +- .../Split/LightMode/HeightOf002.golden | 2 +- .../Split/LightMode/HeightOf003.golden | 2 +- .../Split/LightMode/HeightOf004.golden | 2 +- .../Split/LightMode/HeightOf005.golden | 2 +- .../Split/LightMode/HeightOf006.golden | 2 +- .../Split/LightMode/HeightOf007.golden | 2 +- .../Split/LightMode/HeightOf008.golden | 2 +- .../Split/LightMode/HeightOf010.golden | 2 +- .../Split/LightMode/HeightOf011.golden | 2 +- .../Split/LightMode/HeightOf012.golden | 2 +- .../Split/LightMode/HeightOf013.golden | 2 +- .../Split/LightMode/HeightOf014.golden | 2 +- .../Unified/DarkMode/HeightOf002.golden | 2 +- .../Unified/DarkMode/HeightOf003.golden | 2 +- .../Unified/DarkMode/HeightOf004.golden | 2 +- .../Unified/DarkMode/HeightOf005.golden | 2 +- .../Unified/DarkMode/HeightOf006.golden | 2 +- .../Unified/DarkMode/HeightOf007.golden | 2 +- .../Unified/DarkMode/HeightOf008.golden | 2 +- .../Unified/DarkMode/HeightOf010.golden | 2 +- .../Unified/DarkMode/HeightOf011.golden | 2 +- .../Unified/DarkMode/HeightOf012.golden | 2 +- .../Unified/DarkMode/HeightOf013.golden | 2 +- .../Unified/DarkMode/HeightOf014.golden | 2 +- .../Unified/DarkMode/HeightOf015.golden | 2 +- .../Unified/LightMode/HeightOf002.golden | 2 +- .../Unified/LightMode/HeightOf003.golden | 2 +- .../Unified/LightMode/HeightOf004.golden | 2 +- .../Unified/LightMode/HeightOf005.golden | 2 +- .../Unified/LightMode/HeightOf006.golden | 2 +- .../Unified/LightMode/HeightOf007.golden | 2 +- .../Unified/LightMode/HeightOf008.golden | 2 +- .../Unified/LightMode/HeightOf010.golden | 2 +- .../Unified/LightMode/HeightOf011.golden | 2 +- .../Unified/LightMode/HeightOf012.golden | 2 +- .../Unified/LightMode/HeightOf013.golden | 2 +- .../Unified/LightMode/HeightOf014.golden | 2 +- .../Unified/LightMode/HeightOf015.golden | 2 +- 51 files changed, 92 insertions(+), 53 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 8776c90d5c07ee00d938a990f3a1382176451016..bdaa25b8e23fabbf15e886d281845933c8b28a6b 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -292,7 +292,8 @@ func (dv *DiffView) renderUnified() string { fullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth) printedLines := 0 - for _, h := range dv.unified.Hunks { +outer: + for i, h := range dv.unified.Hunks { if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) @@ -305,7 +306,23 @@ func (dv *DiffView) renderUnified() string { beforeLine := h.FromLine afterLine := h.ToLine - for _, l := range h.Lines { + for j, l := range h.Lines { + // print ellipis if we don't have enough space to print the rest of the diff + hasReachedHeight := dv.height > 0 && printedLines+1 == dv.height + isLastHunk := i+1 == len(dv.unified.Hunks) + isLastLine := j+1 == len(h.Lines) + if hasReachedHeight && (!isLastHunk || !isLastLine) { + if dv.lineNumbers { + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + } + b.WriteString(fullContentStyle.Render( + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), + )) + b.WriteRune('\n') + break outer + } + content := strings.TrimSuffix(l.Content, "\n") content = ansi.Truncate(content, dv.codeWidth, "…") @@ -368,6 +385,7 @@ func (dv *DiffView) renderSplit() string { afterFullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth + btoi(dv.extraColOnAfter)) printedLines := 0 +outer: for i, h := range dv.splitHunks { if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) @@ -384,7 +402,28 @@ func (dv *DiffView) renderSplit() string { beforeLine := h.fromLine afterLine := h.toLine - for _, l := range h.lines { + for j, l := range h.lines { + // print ellipis if we don't have enough space to print the rest of the diff + hasReachedHeight := dv.height > 0 && printedLines+1 == dv.height + isLastHunk := i+1 == len(dv.unified.Hunks) + isLastLine := j+1 == len(h.lines) + if hasReachedHeight && (!isLastHunk || !isLastLine) { + if dv.lineNumbers { + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + } + b.WriteString(beforeFullContentStyle.Render( + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), + )) + if dv.lineNumbers { + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + } + b.WriteString(afterFullContentStyle.Render( + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), + )) + b.WriteRune('\n') + break outer + } + var beforeContent string var afterContent string if l.before != nil { diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden index f549eeeab4aee92d5d2bb63c38410cd1eebea9fd..c508eb369e1db309c3a4e8101d7e4ee3c8a3f6eb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden @@ -1,2 +1,2 @@   …  @@ -2,6 +2,7 @@    …    -  2     2    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden index 10f9502fcb816c392861420f3d88c2514cb1bd99..b31c3992a9364df7907eebf98c5415489173235c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden @@ -1,3 +1,3 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden index 29e41b5288bb1f14d63fdda2bb88b7eb7eb32ea1..926aa7919ab55ad7e2095b846ded1a3fcabe8e92 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden @@ -1,4 +1,4 @@   …  @@ -2,6 +2,7 @@    …      2     2      3  import (   3  import (  -  4  "fmt"   4  "fmt"  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden index 619338ac411b7f7af5cc7509979a82d1b1847460..bf3ca743fa08655692d08469b7751841592e66a3 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden @@ -2,4 +2,4 @@   2     2      3  import (   3  import (    4  "fmt"   4  "fmt"  -       5 +  "strings"  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden index 32feede59f034251f1dc8f4c93e07796e2ad7832..e571a2d96159c754af9bab8bf378b7538f386e4c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden @@ -3,4 +3,4 @@   3  import (   3  import (    4  "fmt"   4  "fmt"         5 +  "strings"  -  5  )   6  )  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden index 98159050f96605563ee6941217b95a9d9d0d8146..79d11d366c4531dc5622ce534bceb9178a69e92b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden @@ -4,4 +4,4 @@   4  "fmt"   4  "fmt"         5 +  "strings"    5  )   6  )  -  6     7    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden index 90f0e1e41a2d163a5548b5c0ab552dd0a3754310..4dd23002f17899d3d2ae4f5605362203342d235c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden @@ -5,4 +5,4 @@        5 +  "strings"    5  )   6  )    6     7    -  7  func main() {   8  func main() {  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden index 2d5414cb8e9b188ba00c4e749a6a72e8495fcb58..62e8e9fc7ce467f5f623754623634e7a8bcfd068 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden @@ -7,4 +7,4 @@   6     7      7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden index 1c3a7cac7bc69e7f605ea5133e83da1589975e4a..6ec35f4f6595e6b9c1cad504c8d2d506a36542d3 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden @@ -8,4 +8,4 @@   7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …      9  }  10  }  - 10    11    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden index ddc3c7d8dfedfe272c9b0dd6657bfb046a2a0a0d..c9db3fa57f49b5bda659a924beb74769b0d9f426 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden @@ -9,4 +9,4 @@   …  @@ -9,5 +10,6 @@    …      9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden index 47f76810267f82a6d74b128852cd85dba8614799..45e0f1271727e29e1f20898a1c1d431fe9bca073 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  }  10  }   10    11     11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden index 154b52bea62f209bb48a2a34b969f07999890047..54207639856f930f4c629e1fcfcbfbdda5c7b691 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden @@ -11,4 +11,4 @@  10    11     11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden index 48c221580aa0472dee3f56745e3185b2d2b02eba..2a4e8eff92df5b3539dad4578a0715e0ec6ce42a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden @@ -1,2 +1,2 @@   …  @@ -2,6 +2,7 @@    …    -  2     2    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden index 44ec83b3c19eeb2b4f2f57d6bef88aa11fc74b0a..8b77ca205d3f1c85a25f733f0a3044a541805c10 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden @@ -1,3 +1,3 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden index 7d63be0dc2cc84ede9acb2957f693462de121c39..fca802e8b1cb57de2887cffadba3771a68d6d10c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden @@ -1,4 +1,4 @@   …  @@ -2,6 +2,7 @@    …      2     2      3  import (   3  import (  -  4  "fmt"   4  "fmt"  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden index 977891156902da565de6dec7636a7207bfac7bde..14803d08c905475b4cd0146c363da33f85eb7979 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden @@ -2,4 +2,4 @@   2     2      3  import (   3  import (    4  "fmt"   4  "fmt"  -       5 +  "strings"  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden index 0312e9812a320684e88ea147d72e91479f3ee677..1112cc8316a3f084872381f3d2e18d4c4e61ef30 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden @@ -3,4 +3,4 @@   3  import (   3  import (    4  "fmt"   4  "fmt"         5 +  "strings"  -  5  )   6  )  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden index eab2005ff14cba831ebbf41dd1b616a0700b5782..85dcb7a4e8351a549d717b0d5f5ff87baba89c04 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden @@ -4,4 +4,4 @@   4  "fmt"   4  "fmt"         5 +  "strings"    5  )   6  )  -  6     7    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden index b059c88d7cf99a4ec0581da4c9b4f7eab8fbf50c..b64d596e6eaa36aa837a0be6cde7aa5cbe5e2d0a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden @@ -5,4 +5,4 @@        5 +  "strings"    5  )   6  )    6     7    -  7  func main() {   8  func main() {  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden index 0cca35d21a408ad949a1ab57af491699a26bd971..9b0cc01038150ecba239f81876ac4ea693729ef7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden @@ -7,4 +7,4 @@   6     7      7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden index 99ae20e7054f3b0385f087213d5aeded1e979a58..0284e20729c6cae98d1115eb8684a31415739883 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden @@ -8,4 +8,4 @@   7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …      9  }  10  }  - 10    11    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden index 196a46c2f890ba7b87587a0462cb072383d7ed5c..a8b368aa5c64c7fb5b2de195fdccd7704c61a476 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden @@ -9,4 +9,4 @@   …  @@ -9,5 +10,6 @@    …      9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden index ead74e3119611a3c8588263ddd598a208f21f94d..fdb87616054a57763875bf5119b2c834391cdbeb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  }  10  }   10    11     11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden index bee90f09e45814a15ebf6c542101167d989e2230..7f71193ca70d6c3fe17a87a3d96ff8fe91f2adef 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden @@ -11,4 +11,4 @@  10    11     11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden index faffac06f361089cc904bd5d39779c16559514e8..2402ae251e95b60d1824cafe9097a16fb3e0e8d6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden @@ -1,2 +1,2 @@   …   …  @@ -2,6 +2,7 @@   -  2   2    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden index 4b08786279a0af10376ac6a4a3b2ca8861de0a1f..37017963f7a11f0d86ed36205928a4e74f86951b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden @@ -1,3 +1,3 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden index 539337c3373c377ea915d9033b3a0805f028e619..061471516c6383e30301209203d2465e91c4c540 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden @@ -1,4 +1,4 @@   …   …  @@ -2,6 +2,7 @@     2   2      3   3  import (  -  4   4  "fmt"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden index 5c6a37fac3582293e7d4af5c50aa838cb06ed656..769af9e0f214d92e24447a3a4efce6916cb8e25a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden @@ -2,4 +2,4 @@   2   2      3   3  import (    4   4  "fmt"  -     5 +  "strings"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden index 1dd0991ff069a060f70d6b3402c1108c11e30d15..666944fe745621fd386f4697b150fddf77c86c8c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden @@ -3,4 +3,4 @@   3   3  import (    4   4  "fmt"       5 +  "strings"  -  5   6  )  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden index 06fd092d72e16243410114c721e75af3ae3ffd33..819c12589a9e708622441fd37b505cce76208527 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden @@ -4,4 +4,4 @@   4   4  "fmt"       5 +  "strings"    5   6  )  -  6   7    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden index f1c6a0b6129115905cf93364654400bdae15dccc..349961591727969718bfe0cdb4f3fe384fed7cc5 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden @@ -5,4 +5,4 @@      5 +  "strings"    5   6  )    6   7    -  7   8  func main() {  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden index 8aed8c8a187573ac0aa13a796426bd4b74f89f7e..13362a10859cec473f0cfa26d411d709dc6c535f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden @@ -7,4 +7,4 @@   6   7      7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden index 867f1a6e3fc02c8b27c0eeb67a3c9a0f4c6f34b3..8048f0e742b0ad409e13f8b06239b04f4e4a0c7c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden @@ -8,4 +8,4 @@   7   8  func main() {    …   …  @@ -9,5 +10,6 @@     9  10  }  - 10  11    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden index 30bb3b118d9e20f0df68a348a5a887360540ba4b..11220325ed2d66f98484899f8061b8bf0574adbb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden @@ -9,4 +9,4 @@   …   …  @@ -9,5 +10,6 @@     9  10  }   10  11    - 11  12  func getContent() string {  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden index e1a253d03b1ca631cc58dd8b0d85e23ea00325b8..e3841b3152f9bb355db26223ce5e5afa8dd930b1 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  10  }   10  11     11  12  func getContent() string {  - 12    -  return "Hello, world!"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden index 7712155c3ffd6879e75b0f57939ae23012f6a78e..1c95c2530d5324b105d9674fca17b5c387410a0b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden @@ -11,4 +11,4 @@  10  11     11  12  func getContent() string {   12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden index b0a459603f6f739b6b7f0eaa0087ea963c7fc842..4b40f3f5844a477be7c55bafbabc86a6d9c7cf04 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden @@ -12,4 +12,4 @@  11  12  func getContent() string {   12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden index a0f2c53692883080fda9647e3262957ba78fd236..61a03f25c81520058f8fd3856a03e84daac6cbb6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden @@ -1,2 +1,2 @@   …   …  @@ -2,6 +2,7 @@   -  2   2    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden index 4e835eb42451c4982dabf9d65d5d6e3729dc38be..6951d63de62756d581aa7a98564d6547dd244609 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden @@ -1,3 +1,3 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden index 64e6a891511c95c64bb770671118d6b47b4aa8e6..9de759b3ee15fd074cab28ee2866ad5b48f5ec66 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden @@ -1,4 +1,4 @@   …   …  @@ -2,6 +2,7 @@     2   2      3   3  import (  -  4   4  "fmt"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden index 4589e89ef94be4afa6e26dec9bb4905dd8441ea8..50e179fe27212fc7bab77c96cf966daa0b070a14 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden @@ -2,4 +2,4 @@   2   2      3   3  import (    4   4  "fmt"  -     5 +  "strings"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden index e1e8d7ee5c629f02f3e866a3d06ae62313f5e04c..119066f8acbae929a9555c32a338116e140fc724 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden @@ -3,4 +3,4 @@   3   3  import (    4   4  "fmt"       5 +  "strings"  -  5   6  )  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden index 71efab2fd169bafd2294f8cc19e744bddb4321a3..251adc55165c98fcf8cadd7d8e5214a15fda7e33 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden @@ -4,4 +4,4 @@   4   4  "fmt"       5 +  "strings"    5   6  )  -  6   7    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden index 4276ebd96aca71d453f4b24a4be53b988d1ae078..c5e77f40c2fe54f0456ac88fb3511e0cb9f6db99 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden @@ -5,4 +5,4 @@      5 +  "strings"    5   6  )    6   7    -  7   8  func main() {  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden index 1dda4a0bdbbc734da99d2f06e0f834f2d1b0a747..03288eb048726d484e1b41dddf7bf9cef64ea078 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden @@ -7,4 +7,4 @@   6   7      7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden index 0faa9e1e32f0beadf4b265d735790e6a6b4262aa..1285ef27e22ca7cb8db77be33b88544bc34448af 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden @@ -8,4 +8,4 @@   7   8  func main() {    …   …  @@ -9,5 +10,6 @@     9  10  }  - 10  11    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden index bb8e59a58be13b3b3e04ade30ae35dbd9780a034..fd6fea0459398c72b70e78367cb41a03f71f109a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden @@ -9,4 +9,4 @@   …   …  @@ -9,5 +10,6 @@     9  10  }   10  11    - 11  12  func getContent() string {  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden index 4d265424acdc4693196fef8c4f4b42f2a0f682e0..2cc1825ce79a03986a0e45f597a35dce309430e8 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  10  }   10  11     11  12  func getContent() string {  - 12    -  return "Hello, world!"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden index c98e674b3c5ec999515f4aed9c6b2ce2363dafc5..261c703aca33987a9bb1312f859ff896cb9cb471 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden @@ -11,4 +11,4 @@  10  11     11  12  func getContent() string {   12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden index 62eb2afc37b63d90bef79c25518eacc08b185ff9..96c15aec6aabdf2d1e079d66f4e914ee31f15e18 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden @@ -12,4 +12,4 @@  11  12  func getContent() string {   12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  \ No newline at end of file +  …   …  …  \ No newline at end of file From 94fbd9c377868a2607eff88556f8c289a4824938 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 10 Jun 2025 17:42:10 -0300 Subject: [PATCH 31/64] refactor(diffview): move `setPadding` to be inside `adjustStyles` --- internal/exp/diffview/diffview.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index bdaa25b8e23fabbf15e886d281845933c8b28a6b..e273094851e10b6d7b596f0eccd364348fae809f 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -198,6 +198,9 @@ func (dv *DiffView) convertDiffToSplit() { // adjustStyles adjusts adds padding and alignment to the styles. func (dv *DiffView) adjustStyles() { + setPadding := func(s lipgloss.Style) lipgloss.Style { + return s.Padding(0, lineNumPadding).Align(lipgloss.Right) + } dv.style.MissingLine.LineNumber = setPadding(dv.style.MissingLine.LineNumber) dv.style.DividerLine.LineNumber = setPadding(dv.style.DividerLine.LineNumber) dv.style.EqualLine.LineNumber = setPadding(dv.style.EqualLine.LineNumber) @@ -217,10 +220,6 @@ func (dv *DiffView) detectNumDigits() { } } -func setPadding(s lipgloss.Style) lipgloss.Style { - return s.Padding(0, lineNumPadding).Align(lipgloss.Right) -} - // detectCodeWidth calculates the maximum width of code lines in the diff view. func (dv *DiffView) detectCodeWidth() { switch dv.layout { From f047b18eb19f507ab1e9d68ab30571be565fffa7 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 10 Jun 2025 17:46:19 -0300 Subject: [PATCH 32/64] chore(diffview): add missing doc comments --- internal/exp/diffview/style.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/exp/diffview/style.go b/internal/exp/diffview/style.go index 2c083175ebed768255cefda436a083dfd6f3d6c5..83d7baeca9c59af9d465e9b130ae742d3138b7ce 100644 --- a/internal/exp/diffview/style.go +++ b/internal/exp/diffview/style.go @@ -5,12 +5,16 @@ import ( "github.com/charmbracelet/x/exp/charmtone" ) +// LineStyle defines the styles for a given line type in the diff view. type LineStyle struct { LineNumber lipgloss.Style Symbol lipgloss.Style Code lipgloss.Style } +// Style defines the overall style for the diff view, including styles for +// different line types such as divider, missing, equal, insert, and delete +// lines. type Style struct { DividerLine LineStyle MissingLine LineStyle @@ -19,6 +23,7 @@ type Style struct { DeleteLine LineStyle } +// DefaultLightStyle provides a default light theme style for the diff view. var DefaultLightStyle = Style{ DividerLine: LineStyle{ LineNumber: lipgloss.NewStyle(). @@ -66,6 +71,7 @@ var DefaultLightStyle = Style{ }, } +// DefaultDarkStyle provides a default dark theme style for the diff view. var DefaultDarkStyle = Style{ DividerLine: LineStyle{ LineNumber: lipgloss.NewStyle(). From 789a6b314f968a9a4c30e8794c227fb7361d01fe Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 11 Jun 2025 11:42:51 -0300 Subject: [PATCH 33/64] feat(diffview): implement ability to set horizontal offset --- internal/exp/diffview/Taskfile.yaml | 20 ++++++++++++++++++ internal/exp/diffview/diffview.go | 29 +++++++++++++++++++------- internal/exp/diffview/diffview_test.go | 23 ++++++++++++++++++++ internal/exp/diffview/util.go | 7 +++++++ 4 files changed, 72 insertions(+), 7 deletions(-) diff --git a/internal/exp/diffview/Taskfile.yaml b/internal/exp/diffview/Taskfile.yaml index be40107e348a340eadffc7d7095c9535330faeca..6dc8d477471b87498eb5365389bdf8f02458f406 100644 --- a/internal/exp/diffview/Taskfile.yaml +++ b/internal/exp/diffview/Taskfile.yaml @@ -60,3 +60,23 @@ tasks: - for: sources cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} silent: true + + test:print:xoffset:unified: + desc: Print golden files for debugging + method: none + sources: + - ./testdata/TestDiffViewXOffset/Unified/*.golden + cmds: + - for: sources + cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} + silent: true + + test:print:xoffset:split: + desc: Print golden files for debugging + method: none + sources: + - ./testdata/TestDiffViewXOffset/Split/*.golden + cmds: + - for: sources + cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} + silent: true diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index e273094851e10b6d7b596f0eccd364348fae809f..b5111692cdbda89b87663f412afcd82aba1dcf4f 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -39,6 +39,7 @@ type DiffView struct { highlight bool height int width int + xOffset int style Style isComputed bool @@ -130,6 +131,12 @@ func (dv *DiffView) Width(width int) *DiffView { return dv } +// XOffset sets the horizontal offset for the DiffView. +func (dv *DiffView) XOffset(xOffset int) *DiffView { + dv.xOffset = xOffset + return dv +} + // String returns the string representation of the DiffView. func (dv *DiffView) String() string { if err := dv.computeDiff(); err != nil { @@ -323,8 +330,11 @@ outer: } content := strings.TrimSuffix(l.Content, "\n") + content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content)) content = ansi.Truncate(content, dv.codeWidth, "…") + leadingEllipsis := dv.xOffset > 0 && strings.TrimSpace(content) != "" + switch l.Kind { case udiff.Equal: if dv.lineNumbers { @@ -332,7 +342,7 @@ outer: b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } b.WriteString(fullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + content), + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(ternary(leadingEllipsis, " …", " ") + content), )) beforeLine++ afterLine++ @@ -342,7 +352,7 @@ outer: b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } b.WriteString(fullContentStyle.Render( - dv.style.InsertLine.Symbol.Render("+ ") + + dv.style.InsertLine.Symbol.Render(ternary(leadingEllipsis, "+…", "+ ")) + dv.style.InsertLine.Code.Width(dv.codeWidth).Render(content), )) afterLine++ @@ -352,7 +362,7 @@ outer: b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } b.WriteString(fullContentStyle.Render( - dv.style.DeleteLine.Symbol.Render("- ") + + dv.style.DeleteLine.Symbol.Render(ternary(leadingEllipsis, "-…", "- ")) + dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(content), )) beforeLine++ @@ -427,13 +437,18 @@ outer: var afterContent string if l.before != nil { beforeContent = strings.TrimSuffix(l.before.Content, "\n") + beforeContent = ansi.GraphemeWidth.Cut(beforeContent, dv.xOffset, len(beforeContent)) beforeContent = ansi.Truncate(beforeContent, dv.codeWidth, "…") } if l.after != nil { afterContent = strings.TrimSuffix(l.after.Content, "\n") + afterContent = ansi.GraphemeWidth.Cut(afterContent, dv.xOffset, len(afterContent)) afterContent = ansi.Truncate(afterContent, dv.codeWidth+btoi(dv.extraColOnAfter), "…") } + leadingBeforeEllipsis := dv.xOffset > 0 && strings.TrimSpace(beforeContent) != "" + leadingAfterEllipsis := dv.xOffset > 0 && strings.TrimSpace(afterContent) != "" + switch { case l.before == nil: if dv.lineNumbers { @@ -447,7 +462,7 @@ outer: b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } b.WriteString(beforeFullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" " + beforeContent), + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(ternary(leadingBeforeEllipsis, " …", " ") + beforeContent), )) beforeLine++ case l.before.Kind == udiff.Delete: @@ -455,7 +470,7 @@ outer: b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } b.WriteString(beforeFullContentStyle.Render( - dv.style.DeleteLine.Symbol.Render("- ") + + dv.style.DeleteLine.Symbol.Render(ternary(leadingBeforeEllipsis, "-…", "- ")) + dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(beforeContent), )) beforeLine++ @@ -474,7 +489,7 @@ outer: b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } b.WriteString(afterFullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" " + afterContent), + dv.style.EqualLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(ternary(leadingAfterEllipsis, " …", " ") + afterContent), )) afterLine++ case l.after.Kind == udiff.Insert: @@ -482,7 +497,7 @@ outer: b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } b.WriteString(afterFullContentStyle.Render( - dv.style.InsertLine.Symbol.Render("+ ") + + dv.style.InsertLine.Symbol.Render(ternary(leadingAfterEllipsis, "+…", "+ ")) + dv.style.InsertLine.Code.Width(dv.codeWidth+btoi(dv.extraColOnAfter)).Render(afterContent), )) afterLine++ diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index fbf2661ccd269ed71aa40d46333ba5594df9078d..6d68a46d197630fecf01204841aa83e7e87e39df 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -193,6 +193,29 @@ func TestDiffViewHeight(t *testing.T) { } } +func TestDiffViewXOffset(t *testing.T) { + for layoutName, layoutFunc := range LayoutFuncs { + t.Run(layoutName, func(t *testing.T) { + for xOffset := range 21 { + t.Run(fmt.Sprintf("XOffsetOf%02d", xOffset), func(t *testing.T) { + dv := diffview.New(). + Before("main.go", TestDefaultBefore). + After("main.go", TestDefaultAfter). + Style(diffview.DefaultLightStyle). + Width(60). + XOffset(xOffset) + dv = layoutFunc(dv) + + output := dv.String() + golden.RequireEqual(t, []byte(output)) + + assertLineWidth(t, 60, output) + }) + } + }) + } +} + func assertLineWidth(t *testing.T, expected int, output string) { var lineWidth int for line := range strings.SplitSeq(output, "\n") { diff --git a/internal/exp/diffview/util.go b/internal/exp/diffview/util.go index 7ad3b880135216e668225a83859ff4866a7a2640..0ab35b16a5b9fb877b823784d8a4393a2ce4f650 100644 --- a/internal/exp/diffview/util.go +++ b/internal/exp/diffview/util.go @@ -30,3 +30,10 @@ func btoi(b bool) int { } return 0 } + +func ternary[T any](cond bool, t, f T) T { + if cond { + return t + } + return f +} From 3c80193bdffdedad9a5d253ebff965ce6e6f8271 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 11 Jun 2025 11:43:51 -0300 Subject: [PATCH 34/64] test(diffview): record golden files for xoffset test --- .../testdata/TestDiffViewXOffset/Split/XOffsetOf00.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf01.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf02.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf03.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf04.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf05.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf06.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf07.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf08.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf09.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf10.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf11.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf12.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf13.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf14.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf15.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf16.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf17.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf18.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf19.golden | 7 +++++++ .../testdata/TestDiffViewXOffset/Split/XOffsetOf20.golden | 7 +++++++ .../TestDiffViewXOffset/Unified/XOffsetOf00.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf01.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf02.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf03.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf04.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf05.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf06.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf07.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf08.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf09.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf10.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf11.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf12.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf13.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf14.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf15.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf16.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf17.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf18.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf19.golden | 8 ++++++++ .../TestDiffViewXOffset/Unified/XOffsetOf20.golden | 8 ++++++++ 42 files changed, 315 insertions(+) create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf00.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf01.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf02.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf03.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf04.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf05.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf06.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf07.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf08.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf09.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf10.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf11.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf12.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf13.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf14.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf15.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf16.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf17.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf18.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf19.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf20.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf00.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf01.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf02.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf03.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf04.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf05.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf06.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf07.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf08.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf09.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf10.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf11.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf12.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf13.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf14.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf15.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf16.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf17.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf18.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf19.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf20.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf00.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf00.golden new file mode 100644 index 0000000000000000000000000000000000000000..c9848ade3c32d3c908502850c017371a12c36ab3 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf00.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5  )   5  )  +  6     6    +  7  func main() {   7  func main() {  +  8 -  fmt.Println("Hello,…  8 +  content := "Hello, … +       9 +  fmt.Println(content) +  9  }  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf01.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf01.golden new file mode 100644 index 0000000000000000000000000000000000000000..f136651ffebaa946c9d74b0338653d2127de813c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf01.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  …unc main() {   7  …unc main() {  +  8 -… fmt.Println("Hello, …  8 +… content := "Hello, w… +       9 +… fmt.Println(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf02.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf02.golden new file mode 100644 index 0000000000000000000000000000000000000000..4aefe2e840d519f13e6f189ef815fdfa913d0ddc --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf02.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  …nc main() {   7  …nc main() {  +  8 -… fmt.Println("Hello, w…  8 +… content := "Hello, wo… +       9 +… fmt.Println(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf03.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf03.golden new file mode 100644 index 0000000000000000000000000000000000000000..663e619ab981b85f5abbadba4c2f9d87aebd4883 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf03.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  …c main() {   7  …c main() {  +  8 -… fmt.Println("Hello, wo…  8 +… content := "Hello, wor… +       9 +… fmt.Println(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf04.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf04.golden new file mode 100644 index 0000000000000000000000000000000000000000..38634c92e31c01d8c0aeee2e66b1dc80677c9ea7 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf04.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  … main() {   7  … main() {  +  8 -…fmt.Println("Hello, wor…  8 +…content := "Hello, worl… +       9 +…fmt.Println(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf05.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf05.golden new file mode 100644 index 0000000000000000000000000000000000000000..a3617ce891cda2c9a83605845e13cdb00fd04117 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf05.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  …main() {   7  …main() {  +  8 -…mt.Println("Hello, worl…  8 +…ontent := "Hello, world… +       9 +…mt.Println(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf06.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf06.golden new file mode 100644 index 0000000000000000000000000000000000000000..eb417ae0ccbe29a97943d7d73382e66fb8747978 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf06.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  …ain() {   7  …ain() {  +  8 -…t.Println("Hello, world…  8 +…ntent := "Hello, world!" +       9 +…t.Println(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf07.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf07.golden new file mode 100644 index 0000000000000000000000000000000000000000..899748cccb9dc66dfc06632025cc90cdea8f49b8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf07.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  …in() {   7  …in() {  +  8 -….Println("Hello, world!…  8 +…tent := "Hello, world!"  +       9 +….Println(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf08.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf08.golden new file mode 100644 index 0000000000000000000000000000000000000000..8118b8268b334a246999396ccc22b8fcf5580eed --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf08.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  …n() {   7  …n() {  +  8 -…Println("Hello, world!")  8 +…ent := "Hello, world!"  +       9 +…Println(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf09.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf09.golden new file mode 100644 index 0000000000000000000000000000000000000000..a5fc063e7e3a3d692d5bf77a61bbc0941b38d8a8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf09.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  …() {   7  …() {  +  8 -…rintln("Hello, world!")   8 +…nt := "Hello, world!"  +       9 +…rintln(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf10.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf10.golden new file mode 100644 index 0000000000000000000000000000000000000000..3476582fd1f855920427bafde2b5dc36486343e1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf10.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  …) {   7  …) {  +  8 -…intln("Hello, world!")   8 +…t := "Hello, world!"  +       9 +…intln(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf11.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf11.golden new file mode 100644 index 0000000000000000000000000000000000000000..26f063c6f74d0bbd8b8be62146b3419cf8080325 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf11.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  … {   7  … {  +  8 -…ntln("Hello, world!")   8 +… := "Hello, world!"  +       9 +…ntln(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf12.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf12.golden new file mode 100644 index 0000000000000000000000000000000000000000..e775533e802c39a26c6df11afbadb91256f00467 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf12.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7  …{   7  …{  +  8 -…tln("Hello, world!")   8 +…:= "Hello, world!"  +       9 +…tln(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf13.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf13.golden new file mode 100644 index 0000000000000000000000000000000000000000..3f50e8681a9ee20368681ba422630826fd8f3d23 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf13.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7     7    +  8 -…ln("Hello, world!")   8 +…= "Hello, world!"  +       9 +…ln(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf14.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf14.golden new file mode 100644 index 0000000000000000000000000000000000000000..5447ca0f0f4bca5561c9794f4a5700a3dc04f96b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf14.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7     7    +  8 -…n("Hello, world!")   8 +… "Hello, world!"  +       9 +…n(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf15.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf15.golden new file mode 100644 index 0000000000000000000000000000000000000000..64f046c56b56560a4dd92d2d794e05281a815798 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf15.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7     7    +  8 -…("Hello, world!")   8 +…"Hello, world!"  +       9 +…(content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf16.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf16.golden new file mode 100644 index 0000000000000000000000000000000000000000..b207f7f1dc1d4d25c5efd9fd6cd38673178ef1f0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf16.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7     7    +  8 -…"Hello, world!")   8 +…Hello, world!"  +       9 +…content)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf17.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf17.golden new file mode 100644 index 0000000000000000000000000000000000000000..5d659dae8b830adf3a1ac578c1915d186b23157d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf17.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7     7    +  8 -…Hello, world!")   8 +…ello, world!"  +       9 +…ontent)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf18.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf18.golden new file mode 100644 index 0000000000000000000000000000000000000000..16fecd3ea6aac8f92def3b3602cac2ff7c5879f9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf18.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7     7    +  8 -…ello, world!")   8 +…llo, world!"  +       9 +…ntent)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf19.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf19.golden new file mode 100644 index 0000000000000000000000000000000000000000..7c4606472de514d41cada9befc971bf630a2ad2e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf19.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7     7    +  8 -…llo, world!")   8 +…lo, world!"  +       9 +…tent)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf20.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf20.golden new file mode 100644 index 0000000000000000000000000000000000000000..acfd59dc2b5fa8574ab2d0b2ce33bba33ab9f452 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf20.golden @@ -0,0 +1,7 @@ +  …  @@ -5,5 +5,6 @@    …    +  5     5    +  6     6    +  7     7    +  8 -…lo, world!")   8 +…o, world!"  +       9 +…ent)  +  9    10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf00.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf00.golden new file mode 100644 index 0000000000000000000000000000000000000000..dd633a6f596ef2a1654430639e0547088daedf41 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf00.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5  )  +  6   6    +  7   7  func main() {  +  8    -  fmt.Println("Hello, world!")  +     8 +  content := "Hello, world!"  +     9 +  fmt.Println(content)  +  9  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf01.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf01.golden new file mode 100644 index 0000000000000000000000000000000000000000..8fa9bb8163b5b0bd1905d17dd39eca2414da2970 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf01.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  …unc main() {  +  8    -… fmt.Println("Hello, world!")  +     8 +… content := "Hello, world!"  +     9 +… fmt.Println(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf02.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf02.golden new file mode 100644 index 0000000000000000000000000000000000000000..b22c0ff36e32ed710aed00453a055d93344e4571 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf02.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  …nc main() {  +  8    -… fmt.Println("Hello, world!")  +     8 +… content := "Hello, world!"  +     9 +… fmt.Println(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf03.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf03.golden new file mode 100644 index 0000000000000000000000000000000000000000..3195a4dcb8b31e848b73d8b96f47d086fa0f8c7c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf03.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  …c main() {  +  8    -… fmt.Println("Hello, world!")  +     8 +… content := "Hello, world!"  +     9 +… fmt.Println(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf04.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf04.golden new file mode 100644 index 0000000000000000000000000000000000000000..ab30137b9c3994b82ea9e8f0c7dfd032d9198a66 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf04.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  … main() {  +  8    -…fmt.Println("Hello, world!")  +     8 +…content := "Hello, world!"  +     9 +…fmt.Println(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf05.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf05.golden new file mode 100644 index 0000000000000000000000000000000000000000..e7482736d73ea79e49b03cf33fed35d81283444c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf05.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  …main() {  +  8    -…mt.Println("Hello, world!")  +     8 +…ontent := "Hello, world!"  +     9 +…mt.Println(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf06.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf06.golden new file mode 100644 index 0000000000000000000000000000000000000000..6b17b7def25d0a80c75a12965a30de66ffa08801 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf06.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  …ain() {  +  8    -…t.Println("Hello, world!")  +     8 +…ntent := "Hello, world!"  +     9 +…t.Println(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf07.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf07.golden new file mode 100644 index 0000000000000000000000000000000000000000..a5bc5b1b905e1b347365817ffa00ebc6bc98a8b1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf07.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  …in() {  +  8    -….Println("Hello, world!")  +     8 +…tent := "Hello, world!"  +     9 +….Println(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf08.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf08.golden new file mode 100644 index 0000000000000000000000000000000000000000..a042c5c8633fc3b49374bc13e2d0f0ee3ebb6860 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf08.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  …n() {  +  8    -…Println("Hello, world!")  +     8 +…ent := "Hello, world!"  +     9 +…Println(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf09.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf09.golden new file mode 100644 index 0000000000000000000000000000000000000000..9d1284213fa2376e76fd9305c9e8bede06e9d37b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf09.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  …() {  +  8    -…rintln("Hello, world!")  +     8 +…nt := "Hello, world!"  +     9 +…rintln(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf10.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf10.golden new file mode 100644 index 0000000000000000000000000000000000000000..73a2a7a578547ecd1f4a1452ff0ae8fffaab4f16 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf10.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  …) {  +  8    -…intln("Hello, world!")  +     8 +…t := "Hello, world!"  +     9 +…intln(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf11.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf11.golden new file mode 100644 index 0000000000000000000000000000000000000000..f1a7b6d483266f1e507dff3e4314fad5d7b561b4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf11.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  … {  +  8    -…ntln("Hello, world!")  +     8 +… := "Hello, world!"  +     9 +…ntln(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf12.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf12.golden new file mode 100644 index 0000000000000000000000000000000000000000..1981f4bf1ca064474854b672c8efe8ef9441e560 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf12.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7  …{  +  8    -…tln("Hello, world!")  +     8 +…:= "Hello, world!"  +     9 +…tln(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf13.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf13.golden new file mode 100644 index 0000000000000000000000000000000000000000..a0c0fb30c50a3575805d9166da8a4cdd37674d1e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf13.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7    +  8    -…ln("Hello, world!")  +     8 +…= "Hello, world!"  +     9 +…ln(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf14.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf14.golden new file mode 100644 index 0000000000000000000000000000000000000000..47c5ccc7be998a34088c881bf316b2b499252a05 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf14.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7    +  8    -…n("Hello, world!")  +     8 +… "Hello, world!"  +     9 +…n(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf15.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf15.golden new file mode 100644 index 0000000000000000000000000000000000000000..3e7787d77ad14a1ff828f3e604ea79e22c1f0b8d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf15.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7    +  8    -…("Hello, world!")  +     8 +…"Hello, world!"  +     9 +…(content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf16.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf16.golden new file mode 100644 index 0000000000000000000000000000000000000000..5fe0d8d0ef38693f80b8a517f5b28ed11a3ef32b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf16.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7    +  8    -…"Hello, world!")  +     8 +…Hello, world!"  +     9 +…content)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf17.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf17.golden new file mode 100644 index 0000000000000000000000000000000000000000..a1a21ab38ba64515558c64e62fe03e64d5051fc1 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf17.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7    +  8    -…Hello, world!")  +     8 +…ello, world!"  +     9 +…ontent)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf18.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf18.golden new file mode 100644 index 0000000000000000000000000000000000000000..2cfaef8115cd6ec460f44ea1c4bd7cd1e8da6cdb --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf18.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7    +  8    -…ello, world!")  +     8 +…llo, world!"  +     9 +…ntent)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf19.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf19.golden new file mode 100644 index 0000000000000000000000000000000000000000..c6496c19b7417efa7763783ba7b182dacc9db6b0 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf19.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7    +  8    -…llo, world!")  +     8 +…lo, world!"  +     9 +…tent)  +  9  10    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf20.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf20.golden new file mode 100644 index 0000000000000000000000000000000000000000..b2dbd15fa8d3222f7dab9612b2317d3eaf052676 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf20.golden @@ -0,0 +1,8 @@ +  …   …  @@ -5,5 +5,6 @@   +  5   5    +  6   6    +  7   7    +  8    -…lo, world!")  +     8 +…o, world!"  +     9 +…ent)  +  9  10    \ No newline at end of file From 45ddc6680a2b07d18b49d2877350fde783aea5f8 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 11 Jun 2025 15:04:49 -0300 Subject: [PATCH 35/64] feat(diffview): add support for setting vertical offset --- internal/exp/diffview/Taskfile.yaml | 20 ++++ internal/exp/diffview/diffview.go | 123 ++++++++++++++----------- internal/exp/diffview/diffview_test.go | 23 +++++ 3 files changed, 114 insertions(+), 52 deletions(-) diff --git a/internal/exp/diffview/Taskfile.yaml b/internal/exp/diffview/Taskfile.yaml index 6dc8d477471b87498eb5365389bdf8f02458f406..422dbe2d3ac85be34c35f81763f7a30b154140f1 100644 --- a/internal/exp/diffview/Taskfile.yaml +++ b/internal/exp/diffview/Taskfile.yaml @@ -80,3 +80,23 @@ tasks: - for: sources cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} silent: true + + test:print:yoffset:unified: + desc: Print golden files for debugging + method: none + sources: + - ./testdata/TestDiffViewYOffset/Unified/*.golden + cmds: + - for: sources + cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} + silent: true + + test:print:yoffset:split: + desc: Print golden files for debugging + method: none + sources: + - ./testdata/TestDiffViewYOffset/Split/*.golden + cmds: + - for: sources + cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} + silent: true diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index b5111692cdbda89b87663f412afcd82aba1dcf4f..871949fcf1d972def5b54a3c4112b0d6fad146bb 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -40,6 +40,7 @@ type DiffView struct { height int width int xOffset int + yOffset int style Style isComputed bool @@ -137,6 +138,12 @@ func (dv *DiffView) XOffset(xOffset int) *DiffView { return dv } +// YOffset sets the vertical offset for the DiffView. +func (dv *DiffView) YOffset(yOffset int) *DiffView { + dv.yOffset = yOffset + return dv +} + // String returns the string representation of the DiffView. func (dv *DiffView) String() string { if err := dv.computeDiff(); err != nil { @@ -296,17 +303,23 @@ func (dv *DiffView) renderUnified() string { var b strings.Builder fullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth) - printedLines := 0 + printedLines := -dv.yOffset + + write := func(s string) { + if printedLines >= 0 { + b.WriteString(s) + } + } outer: for i, h := range dv.unified.Hunks { if dv.lineNumbers { - b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) - b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) } content := ansi.Truncate(dv.hunkLineFor(h), dv.fullCodeWidth, "…") - b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(content)) - b.WriteRune('\n') + write(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(content)) + write("\n") printedLines++ beforeLine := h.FromLine @@ -319,13 +332,13 @@ outer: isLastLine := j+1 == len(h.Lines) if hasReachedHeight && (!isLastHunk || !isLastLine) { if dv.lineNumbers { - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(dv.style.EqualLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(dv.style.EqualLine.LineNumber.Render(pad("…", dv.afterNumDigits))) } - b.WriteString(fullContentStyle.Render( + write(fullContentStyle.Render( dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), )) - b.WriteRune('\n') + write("\n") break outer } @@ -338,36 +351,36 @@ outer: switch l.Kind { case udiff.Equal: if dv.lineNumbers { - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) + write(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) + write(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } - b.WriteString(fullContentStyle.Render( + write(fullContentStyle.Render( dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(ternary(leadingEllipsis, " …", " ") + content), )) beforeLine++ afterLine++ case udiff.Insert: if dv.lineNumbers { - b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) - b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) + write(dv.style.InsertLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) + write(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } - b.WriteString(fullContentStyle.Render( + write(fullContentStyle.Render( dv.style.InsertLine.Symbol.Render(ternary(leadingEllipsis, "+…", "+ ")) + dv.style.InsertLine.Code.Width(dv.codeWidth).Render(content), )) afterLine++ case udiff.Delete: if dv.lineNumbers { - b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) - b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) + write(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) + write(dv.style.DeleteLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } - b.WriteString(fullContentStyle.Render( + write(fullContentStyle.Render( dv.style.DeleteLine.Symbol.Render(ternary(leadingEllipsis, "-…", "- ")) + dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(content), )) beforeLine++ } - b.WriteRune('\n') + write("\n") printedLines++ } @@ -375,11 +388,11 @@ outer: for printedLines < dv.height { if dv.lineNumbers { - b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) - b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) + write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) + write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } - b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) - b.WriteRune('\n') + write(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) + write("\n") printedLines++ } @@ -392,20 +405,26 @@ func (dv *DiffView) renderSplit() string { beforeFullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth) afterFullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth + btoi(dv.extraColOnAfter)) - printedLines := 0 + printedLines := -dv.yOffset + + write := func(s string) { + if printedLines >= 0 { + b.WriteString(s) + } + } outer: for i, h := range dv.splitHunks { if dv.lineNumbers { - b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) } content := ansi.Truncate(dv.hunkLineFor(dv.unified.Hunks[i]), dv.fullCodeWidth, "…") - b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(content)) + write(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(content)) if dv.lineNumbers { - b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) } - b.WriteString(dv.style.DividerLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) - b.WriteRune('\n') + write(dv.style.DividerLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) + write("\n") printedLines++ beforeLine := h.fromLine @@ -418,18 +437,18 @@ outer: isLastLine := j+1 == len(h.lines) if hasReachedHeight && (!isLastHunk || !isLastLine) { if dv.lineNumbers { - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(dv.style.EqualLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) } - b.WriteString(beforeFullContentStyle.Render( + write(beforeFullContentStyle.Render( dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), )) if dv.lineNumbers { - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(dv.style.EqualLine.LineNumber.Render(pad("…", dv.afterNumDigits))) } - b.WriteString(afterFullContentStyle.Render( + write(afterFullContentStyle.Render( dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), )) - b.WriteRune('\n') + write("\n") break outer } @@ -452,24 +471,24 @@ outer: switch { case l.before == nil: if dv.lineNumbers { - b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) + write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) } - b.WriteString(beforeFullContentStyle.Render( + write(beforeFullContentStyle.Render( dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" "), )) case l.before.Kind == udiff.Equal: if dv.lineNumbers { - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) + write(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } - b.WriteString(beforeFullContentStyle.Render( + write(beforeFullContentStyle.Render( dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(ternary(leadingBeforeEllipsis, " …", " ") + beforeContent), )) beforeLine++ case l.before.Kind == udiff.Delete: if dv.lineNumbers { - b.WriteString(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) + write(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } - b.WriteString(beforeFullContentStyle.Render( + write(beforeFullContentStyle.Render( dv.style.DeleteLine.Symbol.Render(ternary(leadingBeforeEllipsis, "-…", "- ")) + dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(beforeContent), )) @@ -479,31 +498,31 @@ outer: switch { case l.after == nil: if dv.lineNumbers { - b.WriteString(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) + write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } - b.WriteString(afterFullContentStyle.Render( + write(afterFullContentStyle.Render( dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" "), )) case l.after.Kind == udiff.Equal: if dv.lineNumbers { - b.WriteString(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) + write(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } - b.WriteString(afterFullContentStyle.Render( + write(afterFullContentStyle.Render( dv.style.EqualLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(ternary(leadingAfterEllipsis, " …", " ") + afterContent), )) afterLine++ case l.after.Kind == udiff.Insert: if dv.lineNumbers { - b.WriteString(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) + write(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } - b.WriteString(afterFullContentStyle.Render( + write(afterFullContentStyle.Render( dv.style.InsertLine.Symbol.Render(ternary(leadingAfterEllipsis, "+…", "+ ")) + dv.style.InsertLine.Code.Width(dv.codeWidth+btoi(dv.extraColOnAfter)).Render(afterContent), )) afterLine++ } - b.WriteRune('\n') + write("\n") printedLines++ } @@ -511,14 +530,14 @@ outer: for printedLines < dv.height { if dv.lineNumbers { - b.WriteString(dv.style.MissingLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(dv.style.MissingLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) } - b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) + write(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) if dv.lineNumbers { - b.WriteString(dv.style.MissingLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(dv.style.MissingLine.LineNumber.Render(pad("…", dv.afterNumDigits))) } - b.WriteString(dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) - b.WriteRune('\n') + write(dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) + write("\n") printedLines++ } diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index 6d68a46d197630fecf01204841aa83e7e87e39df..d9f55892024ef4a9da00b0f5586e3f50135e27d9 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -216,6 +216,29 @@ func TestDiffViewXOffset(t *testing.T) { } } +func TestDiffViewYOffset(t *testing.T) { + for layoutName, layoutFunc := range LayoutFuncs { + t.Run(layoutName, func(t *testing.T) { + for yOffset := range 17 { + t.Run(fmt.Sprintf("YOffsetOf%02d", yOffset), func(t *testing.T) { + dv := diffview.New(). + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter). + Style(diffview.DefaultLightStyle). + Height(5). + YOffset(yOffset) + dv = layoutFunc(dv) + + output := dv.String() + golden.RequireEqual(t, []byte(output)) + + assertHeight(t, 5, output) + }) + } + }) + } +} + func assertLineWidth(t *testing.T, expected int, output string) { var lineWidth int for line := range strings.SplitSeq(output, "\n") { From 594dfd7fd86b00cb11a8c5d606a54e4f0ee6b57a Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 11 Jun 2025 15:05:36 -0300 Subject: [PATCH 36/64] test(diffview): record golden files for yoffset test --- .../testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf01.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf02.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf03.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf04.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf05.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf06.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf07.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf10.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf01.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf02.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf03.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf04.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf05.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf06.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf07.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf11.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf12.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf13.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf14.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf15.golden | 5 +++++ .../testdata/TestDiffViewYOffset/Unified/YOffsetOf16.golden | 5 +++++ 34 files changed, 170 insertions(+) create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf01.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf02.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf03.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf04.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf05.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf06.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf07.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf10.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf01.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf02.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf03.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf04.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf05.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf06.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf07.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf11.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf12.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf13.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf14.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf15.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf16.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden new file mode 100644 index 0000000000000000000000000000000000000000..14803d08c905475b4cd0146c363da33f85eb7979 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden @@ -0,0 +1,5 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf01.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf01.golden new file mode 100644 index 0000000000000000000000000000000000000000..922ebc16416c1ff5ac7c36c818e707b46951e830 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf01.golden @@ -0,0 +1,5 @@ +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf02.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf02.golden new file mode 100644 index 0000000000000000000000000000000000000000..3c757b4a947d64e87fffc4dd040a665f8b56b506 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf02.golden @@ -0,0 +1,5 @@ +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf03.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf03.golden new file mode 100644 index 0000000000000000000000000000000000000000..801f1b0bcdeb2b431316fefd3d1dc17eeda3ca52 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf03.golden @@ -0,0 +1,5 @@ +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf04.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf04.golden new file mode 100644 index 0000000000000000000000000000000000000000..2fb641655367a1d8fc751bbd0444a2d4ea7d11fe --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf04.golden @@ -0,0 +1,5 @@ +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf05.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf05.golden new file mode 100644 index 0000000000000000000000000000000000000000..928c63623f5fd88e0ed34dc03fc90e6404ac4390 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf05.golden @@ -0,0 +1,5 @@ +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf06.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf06.golden new file mode 100644 index 0000000000000000000000000000000000000000..134ff01120a7bd4a2f80c1e65cfb174b7852bca8 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf06.golden @@ -0,0 +1,5 @@ +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf07.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf07.golden new file mode 100644 index 0000000000000000000000000000000000000000..51843c42adc8774acf09a79cb235806324aea57e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf07.golden @@ -0,0 +1,5 @@ +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden new file mode 100644 index 0000000000000000000000000000000000000000..dec2d8cf37a8a022d73f705c6ef72323678f13ef --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden @@ -0,0 +1,5 @@ +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden new file mode 100644 index 0000000000000000000000000000000000000000..90982b5c972b7a1529e56eec8143c8c78acf4739 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden @@ -0,0 +1,5 @@ +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf10.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf10.golden new file mode 100644 index 0000000000000000000000000000000000000000..5fd504aac99cb59bf8e2bc652e0dfffcd0e48ef2 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf10.golden @@ -0,0 +1,5 @@ + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden new file mode 100644 index 0000000000000000000000000000000000000000..3f363d0a7e59883fefba9c0c60c1231943821705 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden @@ -0,0 +1,5 @@ + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden new file mode 100644 index 0000000000000000000000000000000000000000..1b44a42fcfba8d182ca9215beae5001fd623873f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden @@ -0,0 +1,5 @@ + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden new file mode 100644 index 0000000000000000000000000000000000000000..e835a66406d56409debab9bc4f9007decf81042c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden @@ -0,0 +1,5 @@ +      14 +  return content  + 13  }  15  }  +  …     …    +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden new file mode 100644 index 0000000000000000000000000000000000000000..0bb5000165b4ef15dabc116aaf9e0195c215061d --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden @@ -0,0 +1,5 @@ + 13  }  15  }  +  …     …    +  …     …    +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden new file mode 100644 index 0000000000000000000000000000000000000000..a948b73aaf92cb90f712d625e8b2cc3078a5fa13 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden @@ -0,0 +1,5 @@ +  …     …    +  …     …    +  …     …    +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden new file mode 100644 index 0000000000000000000000000000000000000000..a948b73aaf92cb90f712d625e8b2cc3078a5fa13 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden @@ -0,0 +1,5 @@ +  …     …    +  …     …    +  …     …    +  …     …    +  …     …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden new file mode 100644 index 0000000000000000000000000000000000000000..50e179fe27212fc7bab77c96cf966daa0b070a14 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden @@ -0,0 +1,5 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf01.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf01.golden new file mode 100644 index 0000000000000000000000000000000000000000..a2da7f190863608734fbf3f449f24b3fa0b65cfc --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf01.golden @@ -0,0 +1,5 @@ +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf02.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf02.golden new file mode 100644 index 0000000000000000000000000000000000000000..79e537e2db8bfe77db540fea4473c4cc6f83b407 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf02.golden @@ -0,0 +1,5 @@ +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf03.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf03.golden new file mode 100644 index 0000000000000000000000000000000000000000..53f8513a024887efe60ac3fb105eeab7647400aa --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf03.golden @@ -0,0 +1,5 @@ +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf04.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf04.golden new file mode 100644 index 0000000000000000000000000000000000000000..2d4fd565311ef7a06e79aba83c7de7fe869479e5 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf04.golden @@ -0,0 +1,5 @@ +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf05.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf05.golden new file mode 100644 index 0000000000000000000000000000000000000000..0f5336993d91f4b736e06250efae27169cd105b4 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf05.golden @@ -0,0 +1,5 @@ +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf06.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf06.golden new file mode 100644 index 0000000000000000000000000000000000000000..4a58338c54b1770a14a806eca1fe2f53a425c50f --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf06.golden @@ -0,0 +1,5 @@ +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf07.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf07.golden new file mode 100644 index 0000000000000000000000000000000000000000..3e212731a61ba73315f177af7c07bafdf3878dbe --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf07.golden @@ -0,0 +1,5 @@ +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden new file mode 100644 index 0000000000000000000000000000000000000000..69f40b94f48670634a786c71d7451c03f3a3148c --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden @@ -0,0 +1,5 @@ +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden new file mode 100644 index 0000000000000000000000000000000000000000..1e21a2b99378c3412de7a0fabe81beab28aaeb92 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden @@ -0,0 +1,5 @@ +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden new file mode 100644 index 0000000000000000000000000000000000000000..e6998d09e18f4df9477b33510b22754ad32fc764 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden @@ -0,0 +1,5 @@ + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf11.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf11.golden new file mode 100644 index 0000000000000000000000000000000000000000..2d0d5dc5dcf0d55cc78f02ff69b26c0b7a90584e --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf11.golden @@ -0,0 +1,5 @@ + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf12.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf12.golden new file mode 100644 index 0000000000000000000000000000000000000000..9ade24d5f1d0e81cb7e86c0c96998297f9412c32 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf12.golden @@ -0,0 +1,5 @@ + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf13.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf13.golden new file mode 100644 index 0000000000000000000000000000000000000000..ac8d340dd7c0dc2433d65c568c7537fea9aafe85 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf13.golden @@ -0,0 +1,5 @@ +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  +         +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf14.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf14.golden new file mode 100644 index 0000000000000000000000000000000000000000..17bffdd193c6e30fec1b9de039f3268bb0c869cf --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf14.golden @@ -0,0 +1,5 @@ +    14 +  return content  + 13  15  }  +         +         +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf15.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf15.golden new file mode 100644 index 0000000000000000000000000000000000000000..b10490ae372c833632bc415259ccfe9f0c5b8075 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf15.golden @@ -0,0 +1,5 @@ + 13  15  }  +         +         +         +         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf16.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf16.golden new file mode 100644 index 0000000000000000000000000000000000000000..933f56b9d1fc148d6d394cb271299f4eddc0a739 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf16.golden @@ -0,0 +1,5 @@ +         +         +         +         +         \ No newline at end of file From 9f5d70c0a50d5a6f39f4c7890e57475cf15ce6b5 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 11 Jun 2025 15:18:31 -0300 Subject: [PATCH 37/64] fix(diffview): respect line style even if it's the last one with ellipsis --- internal/exp/diffview/diffview.go | 36 +++++++++++++++---- .../Split/DarkMode/HeightOf005.golden | 2 +- .../Split/DarkMode/HeightOf013.golden | 2 +- .../Split/DarkMode/HeightOf014.golden | 2 +- .../Split/LightMode/HeightOf005.golden | 2 +- .../Split/LightMode/HeightOf013.golden | 2 +- .../Split/LightMode/HeightOf014.golden | 2 +- .../Unified/DarkMode/HeightOf005.golden | 2 +- .../Unified/DarkMode/HeightOf013.golden | 2 +- .../Unified/DarkMode/HeightOf014.golden | 2 +- .../Unified/DarkMode/HeightOf015.golden | 2 +- .../Unified/LightMode/HeightOf005.golden | 2 +- .../Unified/LightMode/HeightOf013.golden | 2 +- .../Unified/LightMode/HeightOf014.golden | 2 +- .../Unified/LightMode/HeightOf015.golden | 2 +- .../Split/YOffsetOf00.golden | 2 +- .../Split/YOffsetOf08.golden | 2 +- .../Split/YOffsetOf09.golden | 2 +- .../Unified/YOffsetOf00.golden | 2 +- .../Unified/YOffsetOf08.golden | 2 +- .../Unified/YOffsetOf09.golden | 2 +- .../Unified/YOffsetOf10.golden | 2 +- 22 files changed, 50 insertions(+), 28 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 871949fcf1d972def5b54a3c4112b0d6fad146bb..f3801afb26f77a7285053369277be787c93e39f5 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -331,12 +331,13 @@ outer: isLastHunk := i+1 == len(dv.unified.Hunks) isLastLine := j+1 == len(h.Lines) if hasReachedHeight && (!isLastHunk || !isLastLine) { + lineStyle := dv.lineStyleForType(l.Kind) if dv.lineNumbers { - write(dv.style.EqualLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) - write(dv.style.EqualLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(lineStyle.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(lineStyle.LineNumber.Render(pad("…", dv.afterNumDigits))) } write(fullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), + lineStyle.Code.Width(dv.fullCodeWidth).Render(" …"), )) write("\n") break outer @@ -436,17 +437,25 @@ outer: isLastHunk := i+1 == len(dv.unified.Hunks) isLastLine := j+1 == len(h.lines) if hasReachedHeight && (!isLastHunk || !isLastLine) { + lineStyle := dv.style.MissingLine + if l.before != nil { + lineStyle = dv.lineStyleForType(l.before.Kind) + } if dv.lineNumbers { - write(dv.style.EqualLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(lineStyle.LineNumber.Render(pad("…", dv.beforeNumDigits))) } write(beforeFullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), + lineStyle.Code.Width(dv.fullCodeWidth).Render(" …"), )) + lineStyle = dv.style.MissingLine + if l.after != nil { + lineStyle = dv.lineStyleForType(l.after.Kind) + } if dv.lineNumbers { - write(dv.style.EqualLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(lineStyle.LineNumber.Render(pad("…", dv.afterNumDigits))) } write(afterFullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), + lineStyle.Code.Width(dv.fullCodeWidth).Render(" …"), )) write("\n") break outer @@ -573,3 +582,16 @@ func (dv *DiffView) hunkShownLines(h *udiff.Hunk) (before, after int) { } return } + +func (dv *DiffView) lineStyleForType(t udiff.OpKind) LineStyle { + switch t { + case udiff.Equal: + return dv.style.EqualLine + case udiff.Insert: + return dv.style.InsertLine + case udiff.Delete: + return dv.style.DeleteLine + default: + return dv.style.MissingLine + } +} diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden index bf3ca743fa08655692d08469b7751841592e66a3..b3ba3be7244f5fad01056fa0dd4de29dd2d93624 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden @@ -2,4 +2,4 @@   2     2      3  import (   3  import (    4  "fmt"   4  "fmt"  -  …  …   …  …  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden index 45e0f1271727e29e1f20898a1c1d431fe9bca073..b9fc1bf7e2f5c7f9d823a140b3df424289961fd7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  }  10  }   10    11     11  func getContent() string {  12  func getContent() string {  -  …  …   …  …  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden index 54207639856f930f4c629e1fcfcbfbdda5c7b691..13f4a0fd731ffdecef8125aeca7b8cb602a984f7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden @@ -11,4 +11,4 @@  10    11     11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -  …  …   …  …  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden index 14803d08c905475b4cd0146c363da33f85eb7979..6515d553ee9c3077bcf503e96fc6fbaad662bfd4 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden @@ -2,4 +2,4 @@   2     2      3  import (   3  import (    4  "fmt"   4  "fmt"  -  …  …   …  …  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden index fdb87616054a57763875bf5119b2c834391cdbeb..b0993db7fd6e53f144e07a3db91940ed0ef529c6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  }  10  }   10    11     11  func getContent() string {  12  func getContent() string {  -  …  …   …  …  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden index 7f71193ca70d6c3fe17a87a3d96ff8fe91f2adef..63caade9138ef74cf5abe6d9e85a97e1c7307519 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden @@ -11,4 +11,4 @@  10    11     11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -  …  …   …  …  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden index 769af9e0f214d92e24447a3a4efce6916cb8e25a..72f781ea7470a4e350ea3f228ea69c05f70849b7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden @@ -2,4 +2,4 @@   2   2      3   3  import (    4   4  "fmt"  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden index e3841b3152f9bb355db26223ce5e5afa8dd930b1..ee78391db24ffe6c5b275a832e9f1e3893cfb416 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  10  }   10  11     11  12  func getContent() string {  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden index 1c95c2530d5324b105d9674fca17b5c387410a0b..244d471c54f05cdae9f6dcb9e18adef79a6f851c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden @@ -11,4 +11,4 @@  10  11     11  12  func getContent() string {   12    -  return "Hello, world!"  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden index 4b40f3f5844a477be7c55bafbabc86a6d9c7cf04..bf521c4f3b194404905d6b104adcec0936b0436e 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden @@ -12,4 +12,4 @@  11  12  func getContent() string {   12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden index 50e179fe27212fc7bab77c96cf966daa0b070a14..f73f2e5107400bb11415c48d3b8446009f22373d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden @@ -2,4 +2,4 @@   2   2      3   3  import (    4   4  "fmt"  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden index 2cc1825ce79a03986a0e45f597a35dce309430e8..c3567a7095df72c0f74066c21f4c9e6d8e802aa9 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  10  }   10  11     11  12  func getContent() string {  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden index 261c703aca33987a9bb1312f859ff896cb9cb471..64b13049fd0568077bd8599adf666ff85924caf8 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden @@ -11,4 +11,4 @@  10  11     11  12  func getContent() string {   12    -  return "Hello, world!"  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden index 96c15aec6aabdf2d1e079d66f4e914ee31f15e18..1ae8e47ea0ecbf64d831a09f1822d06ffba75ed6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden @@ -12,4 +12,4 @@  11  12  func getContent() string {   12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden index 14803d08c905475b4cd0146c363da33f85eb7979..6515d553ee9c3077bcf503e96fc6fbaad662bfd4 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden @@ -2,4 +2,4 @@   2     2      3  import (   3  import (    4  "fmt"   4  "fmt"  -  …  …   …  …  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden index dec2d8cf37a8a022d73f705c6ef72323678f13ef..d34bf595e33b47b491d0f857aeb6b81390a2e5bf 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden @@ -2,4 +2,4 @@   9  }  10  }   10    11     11  func getContent() string {  12  func getContent() string {  -  …  …   …  …  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden index 90982b5c972b7a1529e56eec8143c8c78acf4739..3706e309d70f9d5f205759fa5cedddb3058340c2 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden @@ -2,4 +2,4 @@  10    11     11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -  …  …   …  …  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden index 50e179fe27212fc7bab77c96cf966daa0b070a14..f73f2e5107400bb11415c48d3b8446009f22373d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden @@ -2,4 +2,4 @@   2   2      3   3  import (    4   4  "fmt"  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden index 69f40b94f48670634a786c71d7451c03f3a3148c..afc8217aa8e375c16880a43ed5b336f91d156dc6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden @@ -2,4 +2,4 @@   9  10  }   10  11     11  12  func getContent() string {  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden index 1e21a2b99378c3412de7a0fabe81beab28aaeb92..f6ed57fa6d22a57330216a657572604fd1afca89 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden @@ -2,4 +2,4 @@  10  11     11  12  func getContent() string {   12    -  return "Hello, world!"  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden index e6998d09e18f4df9477b33510b22754ad32fc764..9703601b959a88c999b6d54320bf339eeab53c1d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden @@ -2,4 +2,4 @@  11  12  func getContent() string {   12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")  -  …   …  …  \ No newline at end of file +  …   …  …  \ No newline at end of file From c5bf83060e40b7cdc1d6cac2b2afe82506d7f3d3 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 11 Jun 2025 15:19:54 -0300 Subject: [PATCH 38/64] fix(diffview): do not print ellipsis after content has being fully printed --- internal/exp/diffview/diffview.go | 4 ++-- .../Split/DarkMode/HeightOf016.golden | 2 +- .../Split/DarkMode/HeightOf017.golden | 4 ++-- .../Split/DarkMode/HeightOf018.golden | 6 +++--- .../Split/DarkMode/HeightOf019.golden | 8 ++++---- .../Split/DarkMode/HeightOf020.golden | 10 +++++----- .../Split/LightMode/HeightOf016.golden | 2 +- .../Split/LightMode/HeightOf017.golden | 4 ++-- .../Split/LightMode/HeightOf018.golden | 6 +++--- .../Split/LightMode/HeightOf019.golden | 8 ++++---- .../Split/LightMode/HeightOf020.golden | 10 +++++----- .../TestDiffViewYOffset/Split/YOffsetOf11.golden | 2 +- .../TestDiffViewYOffset/Split/YOffsetOf12.golden | 4 ++-- .../TestDiffViewYOffset/Split/YOffsetOf13.golden | 6 +++--- .../TestDiffViewYOffset/Split/YOffsetOf14.golden | 8 ++++---- .../TestDiffViewYOffset/Split/YOffsetOf15.golden | 10 +++++----- .../TestDiffViewYOffset/Split/YOffsetOf16.golden | 10 +++++----- 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index f3801afb26f77a7285053369277be787c93e39f5..41212b340c1a94bb188c374d9b989e14c708875a 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -539,11 +539,11 @@ outer: for printedLines < dv.height { if dv.lineNumbers { - write(dv.style.MissingLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) } write(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) if dv.lineNumbers { - write(dv.style.MissingLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } write(dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) write("\n") diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden index a773ac9ffd45048eafdd50147ca73391c219cc7c..2e051d5ad88af68b4a75aaa726a0b637d6299004 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden @@ -13,4 +13,4 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    \ No newline at end of file +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden index 104d7dd7d64f4aa85c4581ac1ff88589c32c5d95..1e65410e215a0dae090d79b1e3a6347f46208b3d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden @@ -13,5 +13,5 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    \ No newline at end of file +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden index 23da4e0335e31eaa87fec338a4de3107e78af8ed..93474d6a026b69354dcc9d2363dcdc8b2ce18463 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden @@ -13,6 +13,6 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden index 2d6bded74cf72745a42cc0d15248cce161d13c86..6f6418350b12deea6338f19f238a131b7ec9441f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden @@ -13,7 +13,7 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden index 4b32f54e3b2481aa962eee1c3d77a4433a6e51c8..f3714069848e7c073c447f60e4aa3127d1dbdd53 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden @@ -13,8 +13,8 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden index 156e76239d826e3ba845a5a303633377d162e2e4..70ca3fc122c17259015d6614d3056292cc0bbe39 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden @@ -13,4 +13,4 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    \ No newline at end of file +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden index 355ffadc3f22216b2375b90f68c9b101860f2bba..c055ca2cbf739903fba0bccf0ded1e147b1751f7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden @@ -13,5 +13,5 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    \ No newline at end of file +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden index f525be8e890a98f9b9c655ff8d2c313359fd6e08..b512e1810c53da0a889edc95c4dde3c655f6c28c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden @@ -13,6 +13,6 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden index 7acc43329ce9815498e59409eef941ed040b78bd..2b209f23854f5db9107401558b06b60f588b3a49 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden @@ -13,7 +13,7 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden index 7af2554bf2992dde1d0af1f3f00c47294d9607ab..2ab516a4ab5957130c0e7274b001189d50b35a32 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden @@ -13,8 +13,8 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden index 3f363d0a7e59883fefba9c0c60c1231943821705..6d36f26029566dc85857299fd6054f1b8a338d1e 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden @@ -2,4 +2,4 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    \ No newline at end of file +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden index 1b44a42fcfba8d182ca9215beae5001fd623873f..43fb8d355221bd73fee2b27cd3b481eb6094c150 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden @@ -1,5 +1,5 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    \ No newline at end of file +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden index e835a66406d56409debab9bc4f9007decf81042c..8bef8d4e6a2713175f0d6242ef99a78fa5b195bc 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden @@ -1,5 +1,5 @@       14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden index 0bb5000165b4ef15dabc116aaf9e0195c215061d..eed5712fe427c783f84ebef0b16322459e3de751 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden @@ -1,5 +1,5 @@  13  }  15  }  -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden index a948b73aaf92cb90f712d625e8b2cc3078a5fa13..c989070ae313dcd1212208115acf3603671ceab6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden @@ -1,5 +1,5 @@ -  …     …    -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden index a948b73aaf92cb90f712d625e8b2cc3078a5fa13..c989070ae313dcd1212208115acf3603671ceab6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden @@ -1,5 +1,5 @@ -  …     …    -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           +           \ No newline at end of file From bac4f0ac1ad317586997bbf412e153900d411e8f Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 11 Jun 2025 15:44:08 -0300 Subject: [PATCH 39/64] fix(diffview): fix behavior of tabs and add tab width setting --- internal/exp/diffview/diffview.go | 18 ++++++++++++++++ internal/exp/diffview/diffview_test.go | 21 +++++++++++++++++++ .../testdata/TestDiffViewTabs/Split.golden | 15 +++++++++++++ .../testdata/TestDiffViewTabs/Unified.golden | 16 ++++++++++++++ internal/exp/diffview/testdata/TestTabs.after | 15 +++++++++++++ .../exp/diffview/testdata/TestTabs.before | 13 ++++++++++++ 6 files changed, 98 insertions(+) create mode 100644 internal/exp/diffview/testdata/TestDiffViewTabs/Split.golden create mode 100644 internal/exp/diffview/testdata/TestDiffViewTabs/Unified.golden create mode 100644 internal/exp/diffview/testdata/TestTabs.after create mode 100644 internal/exp/diffview/testdata/TestTabs.before diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 41212b340c1a94bb188c374d9b989e14c708875a..6d2947bca534eb2ccc8466d6483ed6e5d3d48fe8 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -42,6 +42,7 @@ type DiffView struct { xOffset int yOffset int style Style + tabWidth int isComputed bool err error @@ -63,6 +64,7 @@ func New() *DiffView { layout: layoutUnified, contextLines: udiff.DefaultContextLines, lineNumbers: true, + tabWidth: 8, } if lipgloss.HasDarkBackground(os.Stdin, os.Stdout) { dv.style = DefaultDarkStyle @@ -144,8 +146,16 @@ func (dv *DiffView) YOffset(yOffset int) *DiffView { return dv } +// TabWidth sets the tab width. Only relevant for code that contains tabs, like +// Go code. +func (dv *DiffView) TabWidth(tabWidth int) *DiffView { + dv.tabWidth = tabWidth + return dv +} + // String returns the string representation of the DiffView. func (dv *DiffView) String() string { + dv.replaceTabs() if err := dv.computeDiff(); err != nil { return err.Error() } @@ -177,6 +187,14 @@ func (dv *DiffView) String() string { } } +// replaceTabs replaces tabs in the before and after file contents with spaces +// according to the specified tab width. +func (dv *DiffView) replaceTabs() { + spaces := strings.Repeat(" ", dv.tabWidth) + dv.before.content = strings.ReplaceAll(dv.before.content, "\t", spaces) + dv.after.content = strings.ReplaceAll(dv.after.content, "\t", spaces) +} + // computeDiff computes the differences between the "before" and "after" files. func (dv *DiffView) computeDiff() error { if dv.isComputed { diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index d9f55892024ef4a9da00b0f5586e3f50135e27d9..4feb40a68c140d75a143ed37535573fb05d9fbdd 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -29,6 +29,12 @@ var TestNarrowBefore string //go:embed testdata/TestNarrow.after var TestNarrowAfter string +//go:embed testdata/TestTabs.before +var TestTabsBefore string + +//go:embed testdata/TestTabs.after +var TestTabsAfter string + type ( TestFunc func(dv *diffview.DiffView) *diffview.DiffView TestFuncs map[string]TestFunc @@ -137,6 +143,21 @@ func TestDiffView(t *testing.T) { } } +func TestDiffViewTabs(t *testing.T) { + for layoutName, layoutFunc := range LayoutFuncs { + t.Run(layoutName, func(t *testing.T) { + dv := diffview.New(). + Before("main.go", TestTabsBefore). + After("main.go", TestTabsAfter). + Style(diffview.DefaultLightStyle) + dv = layoutFunc(dv) + + output := dv.String() + golden.RequireEqual(t, []byte(output)) + }) + } +} + func TestDiffViewWidth(t *testing.T) { for layoutName, layoutFunc := range LayoutFuncs { t.Run(layoutName, func(t *testing.T) { diff --git a/internal/exp/diffview/testdata/TestDiffViewTabs/Split.golden b/internal/exp/diffview/testdata/TestDiffViewTabs/Split.golden new file mode 100644 index 0000000000000000000000000000000000000000..47ec287f0894851ff20b75d5f267e9733e30b497 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewTabs/Split.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewTabs/Unified.golden b/internal/exp/diffview/testdata/TestDiffViewTabs/Unified.golden new file mode 100644 index 0000000000000000000000000000000000000000..1f71e8a1bfad8219360784d1ef2893d2a86f3b41 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffViewTabs/Unified.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestTabs.after b/internal/exp/diffview/testdata/TestTabs.after new file mode 100644 index 0000000000000000000000000000000000000000..26b88f61224561d442b23473ce6b9daaf761aee9 --- /dev/null +++ b/internal/exp/diffview/testdata/TestTabs.after @@ -0,0 +1,15 @@ +package main + +import ( + "fmt" + "strings" +) + +func main() { + fmt.Println(getContent()) +} + +func getContent() string { + content := strings.ToUpper("Hello, World!") + return content +} diff --git a/internal/exp/diffview/testdata/TestTabs.before b/internal/exp/diffview/testdata/TestTabs.before new file mode 100644 index 0000000000000000000000000000000000000000..72d7ebc2699bfd859311b85e3193e6c87013672f --- /dev/null +++ b/internal/exp/diffview/testdata/TestTabs.before @@ -0,0 +1,13 @@ +package main + +import ( + "fmt" +) + +func main() { + fmt.Println(getContent()) +} + +func getContent() string { + return "Hello, world!" +} From cd52b53dbbc0b4072b9e7b936a9d1e80645d0712 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 11 Jun 2025 15:48:27 -0300 Subject: [PATCH 40/64] refactor(diffview): reduce number of golden files No need to generate light and dark themes for all tests. --- internal/exp/diffview/diffview_test.go | 60 ++++++++----------- .../Split/DarkMode/HeightOf001.golden | 1 - .../Split/DarkMode/HeightOf002.golden | 2 - .../Split/DarkMode/HeightOf003.golden | 3 - .../Split/DarkMode/HeightOf004.golden | 4 -- .../Split/DarkMode/HeightOf005.golden | 5 -- .../Split/DarkMode/HeightOf006.golden | 6 -- .../Split/DarkMode/HeightOf007.golden | 7 --- .../Split/DarkMode/HeightOf008.golden | 8 --- .../Split/DarkMode/HeightOf009.golden | 9 --- .../Split/DarkMode/HeightOf010.golden | 10 ---- .../Split/DarkMode/HeightOf011.golden | 11 ---- .../Split/DarkMode/HeightOf012.golden | 12 ---- .../Split/DarkMode/HeightOf013.golden | 13 ---- .../Split/DarkMode/HeightOf014.golden | 14 ----- .../Split/DarkMode/HeightOf015.golden | 15 ----- .../Split/DarkMode/HeightOf016.golden | 16 ----- .../Split/DarkMode/HeightOf017.golden | 17 ------ .../Split/DarkMode/HeightOf018.golden | 18 ------ .../Split/DarkMode/HeightOf019.golden | 19 ------ .../Split/DarkMode/HeightOf020.golden | 20 ------- .../Split/{LightMode => }/HeightOf001.golden | 0 .../Split/{LightMode => }/HeightOf002.golden | 0 .../Split/{LightMode => }/HeightOf003.golden | 0 .../Split/{LightMode => }/HeightOf004.golden | 0 .../Split/{LightMode => }/HeightOf005.golden | 0 .../Split/{LightMode => }/HeightOf006.golden | 0 .../Split/{LightMode => }/HeightOf007.golden | 0 .../Split/{LightMode => }/HeightOf008.golden | 0 .../Split/{LightMode => }/HeightOf009.golden | 0 .../Split/{LightMode => }/HeightOf010.golden | 0 .../Split/{LightMode => }/HeightOf011.golden | 0 .../Split/{LightMode => }/HeightOf012.golden | 0 .../Split/{LightMode => }/HeightOf013.golden | 0 .../Split/{LightMode => }/HeightOf014.golden | 0 .../Split/{LightMode => }/HeightOf015.golden | 0 .../Split/{LightMode => }/HeightOf016.golden | 0 .../Split/{LightMode => }/HeightOf017.golden | 0 .../Split/{LightMode => }/HeightOf018.golden | 0 .../Split/{LightMode => }/HeightOf019.golden | 0 .../Split/{LightMode => }/HeightOf020.golden | 0 .../Unified/DarkMode/HeightOf001.golden | 1 - .../Unified/DarkMode/HeightOf002.golden | 2 - .../Unified/DarkMode/HeightOf003.golden | 3 - .../Unified/DarkMode/HeightOf004.golden | 4 -- .../Unified/DarkMode/HeightOf005.golden | 5 -- .../Unified/DarkMode/HeightOf006.golden | 6 -- .../Unified/DarkMode/HeightOf007.golden | 7 --- .../Unified/DarkMode/HeightOf008.golden | 8 --- .../Unified/DarkMode/HeightOf009.golden | 9 --- .../Unified/DarkMode/HeightOf010.golden | 10 ---- .../Unified/DarkMode/HeightOf011.golden | 11 ---- .../Unified/DarkMode/HeightOf012.golden | 12 ---- .../Unified/DarkMode/HeightOf013.golden | 13 ---- .../Unified/DarkMode/HeightOf014.golden | 14 ----- .../Unified/DarkMode/HeightOf015.golden | 15 ----- .../Unified/DarkMode/HeightOf016.golden | 16 ----- .../Unified/DarkMode/HeightOf017.golden | 17 ------ .../Unified/DarkMode/HeightOf018.golden | 18 ------ .../Unified/DarkMode/HeightOf019.golden | 19 ------ .../Unified/DarkMode/HeightOf020.golden | 20 ------- .../{LightMode => }/HeightOf001.golden | 0 .../{LightMode => }/HeightOf002.golden | 0 .../{LightMode => }/HeightOf003.golden | 0 .../{LightMode => }/HeightOf004.golden | 0 .../{LightMode => }/HeightOf005.golden | 0 .../{LightMode => }/HeightOf006.golden | 0 .../{LightMode => }/HeightOf007.golden | 0 .../{LightMode => }/HeightOf008.golden | 0 .../{LightMode => }/HeightOf009.golden | 0 .../{LightMode => }/HeightOf010.golden | 0 .../{LightMode => }/HeightOf011.golden | 0 .../{LightMode => }/HeightOf012.golden | 0 .../{LightMode => }/HeightOf013.golden | 0 .../{LightMode => }/HeightOf014.golden | 0 .../{LightMode => }/HeightOf015.golden | 0 .../{LightMode => }/HeightOf016.golden | 0 .../{LightMode => }/HeightOf017.golden | 0 .../{LightMode => }/HeightOf018.golden | 0 .../{LightMode => }/HeightOf019.golden | 0 .../{LightMode => }/HeightOf020.golden | 0 .../Split/DarkMode/WidthOf001.golden | 15 ----- .../Split/DarkMode/WidthOf002.golden | 15 ----- .../Split/DarkMode/WidthOf003.golden | 15 ----- .../Split/DarkMode/WidthOf004.golden | 15 ----- .../Split/DarkMode/WidthOf005.golden | 15 ----- .../Split/DarkMode/WidthOf006.golden | 15 ----- .../Split/DarkMode/WidthOf007.golden | 15 ----- .../Split/DarkMode/WidthOf008.golden | 15 ----- .../Split/DarkMode/WidthOf009.golden | 15 ----- .../Split/DarkMode/WidthOf010.golden | 15 ----- .../Split/DarkMode/WidthOf011.golden | 15 ----- .../Split/DarkMode/WidthOf012.golden | 15 ----- .../Split/DarkMode/WidthOf013.golden | 15 ----- .../Split/DarkMode/WidthOf014.golden | 15 ----- .../Split/DarkMode/WidthOf015.golden | 15 ----- .../Split/DarkMode/WidthOf016.golden | 15 ----- .../Split/DarkMode/WidthOf017.golden | 15 ----- .../Split/DarkMode/WidthOf018.golden | 15 ----- .../Split/DarkMode/WidthOf019.golden | 15 ----- .../Split/DarkMode/WidthOf020.golden | 15 ----- .../Split/DarkMode/WidthOf021.golden | 15 ----- .../Split/DarkMode/WidthOf022.golden | 15 ----- .../Split/DarkMode/WidthOf023.golden | 15 ----- .../Split/DarkMode/WidthOf024.golden | 15 ----- .../Split/DarkMode/WidthOf025.golden | 15 ----- .../Split/DarkMode/WidthOf026.golden | 15 ----- .../Split/DarkMode/WidthOf027.golden | 15 ----- .../Split/DarkMode/WidthOf028.golden | 15 ----- .../Split/DarkMode/WidthOf029.golden | 15 ----- .../Split/DarkMode/WidthOf030.golden | 15 ----- .../Split/DarkMode/WidthOf031.golden | 15 ----- .../Split/DarkMode/WidthOf032.golden | 15 ----- .../Split/DarkMode/WidthOf033.golden | 15 ----- .../Split/DarkMode/WidthOf034.golden | 15 ----- .../Split/DarkMode/WidthOf035.golden | 15 ----- .../Split/DarkMode/WidthOf036.golden | 15 ----- .../Split/DarkMode/WidthOf037.golden | 15 ----- .../Split/DarkMode/WidthOf038.golden | 15 ----- .../Split/DarkMode/WidthOf039.golden | 15 ----- .../Split/DarkMode/WidthOf040.golden | 15 ----- .../Split/DarkMode/WidthOf041.golden | 15 ----- .../Split/DarkMode/WidthOf042.golden | 15 ----- .../Split/DarkMode/WidthOf043.golden | 15 ----- .../Split/DarkMode/WidthOf044.golden | 15 ----- .../Split/DarkMode/WidthOf045.golden | 15 ----- .../Split/DarkMode/WidthOf046.golden | 15 ----- .../Split/DarkMode/WidthOf047.golden | 15 ----- .../Split/DarkMode/WidthOf048.golden | 15 ----- .../Split/DarkMode/WidthOf049.golden | 15 ----- .../Split/DarkMode/WidthOf050.golden | 15 ----- .../Split/DarkMode/WidthOf051.golden | 15 ----- .../Split/DarkMode/WidthOf052.golden | 15 ----- .../Split/DarkMode/WidthOf053.golden | 15 ----- .../Split/DarkMode/WidthOf054.golden | 15 ----- .../Split/DarkMode/WidthOf055.golden | 15 ----- .../Split/DarkMode/WidthOf056.golden | 15 ----- .../Split/DarkMode/WidthOf057.golden | 15 ----- .../Split/DarkMode/WidthOf058.golden | 15 ----- .../Split/DarkMode/WidthOf059.golden | 15 ----- .../Split/DarkMode/WidthOf060.golden | 15 ----- .../Split/DarkMode/WidthOf061.golden | 15 ----- .../Split/DarkMode/WidthOf062.golden | 15 ----- .../Split/DarkMode/WidthOf063.golden | 15 ----- .../Split/DarkMode/WidthOf064.golden | 15 ----- .../Split/DarkMode/WidthOf065.golden | 15 ----- .../Split/DarkMode/WidthOf066.golden | 15 ----- .../Split/DarkMode/WidthOf067.golden | 15 ----- .../Split/DarkMode/WidthOf068.golden | 15 ----- .../Split/DarkMode/WidthOf069.golden | 15 ----- .../Split/DarkMode/WidthOf070.golden | 15 ----- .../Split/DarkMode/WidthOf071.golden | 15 ----- .../Split/DarkMode/WidthOf072.golden | 15 ----- .../Split/DarkMode/WidthOf073.golden | 15 ----- .../Split/DarkMode/WidthOf074.golden | 15 ----- .../Split/DarkMode/WidthOf075.golden | 15 ----- .../Split/DarkMode/WidthOf076.golden | 15 ----- .../Split/DarkMode/WidthOf077.golden | 15 ----- .../Split/DarkMode/WidthOf078.golden | 15 ----- .../Split/DarkMode/WidthOf079.golden | 15 ----- .../Split/DarkMode/WidthOf080.golden | 15 ----- .../Split/DarkMode/WidthOf081.golden | 15 ----- .../Split/DarkMode/WidthOf082.golden | 15 ----- .../Split/DarkMode/WidthOf083.golden | 15 ----- .../Split/DarkMode/WidthOf084.golden | 15 ----- .../Split/DarkMode/WidthOf085.golden | 15 ----- .../Split/DarkMode/WidthOf086.golden | 15 ----- .../Split/DarkMode/WidthOf087.golden | 15 ----- .../Split/DarkMode/WidthOf088.golden | 15 ----- .../Split/DarkMode/WidthOf089.golden | 15 ----- .../Split/DarkMode/WidthOf090.golden | 15 ----- .../Split/DarkMode/WidthOf091.golden | 15 ----- .../Split/DarkMode/WidthOf092.golden | 15 ----- .../Split/DarkMode/WidthOf093.golden | 15 ----- .../Split/DarkMode/WidthOf094.golden | 15 ----- .../Split/DarkMode/WidthOf095.golden | 15 ----- .../Split/DarkMode/WidthOf096.golden | 15 ----- .../Split/DarkMode/WidthOf097.golden | 15 ----- .../Split/DarkMode/WidthOf098.golden | 15 ----- .../Split/DarkMode/WidthOf099.golden | 15 ----- .../Split/DarkMode/WidthOf100.golden | 15 ----- .../Split/DarkMode/WidthOf101.golden | 15 ----- .../Split/DarkMode/WidthOf102.golden | 15 ----- .../Split/DarkMode/WidthOf103.golden | 15 ----- .../Split/DarkMode/WidthOf104.golden | 15 ----- .../Split/DarkMode/WidthOf105.golden | 15 ----- .../Split/DarkMode/WidthOf106.golden | 15 ----- .../Split/DarkMode/WidthOf107.golden | 15 ----- .../Split/DarkMode/WidthOf108.golden | 15 ----- .../Split/DarkMode/WidthOf109.golden | 15 ----- .../Split/DarkMode/WidthOf110.golden | 15 ----- .../Split/{LightMode => }/WidthOf001.golden | 0 .../Split/{LightMode => }/WidthOf002.golden | 0 .../Split/{LightMode => }/WidthOf003.golden | 0 .../Split/{LightMode => }/WidthOf004.golden | 0 .../Split/{LightMode => }/WidthOf005.golden | 0 .../Split/{LightMode => }/WidthOf006.golden | 0 .../Split/{LightMode => }/WidthOf007.golden | 0 .../Split/{LightMode => }/WidthOf008.golden | 0 .../Split/{LightMode => }/WidthOf009.golden | 0 .../Split/{LightMode => }/WidthOf010.golden | 0 .../Split/{LightMode => }/WidthOf011.golden | 0 .../Split/{LightMode => }/WidthOf012.golden | 0 .../Split/{LightMode => }/WidthOf013.golden | 0 .../Split/{LightMode => }/WidthOf014.golden | 0 .../Split/{LightMode => }/WidthOf015.golden | 0 .../Split/{LightMode => }/WidthOf016.golden | 0 .../Split/{LightMode => }/WidthOf017.golden | 0 .../Split/{LightMode => }/WidthOf018.golden | 0 .../Split/{LightMode => }/WidthOf019.golden | 0 .../Split/{LightMode => }/WidthOf020.golden | 0 .../Split/{LightMode => }/WidthOf021.golden | 0 .../Split/{LightMode => }/WidthOf022.golden | 0 .../Split/{LightMode => }/WidthOf023.golden | 0 .../Split/{LightMode => }/WidthOf024.golden | 0 .../Split/{LightMode => }/WidthOf025.golden | 0 .../Split/{LightMode => }/WidthOf026.golden | 0 .../Split/{LightMode => }/WidthOf027.golden | 0 .../Split/{LightMode => }/WidthOf028.golden | 0 .../Split/{LightMode => }/WidthOf029.golden | 0 .../Split/{LightMode => }/WidthOf030.golden | 0 .../Split/{LightMode => }/WidthOf031.golden | 0 .../Split/{LightMode => }/WidthOf032.golden | 0 .../Split/{LightMode => }/WidthOf033.golden | 0 .../Split/{LightMode => }/WidthOf034.golden | 0 .../Split/{LightMode => }/WidthOf035.golden | 0 .../Split/{LightMode => }/WidthOf036.golden | 0 .../Split/{LightMode => }/WidthOf037.golden | 0 .../Split/{LightMode => }/WidthOf038.golden | 0 .../Split/{LightMode => }/WidthOf039.golden | 0 .../Split/{LightMode => }/WidthOf040.golden | 0 .../Split/{LightMode => }/WidthOf041.golden | 0 .../Split/{LightMode => }/WidthOf042.golden | 0 .../Split/{LightMode => }/WidthOf043.golden | 0 .../Split/{LightMode => }/WidthOf044.golden | 0 .../Split/{LightMode => }/WidthOf045.golden | 0 .../Split/{LightMode => }/WidthOf046.golden | 0 .../Split/{LightMode => }/WidthOf047.golden | 0 .../Split/{LightMode => }/WidthOf048.golden | 0 .../Split/{LightMode => }/WidthOf049.golden | 0 .../Split/{LightMode => }/WidthOf050.golden | 0 .../Split/{LightMode => }/WidthOf051.golden | 0 .../Split/{LightMode => }/WidthOf052.golden | 0 .../Split/{LightMode => }/WidthOf053.golden | 0 .../Split/{LightMode => }/WidthOf054.golden | 0 .../Split/{LightMode => }/WidthOf055.golden | 0 .../Split/{LightMode => }/WidthOf056.golden | 0 .../Split/{LightMode => }/WidthOf057.golden | 0 .../Split/{LightMode => }/WidthOf058.golden | 0 .../Split/{LightMode => }/WidthOf059.golden | 0 .../Split/{LightMode => }/WidthOf060.golden | 0 .../Split/{LightMode => }/WidthOf061.golden | 0 .../Split/{LightMode => }/WidthOf062.golden | 0 .../Split/{LightMode => }/WidthOf063.golden | 0 .../Split/{LightMode => }/WidthOf064.golden | 0 .../Split/{LightMode => }/WidthOf065.golden | 0 .../Split/{LightMode => }/WidthOf066.golden | 0 .../Split/{LightMode => }/WidthOf067.golden | 0 .../Split/{LightMode => }/WidthOf068.golden | 0 .../Split/{LightMode => }/WidthOf069.golden | 0 .../Split/{LightMode => }/WidthOf070.golden | 0 .../Split/{LightMode => }/WidthOf071.golden | 0 .../Split/{LightMode => }/WidthOf072.golden | 0 .../Split/{LightMode => }/WidthOf073.golden | 0 .../Split/{LightMode => }/WidthOf074.golden | 0 .../Split/{LightMode => }/WidthOf075.golden | 0 .../Split/{LightMode => }/WidthOf076.golden | 0 .../Split/{LightMode => }/WidthOf077.golden | 0 .../Split/{LightMode => }/WidthOf078.golden | 0 .../Split/{LightMode => }/WidthOf079.golden | 0 .../Split/{LightMode => }/WidthOf080.golden | 0 .../Split/{LightMode => }/WidthOf081.golden | 0 .../Split/{LightMode => }/WidthOf082.golden | 0 .../Split/{LightMode => }/WidthOf083.golden | 0 .../Split/{LightMode => }/WidthOf084.golden | 0 .../Split/{LightMode => }/WidthOf085.golden | 0 .../Split/{LightMode => }/WidthOf086.golden | 0 .../Split/{LightMode => }/WidthOf087.golden | 0 .../Split/{LightMode => }/WidthOf088.golden | 0 .../Split/{LightMode => }/WidthOf089.golden | 0 .../Split/{LightMode => }/WidthOf090.golden | 0 .../Split/{LightMode => }/WidthOf091.golden | 0 .../Split/{LightMode => }/WidthOf092.golden | 0 .../Split/{LightMode => }/WidthOf093.golden | 0 .../Split/{LightMode => }/WidthOf094.golden | 0 .../Split/{LightMode => }/WidthOf095.golden | 0 .../Split/{LightMode => }/WidthOf096.golden | 0 .../Split/{LightMode => }/WidthOf097.golden | 0 .../Split/{LightMode => }/WidthOf098.golden | 0 .../Split/{LightMode => }/WidthOf099.golden | 0 .../Split/{LightMode => }/WidthOf100.golden | 0 .../Split/{LightMode => }/WidthOf101.golden | 0 .../Split/{LightMode => }/WidthOf102.golden | 0 .../Split/{LightMode => }/WidthOf103.golden | 0 .../Split/{LightMode => }/WidthOf104.golden | 0 .../Split/{LightMode => }/WidthOf105.golden | 0 .../Split/{LightMode => }/WidthOf106.golden | 0 .../Split/{LightMode => }/WidthOf107.golden | 0 .../Split/{LightMode => }/WidthOf108.golden | 0 .../Split/{LightMode => }/WidthOf109.golden | 0 .../Split/{LightMode => }/WidthOf110.golden | 0 .../Unified/DarkMode/WidthOf001.golden | 16 ----- .../Unified/DarkMode/WidthOf002.golden | 16 ----- .../Unified/DarkMode/WidthOf003.golden | 16 ----- .../Unified/DarkMode/WidthOf004.golden | 16 ----- .../Unified/DarkMode/WidthOf005.golden | 16 ----- .../Unified/DarkMode/WidthOf006.golden | 16 ----- .../Unified/DarkMode/WidthOf007.golden | 16 ----- .../Unified/DarkMode/WidthOf008.golden | 16 ----- .../Unified/DarkMode/WidthOf009.golden | 16 ----- .../Unified/DarkMode/WidthOf010.golden | 16 ----- .../Unified/DarkMode/WidthOf011.golden | 16 ----- .../Unified/DarkMode/WidthOf012.golden | 16 ----- .../Unified/DarkMode/WidthOf013.golden | 16 ----- .../Unified/DarkMode/WidthOf014.golden | 16 ----- .../Unified/DarkMode/WidthOf015.golden | 16 ----- .../Unified/DarkMode/WidthOf016.golden | 16 ----- .../Unified/DarkMode/WidthOf017.golden | 16 ----- .../Unified/DarkMode/WidthOf018.golden | 16 ----- .../Unified/DarkMode/WidthOf019.golden | 16 ----- .../Unified/DarkMode/WidthOf020.golden | 16 ----- .../Unified/DarkMode/WidthOf021.golden | 16 ----- .../Unified/DarkMode/WidthOf022.golden | 16 ----- .../Unified/DarkMode/WidthOf023.golden | 16 ----- .../Unified/DarkMode/WidthOf024.golden | 16 ----- .../Unified/DarkMode/WidthOf025.golden | 16 ----- .../Unified/DarkMode/WidthOf026.golden | 16 ----- .../Unified/DarkMode/WidthOf027.golden | 16 ----- .../Unified/DarkMode/WidthOf028.golden | 16 ----- .../Unified/DarkMode/WidthOf029.golden | 16 ----- .../Unified/DarkMode/WidthOf030.golden | 16 ----- .../Unified/DarkMode/WidthOf031.golden | 16 ----- .../Unified/DarkMode/WidthOf032.golden | 16 ----- .../Unified/DarkMode/WidthOf033.golden | 16 ----- .../Unified/DarkMode/WidthOf034.golden | 16 ----- .../Unified/DarkMode/WidthOf035.golden | 16 ----- .../Unified/DarkMode/WidthOf036.golden | 16 ----- .../Unified/DarkMode/WidthOf037.golden | 16 ----- .../Unified/DarkMode/WidthOf038.golden | 16 ----- .../Unified/DarkMode/WidthOf039.golden | 16 ----- .../Unified/DarkMode/WidthOf040.golden | 16 ----- .../Unified/DarkMode/WidthOf041.golden | 16 ----- .../Unified/DarkMode/WidthOf042.golden | 16 ----- .../Unified/DarkMode/WidthOf043.golden | 16 ----- .../Unified/DarkMode/WidthOf044.golden | 16 ----- .../Unified/DarkMode/WidthOf045.golden | 16 ----- .../Unified/DarkMode/WidthOf046.golden | 16 ----- .../Unified/DarkMode/WidthOf047.golden | 16 ----- .../Unified/DarkMode/WidthOf048.golden | 16 ----- .../Unified/DarkMode/WidthOf049.golden | 16 ----- .../Unified/DarkMode/WidthOf050.golden | 16 ----- .../Unified/DarkMode/WidthOf051.golden | 16 ----- .../Unified/DarkMode/WidthOf052.golden | 16 ----- .../Unified/DarkMode/WidthOf053.golden | 16 ----- .../Unified/DarkMode/WidthOf054.golden | 16 ----- .../Unified/DarkMode/WidthOf055.golden | 16 ----- .../Unified/DarkMode/WidthOf056.golden | 16 ----- .../Unified/DarkMode/WidthOf057.golden | 16 ----- .../Unified/DarkMode/WidthOf058.golden | 16 ----- .../Unified/DarkMode/WidthOf059.golden | 16 ----- .../Unified/DarkMode/WidthOf060.golden | 16 ----- .../Unified/{LightMode => }/WidthOf001.golden | 0 .../Unified/{LightMode => }/WidthOf002.golden | 0 .../Unified/{LightMode => }/WidthOf003.golden | 0 .../Unified/{LightMode => }/WidthOf004.golden | 0 .../Unified/{LightMode => }/WidthOf005.golden | 0 .../Unified/{LightMode => }/WidthOf006.golden | 0 .../Unified/{LightMode => }/WidthOf007.golden | 0 .../Unified/{LightMode => }/WidthOf008.golden | 0 .../Unified/{LightMode => }/WidthOf009.golden | 0 .../Unified/{LightMode => }/WidthOf010.golden | 0 .../Unified/{LightMode => }/WidthOf011.golden | 0 .../Unified/{LightMode => }/WidthOf012.golden | 0 .../Unified/{LightMode => }/WidthOf013.golden | 0 .../Unified/{LightMode => }/WidthOf014.golden | 0 .../Unified/{LightMode => }/WidthOf015.golden | 0 .../Unified/{LightMode => }/WidthOf016.golden | 0 .../Unified/{LightMode => }/WidthOf017.golden | 0 .../Unified/{LightMode => }/WidthOf018.golden | 0 .../Unified/{LightMode => }/WidthOf019.golden | 0 .../Unified/{LightMode => }/WidthOf020.golden | 0 .../Unified/{LightMode => }/WidthOf021.golden | 0 .../Unified/{LightMode => }/WidthOf022.golden | 0 .../Unified/{LightMode => }/WidthOf023.golden | 0 .../Unified/{LightMode => }/WidthOf024.golden | 0 .../Unified/{LightMode => }/WidthOf025.golden | 0 .../Unified/{LightMode => }/WidthOf026.golden | 0 .../Unified/{LightMode => }/WidthOf027.golden | 0 .../Unified/{LightMode => }/WidthOf028.golden | 0 .../Unified/{LightMode => }/WidthOf029.golden | 0 .../Unified/{LightMode => }/WidthOf030.golden | 0 .../Unified/{LightMode => }/WidthOf031.golden | 0 .../Unified/{LightMode => }/WidthOf032.golden | 0 .../Unified/{LightMode => }/WidthOf033.golden | 0 .../Unified/{LightMode => }/WidthOf034.golden | 0 .../Unified/{LightMode => }/WidthOf035.golden | 0 .../Unified/{LightMode => }/WidthOf036.golden | 0 .../Unified/{LightMode => }/WidthOf037.golden | 0 .../Unified/{LightMode => }/WidthOf038.golden | 0 .../Unified/{LightMode => }/WidthOf039.golden | 0 .../Unified/{LightMode => }/WidthOf040.golden | 0 .../Unified/{LightMode => }/WidthOf041.golden | 0 .../Unified/{LightMode => }/WidthOf042.golden | 0 .../Unified/{LightMode => }/WidthOf043.golden | 0 .../Unified/{LightMode => }/WidthOf044.golden | 0 .../Unified/{LightMode => }/WidthOf045.golden | 0 .../Unified/{LightMode => }/WidthOf046.golden | 0 .../Unified/{LightMode => }/WidthOf047.golden | 0 .../Unified/{LightMode => }/WidthOf048.golden | 0 .../Unified/{LightMode => }/WidthOf049.golden | 0 .../Unified/{LightMode => }/WidthOf050.golden | 0 .../Unified/{LightMode => }/WidthOf051.golden | 0 .../Unified/{LightMode => }/WidthOf052.golden | 0 .../Unified/{LightMode => }/WidthOf053.golden | 0 .../Unified/{LightMode => }/WidthOf054.golden | 0 .../Unified/{LightMode => }/WidthOf055.golden | 0 .../Unified/{LightMode => }/WidthOf056.golden | 0 .../Unified/{LightMode => }/WidthOf057.golden | 0 .../Unified/{LightMode => }/WidthOf058.golden | 0 .../Unified/{LightMode => }/WidthOf059.golden | 0 .../Unified/{LightMode => }/WidthOf060.golden | 0 421 files changed, 26 insertions(+), 3064 deletions(-) delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf001.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf009.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf015.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf001.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf002.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf003.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf004.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf005.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf006.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf007.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf008.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf009.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf010.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf011.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf012.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf013.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf014.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf015.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf016.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf017.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf018.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf019.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Split/{LightMode => }/HeightOf020.golden (100%) delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf001.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf009.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf016.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf017.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf018.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf019.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf020.golden rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf001.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf002.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf003.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf004.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf005.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf006.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf007.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf008.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf009.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf010.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf011.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf012.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf013.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf014.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf015.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf016.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf017.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf018.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf019.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewHeight/Unified/{LightMode => }/HeightOf020.golden (100%) delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf001.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf002.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf003.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf004.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf005.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf006.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf007.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf008.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf011.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf012.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf013.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf014.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf015.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf016.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf017.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf018.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf019.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf020.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf021.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf022.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf023.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf024.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf025.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf026.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf027.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf028.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf029.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf030.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf031.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf032.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf033.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf034.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf035.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf036.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf037.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf038.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf039.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf040.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf041.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf042.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf043.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf044.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf045.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf046.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf047.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf048.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf049.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf050.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf051.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf052.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf053.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf054.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf055.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf056.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf057.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf058.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf059.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf060.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf061.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf062.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf063.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf064.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf065.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf066.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf067.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf068.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf069.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf070.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf071.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf072.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf073.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf074.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf075.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf076.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf077.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf078.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf079.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf080.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf081.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf082.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf083.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf084.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf085.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf086.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf087.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf088.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf089.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf090.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf091.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf092.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf093.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf094.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf095.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf096.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf097.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf098.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf099.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf100.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf101.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf102.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf103.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf104.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf105.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf106.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf107.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf108.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf109.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf110.golden rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf001.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf002.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf003.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf004.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf005.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf006.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf007.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf008.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf009.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf010.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf011.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf012.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf013.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf014.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf015.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf016.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf017.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf018.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf019.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf020.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf021.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf022.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf023.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf024.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf025.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf026.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf027.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf028.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf029.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf030.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf031.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf032.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf033.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf034.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf035.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf036.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf037.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf038.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf039.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf040.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf041.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf042.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf043.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf044.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf045.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf046.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf047.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf048.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf049.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf050.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf051.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf052.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf053.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf054.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf055.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf056.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf057.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf058.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf059.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf060.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf061.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf062.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf063.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf064.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf065.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf066.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf067.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf068.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf069.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf070.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf071.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf072.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf073.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf074.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf075.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf076.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf077.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf078.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf079.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf080.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf081.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf082.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf083.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf084.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf085.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf086.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf087.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf088.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf089.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf090.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf091.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf092.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf093.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf094.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf095.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf096.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf097.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf098.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf099.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf100.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf101.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf102.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf103.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf104.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf105.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf106.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf107.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf108.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf109.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Split/{LightMode => }/WidthOf110.golden (100%) delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf001.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf002.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf003.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf004.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf005.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf006.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf007.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf008.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf009.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf010.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf011.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf012.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf013.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf014.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf015.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf016.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf017.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf018.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf019.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf020.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf021.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf022.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf023.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf024.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf025.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf026.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf027.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf028.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf029.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf030.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf031.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf032.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf033.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf034.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf035.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf036.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf037.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf038.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf039.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf040.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf041.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf042.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf043.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf044.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf045.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf046.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf047.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf048.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf049.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf050.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf051.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf052.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf053.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf054.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf055.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf056.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf057.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf058.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf059.golden delete mode 100644 internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf060.golden rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf001.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf002.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf003.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf004.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf005.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf006.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf007.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf008.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf009.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf010.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf011.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf012.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf013.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf014.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf015.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf016.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf017.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf018.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf019.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf020.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf021.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf022.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf023.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf024.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf025.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf026.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf027.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf028.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf029.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf030.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf031.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf032.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf033.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf034.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf035.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf036.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf037.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf038.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf039.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf040.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf041.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf042.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf043.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf044.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf045.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf046.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf047.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf048.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf049.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf050.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf051.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf052.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf053.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf054.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf055.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf056.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf057.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf058.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf059.golden (100%) rename internal/exp/diffview/testdata/TestDiffViewWidth/Unified/{LightMode => }/WidthOf060.golden (100%) diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index 4feb40a68c140d75a143ed37535573fb05d9fbdd..4e2e68fa962c089d3ecfd7b83d64fdd8cb893eea 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -161,27 +161,23 @@ func TestDiffViewTabs(t *testing.T) { func TestDiffViewWidth(t *testing.T) { for layoutName, layoutFunc := range LayoutFuncs { t.Run(layoutName, func(t *testing.T) { - for themeName, themeFunc := range ThemeFuncs { - t.Run(themeName, func(t *testing.T) { - for width := 1; width <= 110; width++ { - if layoutName == "Unified" && width > 60 { - continue - } - - t.Run(fmt.Sprintf("WidthOf%03d", width), func(t *testing.T) { - dv := diffview.New(). - Before("main.go", TestMultipleHunksBefore). - After("main.go", TestMultipleHunksAfter). - Width(width) - dv = layoutFunc(dv) - dv = themeFunc(dv) + for width := 1; width <= 110; width++ { + if layoutName == "Unified" && width > 60 { + continue + } - output := dv.String() - golden.RequireEqual(t, []byte(output)) + t.Run(fmt.Sprintf("WidthOf%03d", width), func(t *testing.T) { + dv := diffview.New(). + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter). + Width(width). + Style(diffview.DefaultLightStyle) + dv = layoutFunc(dv) - assertLineWidth(t, width, output) - }) - } + output := dv.String() + golden.RequireEqual(t, []byte(output)) + + assertLineWidth(t, width, output) }) } }) @@ -191,23 +187,19 @@ func TestDiffViewWidth(t *testing.T) { func TestDiffViewHeight(t *testing.T) { for layoutName, layoutFunc := range LayoutFuncs { t.Run(layoutName, func(t *testing.T) { - for themeName, themeFunc := range ThemeFuncs { - t.Run(themeName, func(t *testing.T) { - for height := 1; height <= 20; height++ { - t.Run(fmt.Sprintf("HeightOf%03d", height), func(t *testing.T) { - dv := diffview.New(). - Before("main.go", TestMultipleHunksBefore). - After("main.go", TestMultipleHunksAfter). - Height(height) - dv = layoutFunc(dv) - dv = themeFunc(dv) + for height := 1; height <= 20; height++ { + t.Run(fmt.Sprintf("HeightOf%03d", height), func(t *testing.T) { + dv := diffview.New(). + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter). + Height(height). + Style(diffview.DefaultLightStyle) + dv = layoutFunc(dv) - output := dv.String() - golden.RequireEqual(t, []byte(output)) + output := dv.String() + golden.RequireEqual(t, []byte(output)) - assertHeight(t, height, output) - }) - } + assertHeight(t, height, output) }) } }) diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf001.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf001.golden deleted file mode 100644 index d31d89d16d2995027fbb7f7fd692180ad49c1807..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf001.golden +++ /dev/null @@ -1 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden deleted file mode 100644 index c508eb369e1db309c3a4e8101d7e4ee3c8a3f6eb..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden +++ /dev/null @@ -1,2 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden deleted file mode 100644 index b31c3992a9364df7907eebf98c5415489173235c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden +++ /dev/null @@ -1,3 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden deleted file mode 100644 index 926aa7919ab55ad7e2095b846ded1a3fcabe8e92..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden +++ /dev/null @@ -1,4 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden deleted file mode 100644 index b3ba3be7244f5fad01056fa0dd4de29dd2d93624..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden +++ /dev/null @@ -1,5 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden deleted file mode 100644 index e571a2d96159c754af9bab8bf378b7538f386e4c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden +++ /dev/null @@ -1,6 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden deleted file mode 100644 index 79d11d366c4531dc5622ce534bceb9178a69e92b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden +++ /dev/null @@ -1,7 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden deleted file mode 100644 index 4dd23002f17899d3d2ae4f5605362203342d235c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden +++ /dev/null @@ -1,8 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf009.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf009.golden deleted file mode 100644 index d8e3a28bff3cf43c84872f22cebf47e74d51d573..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf009.golden +++ /dev/null @@ -1,9 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden deleted file mode 100644 index 62e8e9fc7ce467f5f623754623634e7a8bcfd068..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden +++ /dev/null @@ -1,10 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden deleted file mode 100644 index 6ec35f4f6595e6b9c1cad504c8d2d506a36542d3..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden +++ /dev/null @@ -1,11 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden deleted file mode 100644 index c9db3fa57f49b5bda659a924beb74769b0d9f426..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden +++ /dev/null @@ -1,12 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden deleted file mode 100644 index b9fc1bf7e2f5c7f9d823a140b3df424289961fd7..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden +++ /dev/null @@ -1,13 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden deleted file mode 100644 index 13f4a0fd731ffdecef8125aeca7b8cb602a984f7..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden +++ /dev/null @@ -1,14 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf015.golden deleted file mode 100644 index c69efe614a04aba3f680d6cf9af91112af13560b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf015.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden deleted file mode 100644 index 2e051d5ad88af68b4a75aaa726a0b637d6299004..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  -           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden deleted file mode 100644 index 1e65410e215a0dae090d79b1e3a6347f46208b3d..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden +++ /dev/null @@ -1,17 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  -           -           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden deleted file mode 100644 index 93474d6a026b69354dcc9d2363dcdc8b2ce18463..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden +++ /dev/null @@ -1,18 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  -           -           -           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden deleted file mode 100644 index 6f6418350b12deea6338f19f238a131b7ec9441f..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden +++ /dev/null @@ -1,19 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  -           -           -           -           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden deleted file mode 100644 index f3714069848e7c073c447f60e4aa3127d1dbdd53..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden +++ /dev/null @@ -1,20 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  -           -           -           -           -           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf001.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf001.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf001.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf001.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf002.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf002.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf003.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf003.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf004.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf004.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf005.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf005.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf006.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf006.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf007.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf007.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf008.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf008.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf009.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf009.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf009.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf009.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf010.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf010.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf011.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf011.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf012.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf012.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf013.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf013.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf014.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf014.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf015.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf015.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf015.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf016.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf016.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf017.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf017.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf018.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf018.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf019.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf019.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf020.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf020.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf001.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf001.golden deleted file mode 100644 index 568820e7c67775c70cd49aba709a52a5547d2ae9..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf001.golden +++ /dev/null @@ -1 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden deleted file mode 100644 index 2402ae251e95b60d1824cafe9097a16fb3e0e8d6..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden +++ /dev/null @@ -1,2 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden deleted file mode 100644 index 37017963f7a11f0d86ed36205928a4e74f86951b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden +++ /dev/null @@ -1,3 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden deleted file mode 100644 index 061471516c6383e30301209203d2465e91c4c540..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden +++ /dev/null @@ -1,4 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden deleted file mode 100644 index 72f781ea7470a4e350ea3f228ea69c05f70849b7..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden +++ /dev/null @@ -1,5 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden deleted file mode 100644 index 666944fe745621fd386f4697b150fddf77c86c8c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden +++ /dev/null @@ -1,6 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden deleted file mode 100644 index 819c12589a9e708622441fd37b505cce76208527..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden +++ /dev/null @@ -1,7 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden deleted file mode 100644 index 349961591727969718bfe0cdb4f3fe384fed7cc5..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden +++ /dev/null @@ -1,8 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf009.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf009.golden deleted file mode 100644 index 3d674b517f8b3ea4c86fe000f7026aa55eed123f..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf009.golden +++ /dev/null @@ -1,9 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden deleted file mode 100644 index 13362a10859cec473f0cfa26d411d709dc6c535f..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden +++ /dev/null @@ -1,10 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden deleted file mode 100644 index 8048f0e742b0ad409e13f8b06239b04f4e4a0c7c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden +++ /dev/null @@ -1,11 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden deleted file mode 100644 index 11220325ed2d66f98484899f8061b8bf0574adbb..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden +++ /dev/null @@ -1,12 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden deleted file mode 100644 index ee78391db24ffe6c5b275a832e9f1e3893cfb416..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden +++ /dev/null @@ -1,13 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden deleted file mode 100644 index 244d471c54f05cdae9f6dcb9e18adef79a6f851c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden +++ /dev/null @@ -1,14 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden deleted file mode 100644 index bf521c4f3b194404905d6b104adcec0936b0436e..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf016.golden deleted file mode 100644 index 18c9c363f3952bda8537f96496405edce5684485..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf016.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf017.golden deleted file mode 100644 index 5bff180379640df3d1089686145b84d9ae4f594e..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf017.golden +++ /dev/null @@ -1,17 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  -         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf018.golden deleted file mode 100644 index a7054d1809e2c28658a633a4e109b91389f4d762..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf018.golden +++ /dev/null @@ -1,18 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  -         -         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf019.golden deleted file mode 100644 index da0384b0cefc9c193df4ac07de43ece023fcde7b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf019.golden +++ /dev/null @@ -1,19 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  -         -         -         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf020.golden deleted file mode 100644 index 71c38a98b7ddafea0864af0842261d7339161b0d..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf020.golden +++ /dev/null @@ -1,20 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  -         -         -         -         \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf001.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf001.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf001.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf001.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf002.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf002.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf003.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf003.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf004.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf004.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf005.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf005.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf006.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf006.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf007.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf007.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf008.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf008.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf009.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf009.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf009.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf009.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf010.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf010.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf011.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf011.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf012.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf012.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf013.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf013.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf014.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf014.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf015.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf015.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf016.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf016.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf016.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf017.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf017.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf017.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf018.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf018.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf018.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf019.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf019.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf019.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf020.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf020.golden rename to internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf020.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf001.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf001.golden deleted file mode 100644 index 3f0fb19faa2c936073b3eb4a1cd5ee2224221845..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf001.golden +++ /dev/null @@ -1,15 +0,0 @@ -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf002.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf002.golden deleted file mode 100644 index 3d4d277689633144e26a6c58725b0672aa36b0fe..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf002.golden +++ /dev/null @@ -1,15 +0,0 @@ -   -   -   -   -   -   -   -   -   -   - 1 - 1 - 1 -   - 1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf003.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf003.golden deleted file mode 100644 index 0e6d1110d23c809c16870f4b298f6bbc41d1dc63..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf003.golden +++ /dev/null @@ -1,15 +0,0 @@ -  … -  2 -  3 -  4 -   -  5 -  6 -  7 -  … -  9 - 10 - 11 - 12 -   - 13 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf004.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf004.golden deleted file mode 100644 index ee8fe5e741cf0a9f6b1293084eb1434497beb7ac..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf004.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  -  2  -  3  -  4  -    -  5  -  6  -  7  -  …  -  9  - 10  - 11  - 12  -    - 13  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf005.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf005.golden deleted file mode 100644 index eda67bf724a6a3e1fe5871ff2d59ad913163cf23..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf005.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …   -  2   -  3   -  4   -     -  5   -  6   -  7   -  …   -  9   - 10   - 11   - 12 - -     - 13   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf006.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf006.golden deleted file mode 100644 index 5666a407097b7ca00b5de701ad0c5c09e073b07b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf006.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …    -  2   -  3   -  4   -     -  5   -  6   -  7   -  …    -  9   - 10   - 11   - 12 -  -     - 13   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf007.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf007.golden deleted file mode 100644 index bfa5cde6aa78beee96f342a8e506538f42cdfb70..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf007.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …   … -  2    -  3    -  4    -      -  5    -  6    -  7    -  …   … -  9    - 10    - 11    - 12 -   -      - 13    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf008.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf008.golden deleted file mode 100644 index ba4b00fa463958ecb94296755136e897ff1db17f..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf008.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …   …  -  2     -  3     -  4     -       -  5     -  6     -  7     -  …   …  -  9   1 - 10   1 - 11   1 - 12 -  1 -     1 - 13   1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden deleted file mode 100644 index 15cc518f312e49a25a492cf9d178a051dcf94b3d..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf009.golden +++ /dev/null @@ -1,15 +0,0 @@ -  … …  …  -  2    2  -  3    3  -  4    4  -      5  -  5    6  -  6    7  -  7    8  -  … …  …  -  9   10  - 10   11  - 11   12  - 12 - 13  -     14  - 13   15  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden deleted file mode 100644 index 95e3d48a33d0abb5a94218d2fcfe29dd3c27fcbc..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf010.golden +++ /dev/null @@ -1,15 +0,0 @@ -  … …  …   -  2    2   -  3    3   -  4    4   -      5 + -  5    6   -  6    7   -  7    8   -  … …  …   -  9   10   - 10   11   - 11   12   - 12 - 13 + -     14 + - 13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf011.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf011.golden deleted file mode 100644 index c808c3d9a4d15073c6d921066beb1291954f16c5..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf011.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  …  …   -  2    2   -  3    3   -  4    4   -      5 + -  5    6   -  6    7   -  7    8   -  …  …  …   -  9   10   - 10   11   - 11   12   - 12 -  13 + -     14 + - 13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf012.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf012.golden deleted file mode 100644 index 031cd9ec5a358c5ff84438bbc4a20ecea2cca91c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf012.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  …  …    -  2    2   -  3    3   -  4    4   -      5 +  -  5    6   -  6    7   -  7    8   -  …  …  …    -  9   10   - 10   11   - 11   12   - 12 -  13 +  -     14 +  - 13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf013.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf013.golden deleted file mode 100644 index cd6ac7321e5628829f80654e9bf4a88abb0e3432..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf013.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  …  …    -  2    2    -  3    3  … -  4    4  … -      5 + … -  5    6  ) -  6    7    -  7    8  … -  …  …  …    -  9   10  } - 10   11    - 11   12  … - 12 -  13 + … -     14 + … - 13   15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf014.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf014.golden deleted file mode 100644 index 8c707fb4c7803da6550b521a0df310f3c96764ef..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf014.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  …  …    -  2     2    -  3  …  3  … -  4  …  4  … -       5 + … -  5  )  6  ) -  6     7    -  7  …  8  … -  …  …  …    -  9  } 10  } - 10    11    - 11  … 12  … - 12 - … 13 + … -      14 + … - 13  } 15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf015.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf015.golden deleted file mode 100644 index 1a7b2c4d5ddaac1982beac69c12cf358c024fb17..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf015.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  …  …    -  2     2    -  3  …  3  i… -  4  …  4  … -       5 +  … -  5  )  6  )  -  6     7    -  7  …  8  f… -  …  …  …    -  9  } 10  }  - 10    11    - 11  … 12  f… - 12 - … 13 +  … -      14 +  … - 13  } 15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf016.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf016.golden deleted file mode 100644 index 5d9a23842c5e195ee98757d25efbe3e3e84f5934..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf016.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @…  …    -  2     2    -  3  i…  3  i… -  4  …  4  … -       5 +  … -  5  )   6  )  -  6     7    -  7  f…  8  f… -  …  @…  …    -  9  }  10  }  - 10    11    - 11  f… 12  f… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf017.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf017.golden deleted file mode 100644 index 9cd9e4e522bac69a59f8b64d6f6a74bd93948793..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf017.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @…  …    -  2     2    -  3  i…  3  im… -  4  …  4  … -       5 +  … -  5  )   6  )  -  6     7    -  7  f…  8  fu… -  …  @…  …    -  9  }  10  }  - 10    11    - 11  f… 12  fu… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf018.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf018.golden deleted file mode 100644 index 3b553749e0dc8afc126ce8e0b8178ffe6fd1a661..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf018.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@…  …    -  2     2    -  3  im…  3  im… -  4  …  4  … -       5 +  … -  5  )   6  )  -  6     7    -  7  fu…  8  fu… -  …  @@…  …    -  9  }  10  }  - 10    11    - 11  fu… 12  fu… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf019.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf019.golden deleted file mode 100644 index 0ae7207641c9eb8d9fd3fd0b52b946bcf458581a..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf019.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@…  …    -  2     2    -  3  im…  3  imp… -  4  …  4  … -       5 +  … -  5  )   6  )  -  6     7    -  7  fu…  8  fun… -  …  @@…  …    -  9  }  10  }  - 10    11    - 11  fu… 12  fun… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf020.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf020.golden deleted file mode 100644 index 48879334950a8674b4400f08ed4fec236b97f653..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf020.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ …  …    -  2     2    -  3  imp…  3  imp… -  4  …  4  … -       5 +  … -  5  )   6  )  -  6     7    -  7  fun…  8  fun… -  …  @@ …  …    -  9  }  10  }  - 10    11    - 11  fun… 12  fun… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf021.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf021.golden deleted file mode 100644 index 743209f504d5734917f6872023aaf3c8fa35d050..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf021.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ …  …    -  2     2    -  3  imp…  3  impo… -  4  …  4  … -       5 +  … -  5  )   6  )  -  6     7    -  7  fun…  8  func… -  …  @@ …  …    -  9  }  10  }  - 10    11    - 11  fun… 12  func… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf022.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf022.golden deleted file mode 100644 index 3d31118daaf623b2d24ddf076120c778fba83f3e..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf022.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -…  …    -  2     2    -  3  impo…  3  impo… -  4  …  4  … -       5 +  … -  5  )   6  )  -  6     7    -  7  func…  8  func… -  …  @@ -…  …    -  9  }  10  }  - 10    11    - 11  func… 12  func… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf023.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf023.golden deleted file mode 100644 index 9e1a2f26f88110a2eae20bff129f8c2099ca6de3..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf023.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -…  …    -  2    [38;2;223;219;221;48;2;58;57;67m 2    -  3  impo…  3  impor… -  4  …  4  "… -       5 +  "… -  5  )   6  )  -  6     7    -  7  func…  8  func … -  …  @@ -…  …    -  9  }  10  }  - 10    11    - 11  func… 12  func … - 12 -  … 13 +  c… -      14 +  r… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf024.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf024.golden deleted file mode 100644 index 179f406d4766932cf48dc5c89600a4c17028ad0a..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf024.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2…  …    -  2     2    -  3  impor…  3  impor… -  4  "…  4  "… -       5 +  "… -  5  )   6  )  -  6     7    -  7  func …  8  func … -  …  @@ -9…  …    -  9  }  10  }  - 10    11    - 11  func … 12  func … - 12 -  r… 13 +  c… -      14 +  r… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf025.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf025.golden deleted file mode 100644 index fb89714a4f10eb2d4ec50820e0a722309da54c2b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf025.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2…  …    -  2     2    -  3  impor…  3  import… -  4  "…  4  "f… -       5 +  "s… -  5  )   6  )  -  6     7    -  7  func …  8  func m… -  …  @@ -9…  …    -  9  }  10  }  - 10    11    - 11  func … 12  func g… - 12 -  r… 13 +  co… -      14 +  re… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf026.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf026.golden deleted file mode 100644 index a846931170021545570539a324f1f6b39283cfef..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf026.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,…  …    -  2     2    -  3  import…  3  import… -  4  "f…  4  "f… -       5 +  "s… -  5  )   6  )  -  6     7    -  7  func m…  8  func m… -  …  @@ -9,…  …    -  9  }  10  }  - 10    11    - 11  func g… 12  func g… - 12 -  re… 13 +  co… -      14 +  re… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf027.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf027.golden deleted file mode 100644 index 0dd8b722218b90b7489240fd2f9fc47c6222060c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf027.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,…  …    -  2     2    -  3  import…  3  import ( -  4  "f…  4  "fm… -       5 +  "st… -  5  )   6  )  -  6     7    -  7  func m…  8  func ma… -  …  @@ -9,…  …    -  9  }  10  }  - 10    11    - 11  func g… 12  func ge… - 12 -  re… 13 +  con… -      14 +  ret… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf028.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf028.golden deleted file mode 100644 index 84d888514dc55b2a3820ad91dd900cb104af0bf4..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf028.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6…  …    -  2     2    -  3  import (  3  import ( -  4  "fm…  4  "fm… -       5 +  "st… -  5  )   6  )  -  6     7    -  7  func ma…  8  func ma… -  …  @@ -9,5…  …    -  9  }  10  }  - 10    11    - 11  func ge… 12  func ge… - 12 -  ret… 13 +  con… -      14 +  ret… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf029.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf029.golden deleted file mode 100644 index 538886b363764a67dca2949861ed5f081055e037..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf029.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6…  …    -  2     2    -  3  import (  3  import (  -  4  "fm…  4  "fmt" -       5 +  "str… -  5  )   6  )  -  6     7    -  7  func ma…  8  func mai… -  …  @@ -9,5…  …    -  9  }  10  }  - 10    11    - 11  func ge… 12  func get… - 12 -  ret… 13 +  cont… -      14 +  retu… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf030.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf030.golden deleted file mode 100644 index 3bec03e201df802afe674260fb7aff16b81fecf3..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf030.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 …  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"  4  "fmt" -       5 +  "str… -  5  )   6  )  -  6     7    -  7  func mai…  8  func mai… -  …  @@ -9,5 …  …    -  9  }  10  }  - 10    11    - 11  func get… 12  func get… - 12 -  retu… 13 +  cont… -      14 +  retu… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf031.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf031.golden deleted file mode 100644 index cadeab14d6f48a6627f76459237e2e7b6088f25f..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf031.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 …  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"  4  "fmt"  -       5 +  "stri… -  5  )   6  )  -  6     7    -  7  func mai…  8  func main… -  …  @@ -9,5 …  …    -  9  }  10  }  - 10    11    - 11  func get… 12  func getC… - 12 -  retu… 13 +  conte… -      14 +  retur… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf032.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf032.golden deleted file mode 100644 index aa56ada988e323ca2d5067e7a0d91093943338ca..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf032.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +…  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "stri… -  5  )   6  )  -  6     7    -  7  func main…  8  func main… -  …  @@ -9,5 +…  …    -  9  }  10  }  - 10    11    - 11  func getC… 12  func getC… - 12 -  retur… 13 +  conte… -      14 +  retur… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf033.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf033.golden deleted file mode 100644 index 26ab24b3d3310af93038c39c49d554b9bd837ce4..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf033.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +…  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strin… -  5  )   6  )  -  6     7    -  7  func main…  8  func main(… -  …  @@ -9,5 +…  …    -  9  }  10  }  - 10    11    - 11  func getC… 12  func getCo… - 12 -  retur… 13 +  conten… -      14 +  return… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf034.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf034.golden deleted file mode 100644 index 22ff3a92f51b86f501e40a68f3e249eb052db018..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf034.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2…  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strin… -  5  )   6  )  -  6     7    -  7  func main(…  8  func main(… -  …  @@ -9,5 +1…  …    -  9  }  10  }  - 10    11    - 11  func getCo… 12  func getCo… - 12 -  return… 13 +  conten… -      14 +  return… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf035.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf035.golden deleted file mode 100644 index 1e17891f4c4beb48c8210a88141a81838a35ecf1..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf035.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2…  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "string… -  5  )   6  )  -  6     7    -  7  func main(…  8  func main()… -  …  @@ -9,5 +1…  …    -  9  }  10  }  - 10    11    - 11  func getCo… 12  func getCon… - 12 -  return… 13 +  content… -      14 +  return … - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf036.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf036.golden deleted file mode 100644 index 14c042e13c7776e8bbd6686bf1feb15086c4a991..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf036.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,…  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "string… -  5  )   6  )  -  6     7    -  7  func main()…  8  func main()… -  …  @@ -9,5 +10…  …    -  9  }  10  }  - 10    11    - 11  func getCon… 12  func getCon… - 12 -  return … 13 +  content… -      14 +  return … - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf037.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf037.golden deleted file mode 100644 index 03edc45f2dd75275bd29c22633a96f39c5dd51f5..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf037.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,…  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings" -  5  )   6  )  -  6     7    -  7  func main()…  8  func main() { -  …  @@ -9,5 +10…  …    -  9  }  10  }  - 10    11    - 11  func getCon… 12  func getCont… - 12 -  return … 13 +  content … -      14 +  return c… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf038.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf038.golden deleted file mode 100644 index 622035ef3cceab251fc765feccbe3dcdca5946dc..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf038.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7…  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings" -  5  )   6  )  -  6     7    -  7  func main() {  8  func main() { -  …  @@ -9,5 +10,…  …    -  9  }  10  }  - 10    11    - 11  func getCont… 12  func getCont… - 12 -  return "… 13 +  content … -      14 +  return c… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf039.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf039.golden deleted file mode 100644 index 6f956ea9f603d28e887602a454bd7420116add9d..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf039.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7…  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {  8  func main() {  -  …  @@ -9,5 +10,…  …    -  9  }  10  }  - 10    11    - 11  func getCont… 12  func getConte… - 12 -  return "… 13 +  content :… -      14 +  return co… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf040.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf040.golden deleted file mode 100644 index 1c8e9fa4b8a906b6baaf787501fa0d6d41e5595c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf040.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 …  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6…  …    -  9  }  10  }  - 10    11    - 11  func getConte… 12  func getConte… - 12 -  return "H… 13 +  content :… -      14 +  return co… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf041.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf041.golden deleted file mode 100644 index 6efa701eefb58e95615c2f4a51e5b615d1564365..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf041.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 …  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6…  …    -  9  }  10  }  - 10    11    - 11  func getConte… 12  func getConten… - 12 -  return "H… 13 +  content :=… -      14 +  return con… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf042.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf042.golden deleted file mode 100644 index 6621a64df572c200d8e799e1a75079b6e7329b25..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf042.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @…  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 …  …    -  9  }  10  }  - 10    11    - 11  func getConten… 12  func getConten… - 12 -  return "He… 13 +  content :=… -      14 +  return con… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf043.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf043.golden deleted file mode 100644 index 68d7829c5f981882b4bcb735099e80f073bf386e..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf043.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @…  …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 …  …    -  9  }  10  }  - 10    11    - 11  func getConten… 12  func getContent… - 12 -  return "He… 13 +  content := … -      14 +  return cont… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf044.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf044.golden deleted file mode 100644 index ce1abcbb495ab08edae18e6ec7927fd1e0ebdeae..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf044.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@   …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @…  …    -  9  }  10  }  - 10    11    - 11  func getContent… 12  func getContent… - 12 -  return "Hel… 13 +  content := … -      14 +  return cont… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf045.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf045.golden deleted file mode 100644 index 177dce4aa74ce9404658fbddc209d454e5cb44af..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf045.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@   …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @…  …    -  9  }  10  }  - 10    11    - 11  func getContent… 12  func getContent(… - 12 -  return "Hel… 13 +  content := s… -      14 +  return conte… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf046.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf046.golden deleted file mode 100644 index c5bdda3766471b424b84b56a6f6c184c0493896c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf046.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@   …    -  9  }  10  }  - 10    11    - 11  func getContent(… 12  func getContent(… - 12 -  return "Hell… 13 +  content := s… -      14 +  return conte… - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf047.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf047.golden deleted file mode 100644 index 4b9a0f161aaaffc582e27fe0ff454f9dd4f6c2f8..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf047.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@   …    -  9  }  10  }  - 10    11    - 11  func getContent(… 12  func getContent()… - 12 -  return "Hell… 13 +  content := st… -      14 +  return content - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf048.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf048.golden deleted file mode 100644 index b8f6fc9046127244b58014ef446a96871cf7e0c7..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf048.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent()… 12  func getContent()… - 12 -  return "Hello… 13 +  content := st… -      14 +  return content - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf049.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf049.golden deleted file mode 100644 index d783ea79353017d1de1e102ae3df5e06bcf2dd05..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf049.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent()… 12  func getContent() … - 12 -  return "Hello… 13 +  content := str… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf050.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf050.golden deleted file mode 100644 index 5de6b925688ed3c7143bca5258e4c3e7e5120163..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf050.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() … 12  func getContent() … - 12 -  return "Hello,… 13 +  content := str… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf051.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf051.golden deleted file mode 100644 index fe5bfd05adf9a7b1a97b783ad56575902621b26a..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf051.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() … 12  func getContent() s… - 12 -  return "Hello,… 13 +  content := stri… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf052.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf052.golden deleted file mode 100644 index daffbbc997f30f484c7f705cebc79395bec642f4..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf052.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() s… 12  func getContent() s… - 12 -  return "Hello, … 13 +  content := stri… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf053.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf053.golden deleted file mode 100644 index 7a37d2a106c5f6324c4d18d11ec67923a471bb66..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf053.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() s… 12  func getContent() st… - 12 -  return "Hello, … 13 +  content := strin… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf054.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf054.golden deleted file mode 100644 index d4f4485c6a83afb57260068869d2cbfbedf565d4..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf054.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() st… 12  func getContent() st… - 12 -  return "Hello, w… 13 +  content := strin… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf055.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf055.golden deleted file mode 100644 index d1c1a90e99ef2f66423ca1caa28bd6ce9f43a174..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf055.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() st… 12  func getContent() str… - 12 -  return "Hello, w… 13 +  content := string… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf056.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf056.golden deleted file mode 100644 index 2037d25ac7a7f09044e52a0d9cd95f72925346b3..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf056.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() str… 12  func getContent() str… - 12 -  return "Hello, wo… 13 +  content := string… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf057.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf057.golden deleted file mode 100644 index da547a2463d46085eef590ea4153bfa39c784c05..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf057.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() str… 12  func getContent() stri… - 12 -  return "Hello, wo… 13 +  content := strings… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf058.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf058.golden deleted file mode 100644 index 1fcb6cb73b8f013c15960f728c9fef97509d6875..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf058.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() stri… 12  func getContent() stri… - 12 -  return "Hello, wor… 13 +  content := strings… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf059.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf059.golden deleted file mode 100644 index 88d43803fd555f48ff6867b43fe18b2fc3a29a22..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf059.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() stri… 12  func getContent() strin… - 12 -  return "Hello, wor… 13 +  content := strings.… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf060.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf060.golden deleted file mode 100644 index 2a5a32a0e3467ce28cfe08b3d3beddc04078c7bc..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf060.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() strin… 12  func getContent() strin… - 12 -  return "Hello, worl… 13 +  content := strings.… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf061.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf061.golden deleted file mode 100644 index 6a9dc2260a954a3bdf1c4090f1ce80a281c2d2f5..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf061.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() strin… 12  func getContent() string… - 12 -  return "Hello, worl… 13 +  content := strings.T… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf062.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf062.golden deleted file mode 100644 index 0741a16382bf7016153354d4dbf378bb045e8c68..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf062.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string… 12  func getContent() string… - 12 -  return "Hello, world… 13 +  content := strings.T… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf063.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf063.golden deleted file mode 100644 index 2876c720e136414661e2fdac2b29a848d25e0a59..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf063.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string… 12  func getContent() string { - 12 -  return "Hello, world… 13 +  content := strings.To… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf064.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf064.golden deleted file mode 100644 index 9a8e3724e2569600dc0a1fefc44e94017f808748..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf064.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string { 12  func getContent() string { - 12 -  return "Hello, world!" 13 +  content := strings.To… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf065.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf065.golden deleted file mode 100644 index b950187ab3d3e887be4a0c23018d5f1c393f2881..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf065.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string { 12  func getContent() string {  - 12 -  return "Hello, world!" 13 +  content := strings.ToU… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf066.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf066.golden deleted file mode 100644 index f3ae596f89c50f5f9cae4591708728958e597f69..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf066.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToU… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf067.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf067.golden deleted file mode 100644 index ebec6c6aff51d0c279a335152f14923a475bd447..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf067.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUp… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf068.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf068.golden deleted file mode 100644 index 4bbb8da62e5e1843a5c3666f89ddb63272c9effc..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf068.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUp… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf069.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf069.golden deleted file mode 100644 index b1e6f5ad6b107290d40bf9252c36ac6c38d02aa4..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf069.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpp… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf070.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf070.golden deleted file mode 100644 index 76c0bf09487a92deb04c72fa8baac98191aa1cd2..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf070.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpp… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf071.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf071.golden deleted file mode 100644 index b27f452935e340cfb3efcb23fec2cea10d65c81d..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf071.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUppe… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf072.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf072.golden deleted file mode 100644 index 77a37991b01bb630846e793aa685fa9d1f24232f..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf072.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUppe… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf073.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf073.golden deleted file mode 100644 index 1dfe17b272032302cb50793c205064e9b1e1059a..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf073.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf074.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf074.golden deleted file mode 100644 index b100d1328e48d0600a150ab4a5618cbfbbe2a151..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf074.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf075.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf075.golden deleted file mode 100644 index e24cdb23d386a993490f39c57178d49770c85d3b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf075.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper(… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf076.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf076.golden deleted file mode 100644 index 5e8829d51a939889051ef21169a87e71a1661bb5..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf076.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper(… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf077.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf077.golden deleted file mode 100644 index b7c73f134dda2c66a8718116ae221fe5cba12cf6..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf077.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf078.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf078.golden deleted file mode 100644 index 56f55d6d43a066e430c6916d08cd8578bd9a8dde..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf078.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf079.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf079.golden deleted file mode 100644 index d9b6279c1511ebbaf19905097c97f4e8a9ff3923..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf079.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("H… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf080.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf080.golden deleted file mode 100644 index 41b01d40926f703c85cfecc81f1dbbf35a0e5aed..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf080.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("H… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf081.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf081.golden deleted file mode 100644 index e012e6696cf24d00144b7a2d0591ec78ffc42551..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf081.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("He… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf082.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf082.golden deleted file mode 100644 index 9139058c3e664bc8b5d0e739eedf530f650d5f3d..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf082.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("He… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf083.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf083.golden deleted file mode 100644 index 0b80966531705b5fc54336c960c7b85565ba6547..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf083.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hel… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf084.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf084.golden deleted file mode 100644 index d5319378486f26789347ba6ac521988f5c9992d9..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf084.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hel… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf085.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf085.golden deleted file mode 100644 index 40e2834cfc02581cdff620d6c8b6dfe502ff32a0..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf085.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hell… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf086.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf086.golden deleted file mode 100644 index c1af836ec626347d33cb82be5eb81b9698af5b02..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf086.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hell… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf087.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf087.golden deleted file mode 100644 index 90e06da7f06107c5b08730e3010af4ee67586af9..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf087.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf088.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf088.golden deleted file mode 100644 index a33117d11235fc9662c9576e882719b5e08fcc04..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf088.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf089.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf089.golden deleted file mode 100644 index 6be1ee8526622438332c7dfa5f5203acf1fd912c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf089.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello,… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf090.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf090.golden deleted file mode 100644 index 49b388eb527b20bc400eea5ce6e64fb15bab1627..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf090.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello,… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf091.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf091.golden deleted file mode 100644 index db6e1840a345f648c5487ed13ffd408f060d5611..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf091.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, … -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf092.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf092.golden deleted file mode 100644 index bb5b478b90473be851d9e22117728d78f0c52ec3..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf092.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, … -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf093.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf093.golden deleted file mode 100644 index 7114ee69020ba3d575757c9b8f334a21f848d777..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf093.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, W… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf094.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf094.golden deleted file mode 100644 index c133e9e0e55692497a0d275043d45080f51e68b7..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf094.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, W… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf095.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf095.golden deleted file mode 100644 index 3edf2198f9b7a2c85fb2eec4ffb14792e2bdfeab..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf095.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wo… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf096.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf096.golden deleted file mode 100644 index a2fad78b8ee1b5a30af5cdb9b847d65e829a5809..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf096.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wo… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf097.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf097.golden deleted file mode 100644 index 2671fb4106b17973355a61c9661a660ea8ff74e6..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf097.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wor… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf098.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf098.golden deleted file mode 100644 index 47408c13a8acd9f9ba998762e5746b8e95a2ee35..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf098.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wor… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf099.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf099.golden deleted file mode 100644 index a3f907fd60ec55bf3d92e59294457f3ff3054dee..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf099.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Worl… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf100.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf100.golden deleted file mode 100644 index 8df214df69a0c3af76a1ac0878e1345d5918a3aa..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf100.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Worl… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf101.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf101.golden deleted file mode 100644 index 511606f7ae59a70c750c6a2a9ccec1022b4e23c6..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf101.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf102.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf102.golden deleted file mode 100644 index 7091f90878b86597bb85677d5f9fb3e1a514b754..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf102.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf103.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf103.golden deleted file mode 100644 index 1a50be6289e7fe0a22f2ba707e34e99fbcda588c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf103.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf104.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf104.golden deleted file mode 100644 index 6b5bd3510c3e41af6e004e8354b5ac119b36a804..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf104.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!… -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf105.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf105.golden deleted file mode 100644 index 36645e654ee50deccbb1c07bddfd3d6da020cc7b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf105.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!") -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf106.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf106.golden deleted file mode 100644 index 4101ff8d5ff48ae05763bb84b9599927fe223c9e..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf106.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!") -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf107.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf107.golden deleted file mode 100644 index 96763fdf2fa5e966678b235475ae318581dfe80d..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf107.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf108.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf108.golden deleted file mode 100644 index c69efe614a04aba3f680d6cf9af91112af13560b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf108.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf109.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf109.golden deleted file mode 100644 index cbb3322bbe19b0655c6b439f0affa71d511a684b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf109.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf110.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf110.golden deleted file mode 100644 index 61d56b34ce17751079aab8c2f00a80397cb80627..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/DarkMode/WidthOf110.golden +++ /dev/null @@ -1,15 +0,0 @@ -  …  @@ -2,6 +2,7 @@    …    -  2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  -  6     7    -  7  func main() {   8  func main() {  -  …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  - 10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf001.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf001.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf001.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf001.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf002.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf002.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf002.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf002.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf003.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf003.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf003.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf003.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf004.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf004.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf004.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf004.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf005.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf005.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf005.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf005.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf006.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf006.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf006.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf006.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf007.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf007.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf007.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf007.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf008.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf008.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf008.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf008.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf009.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf009.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf009.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf009.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf010.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf010.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf010.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf010.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf011.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf011.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf011.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf011.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf012.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf012.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf012.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf012.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf013.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf013.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf013.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf013.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf014.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf014.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf014.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf014.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf015.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf015.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf015.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf015.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf016.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf016.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf016.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf016.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf017.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf017.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf017.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf017.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf018.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf018.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf018.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf018.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf019.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf019.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf019.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf019.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf020.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf020.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf020.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf020.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf021.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf021.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf021.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf021.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf022.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf022.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf022.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf022.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf023.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf023.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf023.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf023.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf024.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf024.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf024.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf024.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf025.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf025.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf025.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf025.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf026.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf026.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf026.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf026.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf027.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf027.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf027.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf027.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf028.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf028.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf028.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf028.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf029.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf029.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf029.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf029.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf030.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf030.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf030.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf030.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf031.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf031.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf031.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf031.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf032.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf032.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf032.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf032.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf033.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf033.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf033.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf033.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf034.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf034.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf034.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf034.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf035.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf035.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf035.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf035.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf036.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf036.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf036.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf036.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf037.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf037.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf037.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf037.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf038.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf038.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf038.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf038.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf039.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf039.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf039.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf039.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf040.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf040.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf040.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf040.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf041.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf041.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf041.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf041.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf042.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf042.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf042.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf042.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf043.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf043.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf043.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf043.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf044.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf044.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf044.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf044.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf045.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf045.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf045.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf045.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf046.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf046.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf046.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf046.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf047.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf047.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf047.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf047.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf048.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf048.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf048.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf048.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf049.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf049.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf049.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf049.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf050.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf050.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf050.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf050.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf051.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf051.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf051.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf051.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf052.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf052.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf052.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf052.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf053.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf053.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf053.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf053.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf054.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf054.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf054.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf054.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf055.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf055.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf055.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf055.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf056.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf056.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf056.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf056.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf057.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf057.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf057.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf057.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf058.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf058.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf058.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf058.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf059.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf059.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf059.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf059.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf060.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf060.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf060.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf060.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf061.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf061.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf061.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf061.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf062.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf062.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf062.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf062.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf063.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf063.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf063.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf063.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf064.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf064.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf064.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf064.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf065.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf065.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf065.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf065.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf066.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf066.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf066.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf066.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf067.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf067.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf067.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf067.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf068.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf068.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf068.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf068.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf069.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf069.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf069.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf069.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf070.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf070.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf070.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf070.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf071.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf071.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf071.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf071.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf072.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf072.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf072.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf072.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf073.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf073.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf073.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf073.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf074.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf074.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf074.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf074.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf075.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf075.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf075.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf075.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf076.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf076.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf076.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf076.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf077.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf077.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf077.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf077.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf078.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf078.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf078.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf078.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf079.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf079.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf079.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf079.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf080.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf080.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf080.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf080.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf081.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf081.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf081.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf081.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf082.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf082.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf082.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf082.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf083.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf083.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf083.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf083.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf084.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf084.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf084.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf084.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf085.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf085.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf085.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf085.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf086.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf086.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf086.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf086.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf087.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf087.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf087.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf087.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf088.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf088.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf088.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf088.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf089.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf089.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf089.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf089.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf090.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf090.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf090.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf090.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf091.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf091.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf091.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf091.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf092.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf092.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf092.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf092.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf093.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf093.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf093.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf093.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf094.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf094.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf094.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf094.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf095.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf095.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf095.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf095.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf096.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf096.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf096.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf096.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf097.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf097.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf097.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf097.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf098.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf098.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf098.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf098.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf099.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf099.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf099.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf099.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf100.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf100.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf100.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf100.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf101.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf101.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf101.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf101.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf102.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf102.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf102.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf102.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf103.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf103.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf103.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf103.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf104.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf104.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf104.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf104.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf105.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf105.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf105.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf105.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf106.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf106.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf106.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf106.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf107.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf107.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf107.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf107.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf108.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf108.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf108.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf108.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf109.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf109.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf109.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf109.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf110.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf110.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Split/LightMode/WidthOf110.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf110.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf001.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf001.golden deleted file mode 100644 index 9a7bdad6f5b2f9cb38d8f8bc0fcf004ccb08901d..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf001.golden +++ /dev/null @@ -1,16 +0,0 @@ -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf002.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf002.golden deleted file mode 100644 index 6513e62b9232e2d6e816de15aa6d2c63959a5962..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf002.golden +++ /dev/null @@ -1,16 +0,0 @@ -   -   -   -   -   -   -   -   -   -   - 1 - 1 - 1 -   -   - 1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf003.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf003.golden deleted file mode 100644 index 566a9af900df24c579ef44d316967f8f843f656e..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf003.golden +++ /dev/null @@ -1,16 +0,0 @@ -  … -  2 -  3 -  4 -   -  5 -  6 -  7 -  … -  9 - 10 - 11 - 12 -   -   - 13 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf004.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf004.golden deleted file mode 100644 index fce6310c3df72138d7e56b61960c7f8b74b04a4e..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf004.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …  -  2  -  3  -  4  -    -  5  -  6  -  7  -  …  -  9  - 10  - 11  - 12  -    -    - 13  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf005.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf005.golden deleted file mode 100644 index 7c2bf669b3c6cfa396285a32f2f1156f78272a54..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf005.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   -  2   -  3   -  4   -     -  5   -  6   -  7   -  …   -  9   - 10   - 11   - 12   -     -     - 13   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf006.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf006.golden deleted file mode 100644 index 1bdbd29f40ac635e1bbfabb4aeefefc347f59404..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf006.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …    -  2    -  3    -  4    -      -  5    -  6    -  7    -  …    -  9  1 - 10  1 - 11  1 - 12    -    1 -    1 - 13  1 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf007.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf007.golden deleted file mode 100644 index 97f17ee54d312322761c406f2e1bb47edebe7be0..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf007.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   … -  2   2 -  3   3 -  4   4 -     5 -  5   6 -  6   7 -  7   8 -  …   … -  9  10 - 10  11 - 11  12 - 12    -    13 -    14 - 13  15 \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf008.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf008.golden deleted file mode 100644 index b79fae38ae84b77f229de1117a267204126ff49b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf008.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  -  2   2  -  3   3  -  4   4  -     5  -  5   6  -  6   7  -  7   8  -  …   …  -  9  10  - 10  11  - 11  12  - 12     -    13  -    14  - 13  15  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf009.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf009.golden deleted file mode 100644 index e95e0e46d24ffe78393dd2ec9cd0b861761dd37f..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf009.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   … … -  2   2   -  3   3   -  4   4   -     5 + -  5   6   -  6   7   -  7   8   -  …   … … -  9  10   - 10  11   - 11  12   - 12    - -    13 + -    14 + - 13  15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf010.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf010.golden deleted file mode 100644 index d59ab2214fa3ec7daf40629b1b6b0160ce0adc98..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf010.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  … -  2   2   -  3   3   -  4   4   -     5 +  -  5   6   -  6   7   -  7   8   -  …   …  … -  9  10   - 10  11   - 11  12   - 12    -  -    13 +  -    14 +  - 13  15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf011.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf011.golden deleted file mode 100644 index a8676f40abeb41e1a88f7ca08a5e7964e35af9ac..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf011.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  … -  2   2    -  3   3  … -  4   4  … -     5 + … -  5   6  ) -  6   7    -  7   8  … -  …   …  … -  9  10  } - 10  11    - 11  12  … - 12    - … -    13 + … -    14 + … - 13  15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf012.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf012.golden deleted file mode 100644 index 773f6576a0c68976165dd39ae3db0ab5b824cd19..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf012.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @… -  2   2    -  3   3  i… -  4   4  … -     5 +  … -  5   6  )  -  6   7    -  7   8  f… -  …   …  @… -  9  10  }  - 10  11    - 11  12  f… - 12    -  … -    13 +  … -    14 +  … - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf013.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf013.golden deleted file mode 100644 index 2b06b5f49a9c66dad210c1b4d6fac2dcaa065acc..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf013.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@… -  2   2    -  3   3  im… -  4   4  … -     5 +  … -  5   6  )  -  6   7    -  7   8  fu… -  …   …  @@… -  9  10  }  - 10  11    - 11  12  fu… - 12    -  … -    13 +  … -    14 +  … - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf014.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf014.golden deleted file mode 100644 index b8a298f6716309e4ebe0b848f9f8f606fc580f5b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf014.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ … -  2   2    -  3   3  imp… -  4   4  … -     5 +  … -  5   6  )  -  6   7    -  7   8  fun… -  …   …  @@ … -  9  10  }  - 10  11    - 11  12  fun… - 12    -  … -    13 +  … -    14 +  … - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf015.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf015.golden deleted file mode 100644 index b6425e1badbf2e5d84c4864789eac5a715ef4f9a..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf015.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -… -  2   2    -  3   3  impo… -  4   4  … -     5 +  … -  5   6  )  -  6   7    -  7   8  func… -  …   …  @@ -… -  9  10  }  - 10  11    - 11  12  func… - 12    -  … -    13 +  … -    14 +  … - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf016.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf016.golden deleted file mode 100644 index 86f7d2742a9ab6e0e311c9b5e76b9d379335927f..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf016.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2… -  2   2    -  3   3  impor… -  4   4  "… -     5 +  "… -  5   6  )  -  6   7    -  7   8  func … -  …   …  @@ -9… -  9  10  }  - 10  11    - 11  12  func … - 12    -  r… -    13 +  c… -    14 +  r… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf017.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf017.golden deleted file mode 100644 index fdcbc103bd46afbbe40e0b1d5b977450435c09ad..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf017.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,… -  2   2    -  3   3  import… -  4   4  "f… -     5 +  "s… -  5   6  )  -  6   7    -  7   8  func m… -  …   …  @@ -9,… -  9  10  }  - 10  11    - 11  12  func g… - 12    -  re… -    13 +  co… -    14 +  re… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf018.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf018.golden deleted file mode 100644 index ddedac5bf511cd41579595d872d3fd101db537a4..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf018.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6… -  2   2    -  3   3  import ( -  4   4  "fm… -     5 +  "st… -  5   6  )  -  6   7    -  7   8  func ma… -  …   …  @@ -9,5… -  9  10  }  - 10  11    - 11  12  func ge… - 12    -  ret… -    13 +  con… -    14 +  ret… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf019.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf019.golden deleted file mode 100644 index ad2c1a16d6bbfad461af79c1fa1f6efa195bceb1..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf019.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 … -  2   2    -  3   3  import (  -  4   4  "fmt" -     5 +  "str… -  5   6  )  -  6   7    -  7   8  func mai… -  …   …  @@ -9,5 … -  9  10  }  - 10  11    - 11  12  func get… - 12    -  retu… -    13 +  cont… -    14 +  retu… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf020.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf020.golden deleted file mode 100644 index b8c70916234fb76905bfc89919f5053a9303051e..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf020.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +… -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "stri… -  5   6  )  -  6   7    -  7   8  func main… -  …   …  @@ -9,5 +… -  9  10  }  - 10  11    - 11  12  func getC… - 12    -  retur… -    13 +  conte… -    14 +  retur… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf021.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf021.golden deleted file mode 100644 index 3208c32580d4868f230a7a7a803a95913e790888..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf021.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2… -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strin… -  5   6  )  -  6   7    -  7   8  func main(… -  …   …  @@ -9,5 +1… -  9  10  }  - 10  11    - 11  12  func getCo… - 12    -  return… -    13 +  conten… -    14 +  return… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf022.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf022.golden deleted file mode 100644 index d90d4e52fa08156733ab185585c80aceff6e9b14..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf022.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,… -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "string… -  5   6  )  -  6   7    -  7   8  func main()… -  …   …  @@ -9,5 +10… -  9  10  }  - 10  11    - 11  12  func getCon… - 12    -  return … -    13 +  content… -    14 +  return … - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf023.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf023.golden deleted file mode 100644 index 77c0a5e41ce46529cf0c3190464666bf7837e431..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf023.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7… -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings" -  5   6  )  -  6   7    -  7   8  func main() { -  …   …  @@ -9,5 +10,… -  9  10  }  - 10  11    - 11  12  func getCont… - 12    -  return "… -    13 +  content … -    14 +  return c… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf024.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf024.golden deleted file mode 100644 index 7a45157cf5f64d36618f7f21b57a7993af2765e4..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf024.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 … -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6… -  9  10  }  - 10  11    - 11  12  func getConte… - 12    -  return "H… -    13 +  content :… -    14 +  return co… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf025.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf025.golden deleted file mode 100644 index da525ded0901fb24e7836b1144a8849c095943a6..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf025.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @… -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 … -  9  10  }  - 10  11    - 11  12  func getConten… - 12    -  return "He… -    13 +  content :=… -    14 +  return con… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf026.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf026.golden deleted file mode 100644 index 6d9ce9a6374b6519b423fbf77406f6a192f7119d..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf026.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@  -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @… -  9  10  }  - 10  11    - 11  12  func getContent… - 12    -  return "Hel… -    13 +  content := … -    14 +  return cont… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf027.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf027.golden deleted file mode 100644 index bfe3bc58f2645c587804d9656477aad783546062..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf027.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@  -  9  10  }  - 10  11    - 11  12  func getContent(… - 12    -  return "Hell… -    13 +  content := s… -    14 +  return conte… - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf028.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf028.golden deleted file mode 100644 index cb96f8dd77ebcc808ae0b252db9f71eec4fd7001..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf028.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent()… - 12    -  return "Hello… -    13 +  content := st… -    14 +  return content - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf029.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf029.golden deleted file mode 100644 index cd3e2e748d3bddcbfdb3b54854841552ffe7aadf..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf029.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() … - 12    -  return "Hello,… -    13 +  content := str… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf030.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf030.golden deleted file mode 100644 index 7591a228fb7b47901a7f8f10625de567fc48f94b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf030.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() s… - 12    -  return "Hello, … -    13 +  content := stri… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf031.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf031.golden deleted file mode 100644 index b3bf06b2803a6202e60ff3f282522573d0c0d0f9..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf031.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() st… - 12    -  return "Hello, w… -    13 +  content := strin… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf032.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf032.golden deleted file mode 100644 index 35be5aad6c987a92adfdd1bbaab3f477af3be5d9..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf032.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() str… - 12    -  return "Hello, wo… -    13 +  content := string… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf033.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf033.golden deleted file mode 100644 index 8f40f08a11932f23164e6d06f3a85aa84de105fe..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf033.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() stri… - 12    -  return "Hello, wor… -    13 +  content := strings… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf034.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf034.golden deleted file mode 100644 index 4ab5554094071ab509f173e40d424ea6bdd5d09a..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf034.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() strin… - 12    -  return "Hello, worl… -    13 +  content := strings.… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf035.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf035.golden deleted file mode 100644 index 8b5d22bf529e2f65ecc20459847bd23e83e06cdd..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf035.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string… - 12    -  return "Hello, world… -    13 +  content := strings.T… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf036.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf036.golden deleted file mode 100644 index 6d84e4e7f8e57ea18e8b8e5c5d832fd87a2ee3f0..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf036.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string { - 12    -  return "Hello, world!" -    13 +  content := strings.To… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf037.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf037.golden deleted file mode 100644 index 1359537ddefe4bd80ff5d87c9ada0a75ba21b0d9..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf037.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToU… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf038.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf038.golden deleted file mode 100644 index e4a2f4a0c982bec091dec295d876a51432100fb6..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf038.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUp… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf039.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf039.golden deleted file mode 100644 index c54fae5c27246659eed3c6fc3d3357d98044a993..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf039.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpp… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf040.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf040.golden deleted file mode 100644 index 19b8e852925c5fa1377e9fa3a2460e3ccc466357..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf040.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUppe… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf041.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf041.golden deleted file mode 100644 index 5686067dfd30a7e74d7f4a569604f03d104cffdf..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf041.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf042.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf042.golden deleted file mode 100644 index e875732de1dc3297ae4dd98b26b502500c4eb8d9..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf042.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper(… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf043.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf043.golden deleted file mode 100644 index 65d0b222cdb58da9cfe4e02879ce9007d00068d5..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf043.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf044.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf044.golden deleted file mode 100644 index b32501a8e9a2d4ba4b22e426b012cb415d801fa9..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf044.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("H… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf045.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf045.golden deleted file mode 100644 index acb03c5a10e492ce419385ae995c04048afa4228..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf045.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("He… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf046.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf046.golden deleted file mode 100644 index 58f9479cb425a438ac02872e12494272f237b0c4..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf046.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hel… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf047.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf047.golden deleted file mode 100644 index ee034691189129d8abff177ce0448592de41ea75..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf047.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hell… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf048.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf048.golden deleted file mode 100644 index 798187a12d43fcc028ae2805056edf4880b58b1f..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf048.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf049.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf049.golden deleted file mode 100644 index beec5d58d8b8d3328a7d27eb18f6587dd863a62c..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf049.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello,… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf050.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf050.golden deleted file mode 100644 index 25805d05004e9d2eb95762d550d153ac7a8b60ec..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf050.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, … -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf051.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf051.golden deleted file mode 100644 index 1cf1103801fc397ba2c464b3c77a3cc7fe869efb..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf051.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, W… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf052.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf052.golden deleted file mode 100644 index 65eb1d35a8f61c82a7c2d66b0dc93648a3b67948..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf052.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, Wo… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf053.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf053.golden deleted file mode 100644 index c5394a62af59659a8a321ad741f7423432c3e984..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf053.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, Wor… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf054.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf054.golden deleted file mode 100644 index cd9e4e10b7797d8f5e396a0e5ac7b058be9b6be6..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf054.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, Worl… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf055.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf055.golden deleted file mode 100644 index 875dec6833b96e1bfa12cd7a70557722c97f1232..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf055.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf056.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf056.golden deleted file mode 100644 index 0dd41dfc87da203b350761eb99046ac4c092e68b..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf056.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!… -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf057.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf057.golden deleted file mode 100644 index 97d7f009a147b8b09373cf34501828d8d87e6036..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf057.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!") -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf058.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf058.golden deleted file mode 100644 index 18c9c363f3952bda8537f96496405edce5684485..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf058.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf059.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf059.golden deleted file mode 100644 index 6bd8b8bad98d380338ee5020fa349202bc4b5242..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf059.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf060.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf060.golden deleted file mode 100644 index 30f192c422ad261b81cfe2fb3ffce84797b3fdb5..0000000000000000000000000000000000000000 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/DarkMode/WidthOf060.golden +++ /dev/null @@ -1,16 +0,0 @@ -  …   …  @@ -2,6 +2,7 @@   -  2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  -  6   7    -  7   8  func main() {  -  …   …  @@ -9,5 +10,6 @@   -  9  10  }  - 10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf001.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf001.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf001.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf001.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf002.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf002.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf002.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf002.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf003.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf003.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf003.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf003.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf004.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf004.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf004.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf004.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf005.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf005.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf005.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf005.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf006.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf006.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf006.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf006.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf007.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf007.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf007.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf007.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf008.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf008.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf008.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf008.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf009.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf009.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf009.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf009.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf010.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf010.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf010.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf010.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf011.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf011.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf011.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf011.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf012.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf012.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf012.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf012.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf013.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf013.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf013.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf013.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf014.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf014.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf014.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf014.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf015.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf015.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf015.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf015.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf016.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf016.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf016.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf016.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf017.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf017.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf017.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf017.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf018.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf018.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf018.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf018.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf019.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf019.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf019.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf019.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf020.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf020.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf020.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf020.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf021.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf021.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf021.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf021.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf022.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf022.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf022.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf022.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf023.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf023.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf023.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf023.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf024.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf024.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf024.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf024.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf025.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf025.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf025.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf025.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf026.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf026.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf026.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf026.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf027.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf027.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf027.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf027.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf028.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf028.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf028.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf028.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf029.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf029.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf029.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf029.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf030.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf030.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf030.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf030.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf031.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf031.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf031.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf031.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf032.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf032.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf032.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf032.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf033.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf033.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf033.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf033.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf034.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf034.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf034.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf034.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf035.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf035.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf035.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf035.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf036.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf036.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf036.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf036.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf037.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf037.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf037.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf037.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf038.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf038.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf038.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf038.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf039.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf039.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf039.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf039.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf040.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf040.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf040.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf040.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf041.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf041.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf041.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf041.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf042.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf042.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf042.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf042.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf043.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf043.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf043.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf043.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf044.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf044.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf044.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf044.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf045.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf045.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf045.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf045.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf046.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf046.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf046.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf046.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf047.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf047.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf047.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf047.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf048.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf048.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf048.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf048.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf049.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf049.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf049.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf049.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf050.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf050.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf050.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf050.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf051.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf051.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf051.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf051.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf052.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf052.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf052.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf052.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf053.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf053.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf053.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf053.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf054.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf054.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf054.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf054.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf055.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf055.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf055.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf055.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf056.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf056.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf056.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf056.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf057.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf057.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf057.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf057.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf058.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf058.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf058.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf058.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf059.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf059.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf059.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf059.golden diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf060.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf060.golden similarity index 100% rename from internal/exp/diffview/testdata/TestDiffViewWidth/Unified/LightMode/WidthOf060.golden rename to internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf060.golden From baa94c1438fe20681785e8e10521d8e4fe262641 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 12 Jun 2025 15:45:31 -0300 Subject: [PATCH 41/64] fix(diffview): fix debug tasks after some test changes --- internal/exp/diffview/Taskfile.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/exp/diffview/Taskfile.yaml b/internal/exp/diffview/Taskfile.yaml index 422dbe2d3ac85be34c35f81763f7a30b154140f1..f27d093565d7e0e00fb265e21e3ccb2ce48c65b1 100644 --- a/internal/exp/diffview/Taskfile.yaml +++ b/internal/exp/diffview/Taskfile.yaml @@ -25,7 +25,7 @@ tasks: desc: Print golden files for debugging method: none sources: - - ./testdata/TestDiffViewWidth/Unified/LightMode/*.golden + - ./testdata/TestDiffViewWidth/Unified/*.golden cmds: - for: sources cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} @@ -35,7 +35,7 @@ tasks: desc: Print golden files for debugging method: none sources: - - ./testdata/TestDiffViewWidth/Split/LightMode/*.golden + - ./testdata/TestDiffViewWidth/Split/*.golden cmds: - for: sources cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} @@ -45,7 +45,7 @@ tasks: desc: Print golden files for debugging method: none sources: - - ./testdata/TestDiffViewHeight/Unified/LightMode/*.golden + - ./testdata/TestDiffViewHeight/Unified/*.golden cmds: - for: sources cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} @@ -55,7 +55,7 @@ tasks: desc: Print golden files for debugging method: none sources: - - ./testdata/TestDiffViewHeight/Split/LightMode/*.golden + - ./testdata/TestDiffViewHeight/Split/*.golden cmds: - for: sources cmd: echo && echo "------- {{.ITEM}} -------" && echo && cat {{.ITEM}} From 80ad5a3a859f424cc167074db9cebb0903de2bd3 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 12 Jun 2025 15:52:26 -0300 Subject: [PATCH 42/64] feat(diffview): add syntax highlighting --- internal/exp/diffview/chroma.go | 52 +++++++++++++ internal/exp/diffview/diffview.go | 102 +++++++++++++++++++------ internal/exp/diffview/diffview_test.go | 29 +++++-- 3 files changed, 155 insertions(+), 28 deletions(-) create mode 100644 internal/exp/diffview/chroma.go diff --git a/internal/exp/diffview/chroma.go b/internal/exp/diffview/chroma.go new file mode 100644 index 0000000000000000000000000000000000000000..e4d6b2dbaa12651b28ace04e2e051c7a64522899 --- /dev/null +++ b/internal/exp/diffview/chroma.go @@ -0,0 +1,52 @@ +package diffview + +import ( + "fmt" + "image/color" + "io" + + "github.com/alecthomas/chroma/v2" + "github.com/charmbracelet/lipgloss/v2" +) + +var _ chroma.Formatter = chromaFormatter{} + +// chromaFormatter is a custom formatter for Chroma that uses Lip Gloss for +// foreground styling, while keeping a forced background color. +type chromaFormatter struct { + bgColor color.Color +} + +// Format implements the chroma.Formatter interface. +func (c chromaFormatter) Format(w io.Writer, style *chroma.Style, it chroma.Iterator) error { + for token := it(); token != chroma.EOF; token = it() { + entry := style.Get(token.Type) + if entry.IsZero() { + if _, err := fmt.Fprint(w, token.Value); err != nil { + return err + } + continue + } + + s := lipgloss.NewStyle(). + Background(c.bgColor) + + if entry.Bold == chroma.Yes { + s = s.Bold(true) + } + if entry.Underline == chroma.Yes { + s = s.Underline(true) + } + if entry.Italic == chroma.Yes { + s = s.Italic(true) + } + if entry.Colour.IsSet() { + s = s.Foreground(lipgloss.Color(entry.Colour.String())) + } + + if _, err := fmt.Fprint(w, s.Render(token.Value)); err != nil { + return err + } + } + return nil +} diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 6d2947bca534eb2ccc8466d6483ed6e5d3d48fe8..e63bacb7edd79863bc36247cc50595cb74dbd92a 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -2,10 +2,13 @@ package diffview import ( "fmt" + "image/color" "os" "strconv" "strings" + "github.com/alecthomas/chroma/v2" + "github.com/alecthomas/chroma/v2/lexers" "github.com/aymanbagabas/go-udiff" "github.com/aymanbagabas/go-udiff/myers" "github.com/charmbracelet/lipgloss/v2" @@ -43,6 +46,7 @@ type DiffView struct { yOffset int style Style tabWidth int + chromaStyle *chroma.Style isComputed bool err error @@ -153,6 +157,13 @@ func (dv *DiffView) TabWidth(tabWidth int) *DiffView { return dv } +// ChromaStyle sets the chroma style for syntax highlighting. +// If nil, no syntax highlighting will be applied. +func (dv *DiffView) ChromaStyle(style *chroma.Style) *DiffView { + dv.chromaStyle = style + return dv +} + // String returns the string representation of the DiffView. func (dv *DiffView) String() string { dv.replaceTabs() @@ -361,14 +372,19 @@ outer: break outer } - content := strings.TrimSuffix(l.Content, "\n") - content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content)) - content = ansi.Truncate(content, dv.codeWidth, "…") + getContent := func(ls LineStyle) string { + content := strings.TrimSuffix(l.Content, "\n") + content = dv.hightlightCode(content, ls.Code.GetBackground()) + content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content)) + content = ansi.Truncate(content, dv.codeWidth, "…") + return content + } leadingEllipsis := dv.xOffset > 0 && strings.TrimSpace(content) != "" switch l.Kind { case udiff.Equal: + content := getContent(dv.style.EqualLine) if dv.lineNumbers { write(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) write(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) @@ -379,6 +395,7 @@ outer: beforeLine++ afterLine++ case udiff.Insert: + content := getContent(dv.style.InsertLine) if dv.lineNumbers { write(dv.style.InsertLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) write(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) @@ -389,6 +406,7 @@ outer: )) afterLine++ case udiff.Delete: + content := getContent(dv.style.DeleteLine) if dv.lineNumbers { write(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) write(dv.style.DeleteLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) @@ -479,22 +497,17 @@ outer: break outer } - var beforeContent string - var afterContent string - if l.before != nil { - beforeContent = strings.TrimSuffix(l.before.Content, "\n") - beforeContent = ansi.GraphemeWidth.Cut(beforeContent, dv.xOffset, len(beforeContent)) - beforeContent = ansi.Truncate(beforeContent, dv.codeWidth, "…") + getContent := func(content string, ls LineStyle) string { + content = strings.TrimSuffix(content, "\n") + content = dv.hightlightCode(content, ls.Code.GetBackground()) + content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content)) + content = ansi.Truncate(content, dv.codeWidth, "…") + return content } - if l.after != nil { - afterContent = strings.TrimSuffix(l.after.Content, "\n") - afterContent = ansi.GraphemeWidth.Cut(afterContent, dv.xOffset, len(afterContent)) - afterContent = ansi.Truncate(afterContent, dv.codeWidth+btoi(dv.extraColOnAfter), "…") + getLeadingEllipsis := func(content string) bool { + return dv.xOffset > 0 && strings.TrimSpace(content) != "" } - leadingBeforeEllipsis := dv.xOffset > 0 && strings.TrimSpace(beforeContent) != "" - leadingAfterEllipsis := dv.xOffset > 0 && strings.TrimSpace(afterContent) != "" - switch { case l.before == nil: if dv.lineNumbers { @@ -504,20 +517,24 @@ outer: dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" "), )) case l.before.Kind == udiff.Equal: + content := getContent(l.before.Content, dv.style.EqualLine) + leadingEllipsis := getLeadingEllipsis(content) if dv.lineNumbers { write(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } write(beforeFullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(ternary(leadingBeforeEllipsis, " …", " ") + beforeContent), + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(ternary(leadingEllipsis, " …", " ") + content), )) beforeLine++ case l.before.Kind == udiff.Delete: + content := getContent(l.before.Content, dv.style.DeleteLine) + leadingEllipsis := getLeadingEllipsis(content) if dv.lineNumbers { write(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } write(beforeFullContentStyle.Render( - dv.style.DeleteLine.Symbol.Render(ternary(leadingBeforeEllipsis, "-…", "- ")) + - dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(beforeContent), + dv.style.DeleteLine.Symbol.Render(ternary(leadingEllipsis, "-…", "- ")) + + dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(content), )) beforeLine++ } @@ -531,20 +548,24 @@ outer: dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" "), )) case l.after.Kind == udiff.Equal: + content := getContent(l.after.Content, dv.style.EqualLine) + leadingEllipsis := getLeadingEllipsis(content) if dv.lineNumbers { write(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } write(afterFullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(ternary(leadingAfterEllipsis, " …", " ") + afterContent), + dv.style.EqualLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(ternary(leadingEllipsis, " …", " ") + content), )) afterLine++ case l.after.Kind == udiff.Insert: + content := getContent(l.after.Content, dv.style.InsertLine) + leadingEllipsis := getLeadingEllipsis(content) if dv.lineNumbers { write(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } write(afterFullContentStyle.Render( - dv.style.InsertLine.Symbol.Render(ternary(leadingAfterEllipsis, "+…", "+ ")) + - dv.style.InsertLine.Code.Width(dv.codeWidth+btoi(dv.extraColOnAfter)).Render(afterContent), + dv.style.InsertLine.Symbol.Render(ternary(leadingEllipsis, "+…", "+ ")) + + dv.style.InsertLine.Code.Width(dv.codeWidth+btoi(dv.extraColOnAfter)).Render(content), )) afterLine++ } @@ -613,3 +634,40 @@ func (dv *DiffView) lineStyleForType(t udiff.OpKind) LineStyle { return dv.style.MissingLine } } + +func (dv *DiffView) hightlightCode(source string, bgColor color.Color) string { + if dv.chromaStyle == nil { + return source + } + + l := dv.getChromaLexer(source) + f := dv.getChromaFormatter(bgColor) + + it, err := l.Tokenise(nil, source) + if err != nil { + return source + } + + var b strings.Builder + if err := f.Format(&b, dv.chromaStyle, it); err != nil { + return source + } + return b.String() +} + +func (dv *DiffView) getChromaLexer(source string) chroma.Lexer { + l := lexers.Match(dv.before.path) + if l == nil { + l = lexers.Analyse(source) + } + if l == nil { + l = lexers.Fallback + } + return chroma.Coalesce(l) +} + +func (dv *DiffView) getChromaFormatter(gbColor color.Color) chroma.Formatter { + return chromaFormatter{ + bgColor: gbColor, + } +} diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index 4e2e68fa962c089d3ecfd7b83d64fdd8cb893eea..bc70d8ce5f3aae6c0f3b3729c81bb4b4dbe16ae0 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -6,6 +6,7 @@ import ( "strings" "testing" + "github.com/alecthomas/chroma/v2/styles" "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/x/exp/golden" "github.com/opencode-ai/opencode/internal/exp/diffview" @@ -87,12 +88,22 @@ var ( After("main.go", TestMultipleHunksAfter). Width(120) } + NoSyntaxHighlightFunc = func(dv *diffview.DiffView) *diffview.DiffView { + return dv. + Before("main.go", TestMultipleHunksBefore). + After("main.go", TestMultipleHunksAfter). + ChromaStyle(nil) + } LightModeFunc = func(dv *diffview.DiffView) *diffview.DiffView { - return dv.Style(diffview.DefaultLightStyle) + return dv. + Style(diffview.DefaultLightStyle). + ChromaStyle(styles.Get("catppuccin-latte")) } DarkModeFunc = func(dv *diffview.DiffView) *diffview.DiffView { - return dv.Style(diffview.DefaultDarkStyle) + return dv. + Style(diffview.DefaultDarkStyle). + ChromaStyle(styles.Get("catppuccin-macchiato")) } LayoutFuncs = TestFuncs{ @@ -107,6 +118,7 @@ var ( "Narrow": NarrowFunc, "SmallWidth": SmallWidthFunc, "LargeWidth": LargeWidthFunc, + "NoSyntaxHighlight": NoSyntaxHighlightFunc, } ThemeFuncs = TestFuncs{ "LightMode": LightModeFunc, @@ -123,8 +135,8 @@ func TestDiffView(t *testing.T) { t.Run(themeName, func(t *testing.T) { dv := diffview.New() dv = layoutFunc(dv) - dv = behaviorFunc(dv) dv = themeFunc(dv) + dv = behaviorFunc(dv) output := dv.String() golden.RequireEqual(t, []byte(output)) @@ -149,7 +161,8 @@ func TestDiffViewTabs(t *testing.T) { dv := diffview.New(). Before("main.go", TestTabsBefore). After("main.go", TestTabsAfter). - Style(diffview.DefaultLightStyle) + Style(diffview.DefaultLightStyle). + ChromaStyle(styles.Get("catppuccin-latte")) dv = layoutFunc(dv) output := dv.String() @@ -171,7 +184,8 @@ func TestDiffViewWidth(t *testing.T) { Before("main.go", TestMultipleHunksBefore). After("main.go", TestMultipleHunksAfter). Width(width). - Style(diffview.DefaultLightStyle) + Style(diffview.DefaultLightStyle). + ChromaStyle(styles.Get("catppuccin-latte")) dv = layoutFunc(dv) output := dv.String() @@ -193,7 +207,8 @@ func TestDiffViewHeight(t *testing.T) { Before("main.go", TestMultipleHunksBefore). After("main.go", TestMultipleHunksAfter). Height(height). - Style(diffview.DefaultLightStyle) + Style(diffview.DefaultLightStyle). + ChromaStyle(styles.Get("catppuccin-latte")) dv = layoutFunc(dv) output := dv.String() @@ -215,6 +230,7 @@ func TestDiffViewXOffset(t *testing.T) { Before("main.go", TestDefaultBefore). After("main.go", TestDefaultAfter). Style(diffview.DefaultLightStyle). + ChromaStyle(styles.Get("catppuccin-latte")). Width(60). XOffset(xOffset) dv = layoutFunc(dv) @@ -238,6 +254,7 @@ func TestDiffViewYOffset(t *testing.T) { Before("main.go", TestMultipleHunksBefore). After("main.go", TestMultipleHunksAfter). Style(diffview.DefaultLightStyle). + ChromaStyle(styles.Get("catppuccin-latte")). Height(5). YOffset(yOffset) dv = layoutFunc(dv) From c681805c73b835dae0eab0156526f0bb90ea2693 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 12 Jun 2025 15:52:51 -0300 Subject: [PATCH 43/64] test(diffview): update golden files for syntax highlighting --- .../Split/CustomContextLines/DarkMode.golden | 24 ++++++++--------- .../Split/CustomContextLines/LightMode.golden | 24 ++++++++--------- .../Split/Default/DarkMode.golden | 10 +++---- .../Split/Default/LightMode.golden | 10 +++---- .../Split/LargeWidth/DarkMode.golden | 20 +++++++------- .../Split/LargeWidth/LightMode.golden | 20 +++++++------- .../Split/MultipleHunks/DarkMode.golden | 20 +++++++------- .../Split/MultipleHunks/LightMode.golden | 20 +++++++------- .../TestDiffView/Split/Narrow/DarkMode.golden | 6 ++--- .../Split/Narrow/LightMode.golden | 6 ++--- .../Split/NoLineNumbers/DarkMode.golden | 10 +++---- .../Split/NoLineNumbers/LightMode.golden | 10 +++---- .../Split/NoSyntaxHighlight/DarkMode.golden | 15 +++++++++++ .../Split/NoSyntaxHighlight/LightMode.golden | 15 +++++++++++ .../Split/SmallWidth/DarkMode.golden | 20 +++++++------- .../Split/SmallWidth/LightMode.golden | 20 +++++++------- .../CustomContextLines/DarkMode.golden | 26 +++++++++---------- .../CustomContextLines/LightMode.golden | 26 +++++++++---------- .../Unified/Default/DarkMode.golden | 12 ++++----- .../Unified/Default/LightMode.golden | 12 ++++----- .../Unified/LargeWidth/DarkMode.golden | 22 ++++++++-------- .../Unified/LargeWidth/LightMode.golden | 22 ++++++++-------- .../Unified/MultipleHunks/DarkMode.golden | 22 ++++++++-------- .../Unified/MultipleHunks/LightMode.golden | 22 ++++++++-------- .../Unified/Narrow/DarkMode.golden | 12 ++++----- .../Unified/Narrow/LightMode.golden | 12 ++++----- .../Unified/NoLineNumbers/DarkMode.golden | 12 ++++----- .../Unified/NoLineNumbers/LightMode.golden | 12 ++++----- .../Unified/NoSyntaxHighlight/DarkMode.golden | 16 ++++++++++++ .../NoSyntaxHighlight/LightMode.golden | 16 ++++++++++++ .../Unified/SmallWidth/DarkMode.golden | 22 ++++++++-------- .../Unified/SmallWidth/LightMode.golden | 22 ++++++++-------- .../Split/HeightOf004.golden | 2 +- .../Split/HeightOf005.golden | 4 +-- .../Split/HeightOf006.golden | 6 ++--- .../Split/HeightOf007.golden | 8 +++--- .../Split/HeightOf008.golden | 8 +++--- .../Split/HeightOf009.golden | 10 +++---- .../Split/HeightOf010.golden | 10 +++---- .../Split/HeightOf011.golden | 12 ++++----- .../Split/HeightOf012.golden | 12 ++++----- .../Split/HeightOf013.golden | 14 +++++----- .../Split/HeightOf014.golden | 16 ++++++------ .../Split/HeightOf015.golden | 20 +++++++------- .../Split/HeightOf016.golden | 20 +++++++------- .../Split/HeightOf017.golden | 20 +++++++------- .../Split/HeightOf018.golden | 20 +++++++------- .../Split/HeightOf019.golden | 20 +++++++------- .../Split/HeightOf020.golden | 20 +++++++------- .../Unified/HeightOf004.golden | 2 +- .../Unified/HeightOf005.golden | 4 +-- .../Unified/HeightOf006.golden | 6 ++--- .../Unified/HeightOf007.golden | 8 +++--- .../Unified/HeightOf008.golden | 8 +++--- .../Unified/HeightOf009.golden | 10 +++---- .../Unified/HeightOf010.golden | 10 +++---- .../Unified/HeightOf011.golden | 12 ++++----- .../Unified/HeightOf012.golden | 12 ++++----- .../Unified/HeightOf013.golden | 14 +++++----- .../Unified/HeightOf014.golden | 16 ++++++------ .../Unified/HeightOf015.golden | 18 ++++++------- .../Unified/HeightOf016.golden | 22 ++++++++-------- .../Unified/HeightOf017.golden | 22 ++++++++-------- .../Unified/HeightOf018.golden | 22 ++++++++-------- .../Unified/HeightOf019.golden | 22 ++++++++-------- .../Unified/HeightOf020.golden | 22 ++++++++-------- .../testdata/TestDiffViewTabs/Split.golden | 20 +++++++------- .../testdata/TestDiffViewTabs/Unified.golden | 22 ++++++++-------- .../TestDiffViewWidth/Split/WidthOf011.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf013.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf014.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf015.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf016.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf017.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf018.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf019.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf020.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf021.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf022.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf023.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf024.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf025.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf026.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf027.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf028.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf029.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf030.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf031.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf032.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf033.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf034.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf035.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf036.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf037.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf038.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf039.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf040.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf041.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf042.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf043.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf044.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf045.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf046.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf047.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf048.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf049.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf050.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf051.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf052.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf053.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf054.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf055.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf056.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf057.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf058.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf059.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf060.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf061.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf062.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf063.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf064.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf065.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf066.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf067.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf068.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf069.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf070.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf071.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf072.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf073.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf074.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf075.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf076.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf077.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf078.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf079.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf080.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf081.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf082.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf083.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf084.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf085.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf086.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf087.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf088.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf089.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf090.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf091.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf092.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf093.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf094.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf095.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf096.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf097.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf098.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf099.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf100.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf101.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf102.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf103.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf104.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf105.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf106.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf107.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf108.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf109.golden | 20 +++++++------- .../TestDiffViewWidth/Split/WidthOf110.golden | 20 +++++++------- .../Unified/WidthOf011.golden | 22 ++++++++-------- .../Unified/WidthOf012.golden | 22 ++++++++-------- .../Unified/WidthOf013.golden | 22 ++++++++-------- .../Unified/WidthOf014.golden | 22 ++++++++-------- .../Unified/WidthOf015.golden | 22 ++++++++-------- .../Unified/WidthOf016.golden | 22 ++++++++-------- .../Unified/WidthOf017.golden | 22 ++++++++-------- .../Unified/WidthOf018.golden | 22 ++++++++-------- .../Unified/WidthOf019.golden | 22 ++++++++-------- .../Unified/WidthOf020.golden | 22 ++++++++-------- .../Unified/WidthOf021.golden | 22 ++++++++-------- .../Unified/WidthOf022.golden | 22 ++++++++-------- .../Unified/WidthOf023.golden | 22 ++++++++-------- .../Unified/WidthOf024.golden | 22 ++++++++-------- .../Unified/WidthOf025.golden | 22 ++++++++-------- .../Unified/WidthOf026.golden | 22 ++++++++-------- .../Unified/WidthOf027.golden | 22 ++++++++-------- .../Unified/WidthOf028.golden | 22 ++++++++-------- .../Unified/WidthOf029.golden | 22 ++++++++-------- .../Unified/WidthOf030.golden | 22 ++++++++-------- .../Unified/WidthOf031.golden | 22 ++++++++-------- .../Unified/WidthOf032.golden | 22 ++++++++-------- .../Unified/WidthOf033.golden | 22 ++++++++-------- .../Unified/WidthOf034.golden | 22 ++++++++-------- .../Unified/WidthOf035.golden | 22 ++++++++-------- .../Unified/WidthOf036.golden | 22 ++++++++-------- .../Unified/WidthOf037.golden | 22 ++++++++-------- .../Unified/WidthOf038.golden | 22 ++++++++-------- .../Unified/WidthOf039.golden | 22 ++++++++-------- .../Unified/WidthOf040.golden | 22 ++++++++-------- .../Unified/WidthOf041.golden | 22 ++++++++-------- .../Unified/WidthOf042.golden | 22 ++++++++-------- .../Unified/WidthOf043.golden | 22 ++++++++-------- .../Unified/WidthOf044.golden | 22 ++++++++-------- .../Unified/WidthOf045.golden | 22 ++++++++-------- .../Unified/WidthOf046.golden | 22 ++++++++-------- .../Unified/WidthOf047.golden | 22 ++++++++-------- .../Unified/WidthOf048.golden | 22 ++++++++-------- .../Unified/WidthOf049.golden | 22 ++++++++-------- .../Unified/WidthOf050.golden | 22 ++++++++-------- .../Unified/WidthOf051.golden | 22 ++++++++-------- .../Unified/WidthOf052.golden | 22 ++++++++-------- .../Unified/WidthOf053.golden | 22 ++++++++-------- .../Unified/WidthOf054.golden | 22 ++++++++-------- .../Unified/WidthOf055.golden | 22 ++++++++-------- .../Unified/WidthOf056.golden | 22 ++++++++-------- .../Unified/WidthOf057.golden | 22 ++++++++-------- .../Unified/WidthOf058.golden | 22 ++++++++-------- .../Unified/WidthOf059.golden | 22 ++++++++-------- .../Unified/WidthOf060.golden | 22 ++++++++-------- .../Split/XOffsetOf00.golden | 10 +++---- .../Split/XOffsetOf01.golden | 10 +++---- .../Split/XOffsetOf02.golden | 10 +++---- .../Split/XOffsetOf03.golden | 10 +++---- .../Split/XOffsetOf04.golden | 10 +++---- .../Split/XOffsetOf05.golden | 10 +++---- .../Split/XOffsetOf06.golden | 10 +++---- .../Split/XOffsetOf07.golden | 10 +++---- .../Split/XOffsetOf08.golden | 10 +++---- .../Split/XOffsetOf09.golden | 10 +++---- .../Split/XOffsetOf10.golden | 10 +++---- .../Split/XOffsetOf11.golden | 10 +++---- .../Split/XOffsetOf12.golden | 10 +++---- .../Split/XOffsetOf13.golden | 10 +++---- .../Split/XOffsetOf14.golden | 10 +++---- .../Split/XOffsetOf15.golden | 10 +++---- .../Split/XOffsetOf16.golden | 10 +++---- .../Split/XOffsetOf17.golden | 10 +++---- .../Split/XOffsetOf18.golden | 10 +++---- .../Split/XOffsetOf19.golden | 10 +++---- .../Split/XOffsetOf20.golden | 10 +++---- .../Unified/XOffsetOf00.golden | 12 ++++----- .../Unified/XOffsetOf01.golden | 14 +++++----- .../Unified/XOffsetOf02.golden | 14 +++++----- .../Unified/XOffsetOf03.golden | 14 +++++----- .../Unified/XOffsetOf04.golden | 14 +++++----- .../Unified/XOffsetOf05.golden | 14 +++++----- .../Unified/XOffsetOf06.golden | 14 +++++----- .../Unified/XOffsetOf07.golden | 14 +++++----- .../Unified/XOffsetOf08.golden | 14 +++++----- .../Unified/XOffsetOf09.golden | 14 +++++----- .../Unified/XOffsetOf10.golden | 14 +++++----- .../Unified/XOffsetOf11.golden | 14 +++++----- .../Unified/XOffsetOf12.golden | 14 +++++----- .../Unified/XOffsetOf13.golden | 14 +++++----- .../Unified/XOffsetOf14.golden | 14 +++++----- .../Unified/XOffsetOf15.golden | 14 +++++----- .../Unified/XOffsetOf16.golden | 14 +++++----- .../Unified/XOffsetOf17.golden | 14 +++++----- .../Unified/XOffsetOf18.golden | 14 +++++----- .../Unified/XOffsetOf19.golden | 14 +++++----- .../Unified/XOffsetOf20.golden | 14 +++++----- .../Split/YOffsetOf00.golden | 4 +-- .../Split/YOffsetOf01.golden | 6 ++--- .../Split/YOffsetOf02.golden | 8 +++--- .../Split/YOffsetOf03.golden | 6 ++--- .../Split/YOffsetOf04.golden | 6 ++--- .../Split/YOffsetOf05.golden | 4 +-- .../Split/YOffsetOf06.golden | 4 +-- .../Split/YOffsetOf07.golden | 4 +-- .../Split/YOffsetOf08.golden | 4 +-- .../Split/YOffsetOf09.golden | 6 ++--- .../Split/YOffsetOf10.golden | 8 +++--- .../Split/YOffsetOf11.golden | 8 +++--- .../Split/YOffsetOf12.golden | 6 ++--- .../Split/YOffsetOf13.golden | 4 +-- .../Split/YOffsetOf14.golden | 2 +- .../Unified/YOffsetOf00.golden | 4 +-- .../Unified/YOffsetOf01.golden | 6 ++--- .../Unified/YOffsetOf02.golden | 8 +++--- .../Unified/YOffsetOf03.golden | 6 ++--- .../Unified/YOffsetOf04.golden | 6 ++--- .../Unified/YOffsetOf05.golden | 4 +-- .../Unified/YOffsetOf06.golden | 4 +-- .../Unified/YOffsetOf07.golden | 4 +-- .../Unified/YOffsetOf08.golden | 4 +-- .../Unified/YOffsetOf09.golden | 6 ++--- .../Unified/YOffsetOf10.golden | 6 ++--- .../Unified/YOffsetOf11.golden | 10 +++---- .../Unified/YOffsetOf12.golden | 8 +++--- .../Unified/YOffsetOf13.golden | 6 ++--- .../Unified/YOffsetOf14.golden | 4 +-- .../Unified/YOffsetOf15.golden | 2 +- 290 files changed, 2422 insertions(+), 2360 deletions(-) create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/NoSyntaxHighlight/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Split/NoSyntaxHighlight/LightMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Unified/NoSyntaxHighlight/DarkMode.golden create mode 100644 internal/exp/diffview/testdata/TestDiffView/Unified/NoSyntaxHighlight/LightMode.golden diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden index 9e5916468e51758ed037f9203a9bd9fd2a428e69..698ca85f639a3611eeb3964c3be994b66ea73bb1 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/DarkMode.golden @@ -1,16 +1,16 @@   …  @@ -1,13 +1,15 @@    …    -  1  package main   1  package main  +  1  package main   1  package main    2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  -  8  fmt.Println(getContent())   9  fmt.Println(getContent())  -  9  }  10  }  +  7  func main() {   8  func main() {  +  8   fmt.Println(getContent())   9   fmt.Println(getContent())  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden index 62d07f55af461a1b611c00199338265bb1af91c4..e548d553e1fc3bfb41c7b84bcb5a3f813cd7ae66 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/CustomContextLines/LightMode.golden @@ -1,16 +1,16 @@   …  @@ -1,13 +1,15 @@    …    -  1  package main   1  package main  +  1  package main   1  package main    2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  -  8  fmt.Println(getContent())   9  fmt.Println(getContent())  -  9  }  10  }  +  7  func main() {   8  func main() {  +  8   fmt.Println(getContent())   9   fmt.Println(getContent())  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden index 3d750b4e1ecafd7d0c1dd7648876fd1634b1f9cf..b00b47a18b46163593bcb105cea18dbb4661f966 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Default/DarkMode.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5  )   5  )  +  5  )   5  )    6     6    -  7  func main() {   7  func main() {  -  8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"  -       9 +  fmt.Println(content)  -  9  }  10  }  \ No newline at end of file +  7  func main() {   7  func main() {  +  8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"  +       9 +  fmt.Println(content)  +  9  }  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden index 949a3f02dfe832ebc0463e6da038a96f4ba15473..1d5472609c01435393837ff441dcf9834ae561ae 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Default/LightMode.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5  )   5  )  +  5  )   5  )    6     6    -  7  func main() {   7  func main() {  -  8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"  -       9 +  fmt.Println(content)  -  9  }  10  }  \ No newline at end of file +  7  func main() {   7  func main() {  +  8 -  fmt.Println("Hello, world!")   8 +  content := "Hello, world!"  +       9 +  fmt.Println(content)  +  9  }  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden index b7e699e4460fa9db9db6e45779bb5204b22dec27..5058ab2079c8c27905c07929ec1b854549dfa9f0 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/DarkMode.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden index 731461ee0a7abb1999946259a56694429ded9b9a..54be547a1c74b34e4bfc1fd3ee84d946bd7603d5 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/LargeWidth/LightMode.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden index c69efe614a04aba3f680d6cf9af91112af13560b..818863adc9081bcd2b66b0029f3a72a994d618e5 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/DarkMode.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden index e22a98ecf771bc651d26af440a361286dcb167f7..376bae2594d8e175cdd84b90846fe43c639c4d69 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/MultipleHunks/LightMode.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden index bc4ad0d0f01fd89833feddd4d0af1c32c6a635c8..5b5a7815e5a6ca092036595df1a3cb30d644e8c9 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/DarkMode.golden @@ -1,4 +1,4 @@  …  @@ -1,3 +1,3 @@   …    - 1 - a  1 + d  - 2 - b  2 + e  - 3 - c  3 + f  \ No newline at end of file + 1 - a  1 + d  + 2 - b  2 + e  + 3 - c  3 + f  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden index 287773c442a2a8a3987661a26e8e3596ccdfe27d..4ece6dca5318253fbc8af76e89a3fe41fc87009b 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/Narrow/LightMode.golden @@ -1,4 +1,4 @@  …  @@ -1,3 +1,3 @@   …    - 1 - a  1 + d  - 2 - b  2 + e  - 3 - c  3 + f  \ No newline at end of file + 1 - a  1 + d  + 2 - b  2 + e  + 3 - c  3 + f  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden index 615a74ccea34ea981a523d94fc709c74c21954c7..ce013bf466a000e0d7b8256a1d978e8cf48e89ab 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/DarkMode.golden @@ -1,7 +1,7 @@  @@ -5,5 +5,6 @@     - )  )  + )  )       - func main() {  func main() {  --  fmt.Println("Hello, world!") +  content := "Hello, world!"  -  +  fmt.Println(content)  - }  }  \ No newline at end of file + func main() {  func main() {  +-  fmt.Println("Hello, world!") +  content := "Hello, world!"  +  +  fmt.Println(content)  + }  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden index b3df58f0576c5c62f22fe79bf4040326bdbec7e6..241d60f8793bba0fb2819220caa6259c1124edb3 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/NoLineNumbers/LightMode.golden @@ -1,7 +1,7 @@  @@ -5,5 +5,6 @@     - )  )  + )  )       - func main() {  func main() {  --  fmt.Println("Hello, world!") +  content := "Hello, world!"  -  +  fmt.Println(content)  - }  }  \ No newline at end of file + func main() {  func main() {  +-  fmt.Println("Hello, world!") +  content := "Hello, world!"  +  +  fmt.Println(content)  + }  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/NoSyntaxHighlight/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/NoSyntaxHighlight/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..c69efe614a04aba3f680d6cf9af91112af13560b --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/NoSyntaxHighlight/DarkMode.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/NoSyntaxHighlight/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/NoSyntaxHighlight/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..e22a98ecf771bc651d26af440a361286dcb167f7 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Split/NoSyntaxHighlight/LightMode.golden @@ -0,0 +1,15 @@ +  …  @@ -2,6 +2,7 @@    …    +  2     2    +  3  import (   3  import (  +  4  "fmt"   4  "fmt"  +       5 +  "strings"  +  5  )   6  )  +  6     7    +  7  func main() {   8  func main() {  +  …  @@ -9,5 +10,6 @@    …    +  9  }  10  }  + 10    11    + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden index 1c8e9fa4b8a906b6baaf787501fa0d6d41e5595c..c3744b0a3b97baa0404ad5830ff7893105c0db9d 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/DarkMode.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 …  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getConte… 12  func getConte… - 12 -  return "H… 13 +  content :… -      14 +  return co… - 13  }  15  }  \ No newline at end of file + 11  func getConte… 12  func getConte… + 12 -  return "H… 13 +  content :… +      14 +  return co… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden index d0ca9dd0d86109752758fb32f20222a26b265b9c..7efec8881d7252d4e0f5a444f372a19e12e5e035 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Split/SmallWidth/LightMode.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 …  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getConte… 12  func getConte… - 12 -  return "H… 13 +  content :… -      14 +  return co… - 13  }  15  }  \ No newline at end of file + 11  func getConte… 12  func getConte… + 12 -  return "H… 13 +  content :… +      14 +  return co… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden index 35da9718499b2acf8c88bf12a338eb2f7563e8a3..94d5b96e6ead9e58f58cead608bc24571d712d50 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/DarkMode.golden @@ -1,17 +1,17 @@   …   …  @@ -1,13 +1,15 @@   -  1   1  package main  +  1   1  package main    2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  -  8   9  fmt.Println(getContent())  -  9  10  }  +  7   8  func main() {  +  8   9   fmt.Println(getContent())  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden index f46db4b259c797f76955aabe369d38b9306a9ee6..769aef3900a021bec59a59051c537562c78c0f95 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/CustomContextLines/LightMode.golden @@ -1,17 +1,17 @@   …   …  @@ -1,13 +1,15 @@   -  1   1  package main  +  1   1  package main    2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  -  8   9  fmt.Println(getContent())  -  9  10  }  +  7   8  func main() {  +  8   9   fmt.Println(getContent())  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden index 9579770c5db427b2f7a062a0572dcac142f1c03a..508754f0c6a3493d1efa006360eaeeacde13baea 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/DarkMode.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5  )  +  5   5  )    6   6    -  7   7  func main() {  -  8    -  fmt.Println("Hello, world!")  -     8 +  content := "Hello, world!"  -     9 +  fmt.Println(content)  -  9  10  }  \ No newline at end of file +  7   7  func main() {  +  8    -  fmt.Println("Hello, world!")  +     8 +  content := "Hello, world!"  +     9 +  fmt.Println(content)  +  9  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden index 51e44bba27edb87f7867c8f431d0454fdf3c62ba..6532d31fe0f28f9a7619af543fc10848f438f4c9 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Default/LightMode.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5  )  +  5   5  )    6   6    -  7   7  func main() {  -  8    -  fmt.Println("Hello, world!")  -     8 +  content := "Hello, world!"  -     9 +  fmt.Println(content)  -  9  10  }  \ No newline at end of file +  7   7  func main() {  +  8    -  fmt.Println("Hello, world!")  +     8 +  content := "Hello, world!"  +     9 +  fmt.Println(content)  +  9  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden index 1eae42a5bb9a03d64703a4620a0c1810c332cdab..c0be6012af274bc1c746a26746d4e29473493ef8 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/DarkMode.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden index 1a2bffc13aef1ca84426076417ca75d1fa7bffbe..f1700f00f23dc0960a12e5cdf37281e922d8fe2d 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/LargeWidth/LightMode.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden index 18c9c363f3952bda8537f96496405edce5684485..bd1232d8439ec0f20601793817093304b37b91c4 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/DarkMode.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden index 285caf3659ba538e0c12da796836045311ecad67..4833a8a0263aada505f2e115c5dfb9fc469def67 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/MultipleHunks/LightMode.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden index 8de3cebc908067f19420536239a26d8b513f1407..586dcd0a0ad6b4dc2963f8d2064db1e54f917b30 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/DarkMode.golden @@ -1,7 +1,7 @@  …  …  @@ -1,3 +1,3 @@   - 1    - a  - 2    - b  - 3    - c  -    1 + d  -    2 + e  -    3 + f  \ No newline at end of file + 1    - a  + 2    - b  + 3    - c  +    1 + d  +    2 + e  +    3 + f  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden index 5ba43a7d9161a4e96349280a41709d52501d60bc..ec946344674b34b4c4530bedb1d3307ca364bc8f 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/Narrow/LightMode.golden @@ -1,7 +1,7 @@  …  …  @@ -1,3 +1,3 @@   - 1    - a  - 2    - b  - 3    - c  -    1 + d  -    2 + e  -    3 + f  \ No newline at end of file + 1    - a  + 2    - b  + 3    - c  +    1 + d  +    2 + e  +    3 + f  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden index 817b0ef6562e0c8d434babdd40cb2219fa188575..23050d7964d12cbb9a4c7529d26173f5a6efd174 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/DarkMode.golden @@ -1,8 +1,8 @@  @@ -5,5 +5,6 @@   - )  + )     - func main() {  --  fmt.Println("Hello, world!")  -+  content := "Hello, world!"  -+  fmt.Println(content)  - }  \ No newline at end of file + func main() {  +-  fmt.Println("Hello, world!")  ++  content := "Hello, world!"  ++  fmt.Println(content)  + }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden index b3955c92994f9561c035631a6b1c99f3f7695a14..dcb98a08bb11c35eb6b1d4288ebca3e47e285948 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/NoLineNumbers/LightMode.golden @@ -1,8 +1,8 @@  @@ -5,5 +5,6 @@   - )  + )     - func main() {  --  fmt.Println("Hello, world!")  -+  content := "Hello, world!"  -+  fmt.Println(content)  - }  \ No newline at end of file + func main() {  +-  fmt.Println("Hello, world!")  ++  content := "Hello, world!"  ++  fmt.Println(content)  + }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/NoSyntaxHighlight/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/NoSyntaxHighlight/DarkMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..18c9c363f3952bda8537f96496405edce5684485 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/NoSyntaxHighlight/DarkMode.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/NoSyntaxHighlight/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/NoSyntaxHighlight/LightMode.golden new file mode 100644 index 0000000000000000000000000000000000000000..285caf3659ba538e0c12da796836045311ecad67 --- /dev/null +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/NoSyntaxHighlight/LightMode.golden @@ -0,0 +1,16 @@ +  …   …  @@ -2,6 +2,7 @@   +  2   2    +  3   3  import (  +  4   4  "fmt"  +     5 +  "strings"  +  5   6  )  +  6   7    +  7   8  func main() {  +  …   …  @@ -9,5 +10,6 @@   +  9  10  }  + 10  11    + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden index 19b8e852925c5fa1377e9fa3a2460e3ccc466357..773547de65905ab8872164be01584770da29d475 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/DarkMode.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUppe… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUppe… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden index 1fa51a9e2840438aa94f306a294a82d22d0f5482..bc1c6c04db45d3d8dfddf23440dcfa430cec7fb0 100644 --- a/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden +++ b/internal/exp/diffview/testdata/TestDiffView/Unified/SmallWidth/LightMode.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUppe… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUppe… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf004.golden index fca802e8b1cb57de2887cffadba3771a68d6d10c..b42965be972ce8b096db1508514e9d494a57bad7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf004.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf004.golden @@ -1,4 +1,4 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  +  3  import (   3  import (    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf005.golden index 6515d553ee9c3077bcf503e96fc6fbaad662bfd4..8d4a293fdd17ce5cbd8d709656573105a8cc7b09 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf005.golden @@ -1,5 +1,5 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf006.golden index 1112cc8316a3f084872381f3d2e18d4c4e61ef30..67d30fec443bdeea7b49eba4ab346603baba7670 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf006.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf006.golden @@ -1,6 +1,6 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf007.golden index 85dcb7a4e8351a549d717b0d5f5ff87baba89c04..ba19bebf9686a530e87e11d090ad4f04f4ade5fb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf007.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf007.golden @@ -1,7 +1,7 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf008.golden index b64d596e6eaa36aa837a0be6cde7aa5cbe5e2d0a..edb4eb9aaa24d28523498661d3d802edb62b243d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf008.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf008.golden @@ -1,8 +1,8 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7      …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf009.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf009.golden index 73b0d2d97c02dd5faf92c6a1cdad369260728fcf..fc1998f1d33f0299550660b368de1e4d720c2ed0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf009.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf009.golden @@ -1,9 +1,9 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf010.golden index 9b0cc01038150ecba239f81876ac4ea693729ef7..10474f0884137006961cc6e5bfddf6d001c5561d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf010.golden @@ -1,10 +1,10 @@   …  @@ -2,6 +2,7 @@    …      2  [48;2;241;239;239m   2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …      …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf011.golden index 0284e20729c6cae98d1115eb8684a31415739883..0e25a5ef5279cf29cfa1eb24831bc062a8bb6254 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf011.golden @@ -1,11 +1,11 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf012.golden index a8b368aa5c64c7fb5b2de195fdccd7704c61a476..f178ad9ab9285b83c0efc9b207379a61f16ec7a9 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf012.golden @@ -1,12 +1,12 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11      …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf013.golden index b0993db7fd6e53f144e07a3db91940ed0ef529c6..edcfcd2f89adef8525a8acee4d3ce9e8d1ffd605 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf013.golden @@ -1,13 +1,13 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  + 11  func getContent() string {  12  func getContent() string {    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf014.golden index 63caade9138ef74cf5abe6d9e85a97e1c7307519..6ff0ca309b149aa73bfaec8ec0debdaa253cecfe 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf014.golden @@ -1,14 +1,14 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf015.golden index e22a98ecf771bc651d26af440a361286dcb167f7..376bae2594d8e175cdd84b90846fe43c639c4d69 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf015.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf015.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf016.golden index 70ca3fc122c17259015d6614d3056292cc0bbe39..6b79b752f668a21205c772356ffb1af1d6c88546 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf016.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf016.golden @@ -1,16 +1,16 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }             \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf017.golden index c055ca2cbf739903fba0bccf0ded1e147b1751f7..81086126879f38feda13147520b4ced931441d67 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf017.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf017.golden @@ -1,17 +1,17 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }                        \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf018.golden index b512e1810c53da0a889edc95c4dde3c655f6c28c..0ced2af062c5ddfa3179501b02ea58c549491103 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf018.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf018.golden @@ -1,18 +1,18 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }                                   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf019.golden index 2b209f23854f5db9107401558b06b60f588b3a49..e94c36d1f801e0dae9ae22c6758638e692aa5afa 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf019.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf019.golden @@ -1,18 +1,18 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }                                   diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf020.golden index 2ab516a4ab5957130c0e7274b001189d50b35a32..0c20bb81d81d8a4a000f601fa75a1f148610c06d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf020.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/HeightOf020.golden @@ -1,18 +1,18 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }                                   diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf004.golden index 9de759b3ee15fd074cab28ee2866ad5b48f5ec66..c25c0f42f2fce40ac113946407cfee70cb597ebd 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf004.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf004.golden @@ -1,4 +1,4 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  +  3   3  import (    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf005.golden index f73f2e5107400bb11415c48d3b8446009f22373d..e11e6df667cfa9dc3d909f30fef8895c16dc85c2 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf005.golden @@ -1,5 +1,5 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  +  3   3  import (  +  4   4   "fmt"    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf006.golden index 119066f8acbae929a9555c32a338116e140fc724..d6a7952a8e59e13f6443a7430a08d38245963daa 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf006.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf006.golden @@ -1,6 +1,6 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf007.golden index 251adc55165c98fcf8cadd7d8e5214a15fda7e33..f04437d8e721cd83ccac5d83d7ece23aea2deca9 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf007.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf007.golden @@ -1,7 +1,7 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf008.golden index c5e77f40c2fe54f0456ac88fb3511e0cb9f6db99..9bc97685b06c45886e3e51aa853e6979c13535f4 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf008.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf008.golden @@ -1,8 +1,8 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7      …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf009.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf009.golden index f6d733e2c963ff0739cfdfa86d1544f64a38452a..b644669ac3c44b02fa524df27a79ca5fa43ebc5f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf009.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf009.golden @@ -1,9 +1,9 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf010.golden index 03288eb048726d484e1b41dddf7bf9cef64ea078..2c1730435a32cf3a5adfa6a0cd2b7096959d72cb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf010.golden @@ -1,10 +1,10 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@     …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf011.golden index 1285ef27e22ca7cb8db77be33b88544bc34448af..11933267d0e96a9d40847cc6ab63eb8a638c903f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf011.golden @@ -1,11 +1,11 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf012.golden index fd6fea0459398c72b70e78367cb41a03f71f109a..6f85a1321dafe076664f68bce0cfacc904bcf348 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf012.golden @@ -1,12 +1,12 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11      …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf013.golden index c3567a7095df72c0f74066c21f4c9e6d8e802aa9..9a40f2743bb130da78160e44804121046bfc2648 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf013.golden @@ -1,13 +1,13 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  + 11  12  func getContent() string {    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf014.golden index 64b13049fd0568077bd8599adf666ff85924caf8..92c873c53589db4d5dbb3d5823577ec0ea3c0525 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf014.golden @@ -1,14 +1,14 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  + 11  12  func getContent() string {  + 12    -  return "Hello, world!"    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf015.golden index 1ae8e47ea0ecbf64d831a09f1822d06ffba75ed6..a6c452786f6dd1a90b06af9565230a32a2f7fca9 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf015.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf015.golden @@ -1,15 +1,15 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf016.golden index 285caf3659ba538e0c12da796836045311ecad67..4833a8a0263aada505f2e115c5dfb9fc469def67 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf016.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf016.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf017.golden index 0953da169e133e86be984c7435c0413cd7952764..6a11e8c96fbf5917fb8fba209c6e08420042b50e 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf017.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf017.golden @@ -1,17 +1,17 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf018.golden index 697f92d3559b5eeaf2655fe6f5599795583e5f1b..e1679a274299677d72b8fde8f12f8900edb32244 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf018.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf018.golden @@ -1,18 +1,18 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }                    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf019.golden index 2457736daff4a9a3812f56d1e475889921fab870..e500ceed976da0ee572e015eba1e1908963ce0f2 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf019.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf019.golden @@ -1,19 +1,19 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }                             \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf020.golden index 83f47be1f89b3e7b346d105c346d8d5ad960fe72..89d701a43e2df3c14677ef4135dfebc7654eb3df 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf020.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/HeightOf020.golden @@ -1,19 +1,19 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }                             diff --git a/internal/exp/diffview/testdata/TestDiffViewTabs/Split.golden b/internal/exp/diffview/testdata/TestDiffViewTabs/Split.golden index 47ec287f0894851ff20b75d5f267e9733e30b497..55f9b83eb60b7d807d6573770c095f1fe4300380 100644 --- a/internal/exp/diffview/testdata/TestDiffViewTabs/Split.golden +++ b/internal/exp/diffview/testdata/TestDiffViewTabs/Split.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewTabs/Unified.golden b/internal/exp/diffview/testdata/TestDiffViewTabs/Unified.golden index 1f71e8a1bfad8219360784d1ef2893d2a86f3b41..744ba1f8400a69344016826ad10de5a72c540a0b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewTabs/Unified.golden +++ b/internal/exp/diffview/testdata/TestDiffViewTabs/Unified.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf011.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf011.golden index 502334c77d0f58af035bf4998cf69f0344309a0a..0a3c87cd5b70374bb983c3bbb131e38691d6f857 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf011.golden @@ -1,15 +1,15 @@   …  …  …     2    2   -  3    3   -  4    4   -      5 + -  5    6   +  3    3   +  4    4   +      5 + +  5    6     6    7   -  7    8   +  7    8     …  …  …   -  9   10   +  9   10    10   11   - 11   12   - 12 -  13 + -     14 + - 13   15   \ No newline at end of file + 11   12   + 12 -  13 + +     14 + + 13   15   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf013.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf013.golden index 7eda447090c6b85ca3502f7371afc57022c1b850..18784d5152179f7166a928d253b00515ff549dcf 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf013.golden @@ -1,15 +1,15 @@   …  …  …      2    2    -  3    3  … -  4    4  … -      5 + … -  5    6  ) +  3    3    +  4    4    +      5 +   +  5    6      6    7    -  7    8  … +  7    8      …  …  …    -  9   10  } +  9   10     10   11    - 11   12  … - 12 -  13 + … -     14 + … - 13   15  } \ No newline at end of file + 11   12    + 12 -  13 +   +     14 +   + 13   15    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf014.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf014.golden index caf23c7a2a5d9aa605db14b60e521c30ca4e56f4..92962575466205b1520bcb948bfbcf3d9040cd20 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf014.golden @@ -1,15 +1,15 @@   …  …  …      2     2    -  3  …  3  … -  4  …  4  … -       5 + … -  5  )  6  ) +  3  …  3  … +  4  …  4  … +       5 + … +  5  )  6  )   6     7    -  7  …  8  … +  7  …  8  …   …  …  …    -  9  } 10  } +  9  } 10  }  10    11    - 11  … 12  … - 12 - … 13 + … -      14 + … - 13  } 15  } \ No newline at end of file + 11  … 12  … + 12 - … 13 + … +      14 + … + 13  } 15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf015.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf015.golden index 659cd730961e5a3e8b9209eee543b2079a7ad2de..3e564c4e1b4224f1c1a95c4e459b14b989ed9211 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf015.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf015.golden @@ -1,15 +1,15 @@   …  …  …      2     2    -  3  …  3  i… -  4  …  4  … -       5 +  … -  5  )  6  )  +  3  …  3  …  +  4  …  4  …  +       5 + …  +  5  )  6  )    6     7    -  7  …  8  f… +  7  …  8  …    …  …  …    -  9  } 10  }  +  9  } 10  }   10    11    - 11  … 12  f… - 12 - … 13 +  … -      14 +  … - 13  } 15  }  \ No newline at end of file + 11  … 12  …  + 12 - … 13 + …  +      14 + …  + 13  } 15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf016.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf016.golden index ef8a363a37fbf919ae2411e086e6297d84abc3dd..73c32b5beb4fe882fee590f933ba30fc7df3f055 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf016.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf016.golden @@ -1,15 +1,15 @@   …  @…  …      2     2    -  3  i…  3  i… -  4  …  4  … -       5 +  … -  5  )   6  )  +  3  i…  3  i… +  4   …  4   … +       5 +  … +  5  )   6  )    6     7    -  7  f…  8  f… +  7  f…  8  f…   …  @…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  f… 12  f… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file + 11  f… 12  f… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf017.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf017.golden index b8e0ae759f76d18649f7792fbfd68480e184eeff..a0a56d1c19961775f7ae0b8471f2dd36be2898d6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf017.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf017.golden @@ -1,15 +1,15 @@   …  @…  …      2     2    -  3  i…  3  im… -  4  …  4  … -       5 +  … -  5  )   6  )  +  3  i…  3  i…  +  4   …  4   …  +       5 +  …  +  5  )   6  )    6     7    -  7  f…  8  fu… +  7  f…  8  f…    …  @…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  f… 12  fu… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file + 11  f… 12  f…  + 12 -  … 13 +  …  +      14 +  …  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf018.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf018.golden index df04245f6e8553a181ecad314bff57872e5fc88e..eaf9ba5140a00fbb67c689bf66cae5293464fbbd 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf018.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf018.golden @@ -1,15 +1,15 @@   …  @@…  …      2     2    -  3  im…  3  im… -  4  …  4  … -       5 +  … -  5  )   6  )  +  3  im…  3  im… +  4   …  4   … +       5 +  … +  5  )   6  )    6     7    -  7  fu…  8  fu… +  7  fu…  8  fu…   …  @@…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  fu… 12  fu… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file + 11  fu… 12  fu… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf019.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf019.golden index 4d092a8e67a39be0b827a58c8c2f58919e55921c..f2b48119efe04ce3650d2964df314d7a43fadd99 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf019.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf019.golden @@ -1,15 +1,15 @@   …  @@…  …      2     2    -  3  im…  3  imp… -  4  …  4  … -       5 +  … -  5  )   6  )  +  3  im…  3  im…  +  4   …  4   …  +       5 +  …  +  5  )   6  )    6     7    -  7  fu…  8  fun… +  7  fu…  8  fu…    …  @@…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  fu… 12  fun… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file + 11  fu… 12  fu…  + 12 -  … 13 +  …  +      14 +  …  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf020.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf020.golden index 715b049eb2afff0ad2e5667c39ea2b6943095edf..80faca00e90d24c17339877a2e96fee8363d195b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf020.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf020.golden @@ -1,15 +1,15 @@   …  @@ …  …      2     2    -  3  imp…  3  imp… -  4  …  4  … -       5 +  … -  5  )   6  )  +  3  imp…  3  imp… +  4   …  4   … +       5 +  … +  5  )   6  )    6     7    -  7  fun…  8  fun… +  7  fun…  8  fun…   …  @@ …  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  fun… 12  fun… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file + 11  fun… 12  fun… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf021.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf021.golden index 5683fcb58bacc835218a2ea38ab0c3f3d122cffb..ef6bbfffd814eb2ae28e1f399d78ebe9ea1c3b05 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf021.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf021.golden @@ -1,15 +1,15 @@   …  @@ …  …      2     2    -  3  imp…  3  impo… -  4  …  4  … -       5 +  … -  5  )   6  )  +  3  imp…  3  imp…  +  4   …  4   …  +       5 +  …  +  5  )   6  )    6     7    -  7  fun…  8  func… +  7  fun…  8  fun…    …  @@ …  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  fun… 12  func… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file + 11  fun… 12  fun…  + 12 -  … 13 +  …  +      14 +  …  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf022.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf022.golden index 30dd46b6cabf0f76f6b7142e5752117c9018f81b..9a3d74e5073f9229d4ff87cf0f54cc035804a87e 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf022.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf022.golden @@ -1,15 +1,15 @@   …  @@ -…  …      2     2    -  3  impo…  3  impo… -  4  …  4  … -       5 +  … -  5  )   6  )  +  3  impo…  3  impo… +  4   …  4   … +       5 +  … +  5  )   6  )    6     7    -  7  func…  8  func… +  7  func…  8  func…   …  @@ -…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func… 12  func… - 12 -  … 13 +  … -      14 +  … - 13  }  15  }  \ No newline at end of file + 11  func… 12  func… + 12 -  … 13 +  … +      14 +  … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf023.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf023.golden index bb7c9e917f28e363ae2bb5ebf19207ec2089bd4e..8b59e07438c73077b25e91e1aea95b0762278ead 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf023.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf023.golden @@ -1,15 +1,15 @@   …  @@ -…  …      2     2    -  3  impo…  3  impor… -  4  …  4  "… -       5 +  "… -  5  )   6  )  +  3  impo…  3  impo…  +  4   …  4   …  +       5 +  …  +  5  )   6  )    6     7    -  7  func…  8  func … +  7  func…  8  func…    …  @@ -…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func… 12  func … - 12 -  … 13 +  c… -      14 +  r… - 13  }  15  }  \ No newline at end of file + 11  func… 12  func…  + 12 -  … 13 +  …  +      14 +  …  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf024.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf024.golden index 4ddf59235fefa2be91a7d978b7f9b7a2b130547c..e9e963f6d68f39797652735946bba4d60f9bb07b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf024.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf024.golden @@ -1,15 +1,15 @@   …  @@ -2…  …      2     2    -  3  impor…  3  impor… -  4  "…  4  "… -       5 +  "… -  5  )   6  )  +  3  impor…  3  impor… +  4   "…  4   "… +       5 +  "… +  5  )   6  )    6     7    -  7  func …  8  func … +  7  func …  8  func …   …  @@ -9…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func … 12  func … - 12 -  r… 13 +  c… -      14 +  r… - 13  }  15  }  \ No newline at end of file + 11  func … 12  func … + 12 -  r… 13 +  c… +      14 +  r… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf025.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf025.golden index 0c5ee8b923134c00c43df76d3f85f302a760e1c0..88b14c368e9d758f73b170aedcc289665b323de5 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf025.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf025.golden @@ -1,15 +1,15 @@   …  @@ -2…  …      2     2    -  3  impor…  3  import… -  4  "…  4  "f… -       5 +  "s… -  5  )   6  )  +  3  impor…  3  impor…  +  4   "…  4   "…  +       5 +  "…  +  5  )   6  )    6     7    -  7  func …  8  func m… +  7  func …  8  func …    …  @@ -9…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func … 12  func g… - 12 -  r… 13 +  co… -      14 +  re… - 13  }  15  }  \ No newline at end of file + 11  func … 12  func …  + 12 -  r… 13 +  c…  +      14 +  r…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf026.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf026.golden index 11de5247c53a11bfb08922c82fc8d3a8f4a110b4..f1a03a44b153d125baea902647542eb268e04c85 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf026.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf026.golden @@ -1,15 +1,15 @@   …  @@ -2,…  …      2     2    -  3  import…  3  import… -  4  "f…  4  "f… -       5 +  "s… -  5  )   6  )  +  3  import…  3  import… +  4   "f…  4   "f… +       5 +  "s… +  5  )   6  )    6     7    -  7  func m…  8  func m… +  7  func m…  8  func m…   …  @@ -9,…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func g… 12  func g… - 12 -  re… 13 +  co… -      14 +  re… - 13  }  15  }  \ No newline at end of file + 11  func g… 12  func g… + 12 -  re… 13 +  co… +      14 +  re… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf027.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf027.golden index 269025e9ce89ce2ed97d863bb9223d1a374da97f..2be2ed4039296a08ca88ea742294c69fe328bb09 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf027.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf027.golden @@ -1,15 +1,15 @@   …  @@ -2,…  …      2     2    -  3  import…  3  import ( -  4  "f…  4  "fm… -       5 +  "st… -  5  )   6  )  +  3  import…  3  import…  +  4   "f…  4   "f…  +       5 +  "s…  +  5  )   6  )    6     7    -  7  func m…  8  func ma… +  7  func m…  8  func m…    …  @@ -9,…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func g… 12  func ge… - 12 -  re… 13 +  con… -      14 +  ret… - 13  }  15  }  \ No newline at end of file + 11  func g… 12  func g…  + 12 -  re… 13 +  co…  +      14 +  re…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf028.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf028.golden index bd6e917b2fabea1a818c2cc63dfee8ee62eb2c7e..ac729f74b19b2bed7b6c254aae945d6dcd9321af 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf028.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf028.golden @@ -1,15 +1,15 @@   …  @@ -2,6…  …      2     2    -  3  import (  3  import ( -  4  "fm…  4  "fm… -       5 +  "st… -  5  )   6  )  +  3  import (  3  import ( +  4   "fm…  4   "fm… +       5 +  "st… +  5  )   6  )    6     7    -  7  func ma…  8  func ma… +  7  func ma…  8  func ma…   …  @@ -9,5…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func ge… 12  func ge… - 12 -  ret… 13 +  con… -      14 +  ret… - 13  }  15  }  \ No newline at end of file + 11  func ge… 12  func ge… + 12 -  ret… 13 +  con… +      14 +  ret… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf029.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf029.golden index f98f2bfc17aaa46e946d0830cd9a75f65c5bede0..ac330346bcde118e8f0366cd3bf5ba85162a7156 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf029.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf029.golden @@ -1,15 +1,15 @@   …  @@ -2,6…  …      2     2    -  3  import (  3  import (  -  4  "fm…  4  "fmt" -       5 +  "str… -  5  )   6  )  +  3  import (  3  import (  +  4   "fm…  4   "fm…  +       5 +  "st…  +  5  )   6  )    6     7    -  7  func ma…  8  func mai… +  7  func ma…  8  func ma…    …  @@ -9,5…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func ge… 12  func get… - 12 -  ret… 13 +  cont… -      14 +  retu… - 13  }  15  }  \ No newline at end of file + 11  func ge… 12  func ge…  + 12 -  ret… 13 +  con…  +      14 +  ret…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf030.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf030.golden index b7a4024f2c282cbd95296f1248609f97156e50e6..6504f7ece94be17d44840ce265658a01165f6764 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf030.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf030.golden @@ -1,15 +1,15 @@   …  @@ -2,6 …  …      2     2    -  3  import (   3  import (  -  4  "fmt"  4  "fmt" -       5 +  "str… -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"  4   "fmt" +       5 +  "str… +  5  )   6  )    6     7    -  7  func mai…  8  func mai… +  7  func mai…  8  func mai…   …  @@ -9,5 …  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func get… 12  func get… - 12 -  retu… 13 +  cont… -      14 +  retu… - 13  }  15  }  \ No newline at end of file + 11  func get… 12  func get… + 12 -  retu… 13 +  cont… +      14 +  retu… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf031.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf031.golden index 2cf24437d4223cd6ee449f2c73004c9e26a3c8c4..8c93b028a434f0819fa013886eb00d8aabd1285d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf031.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf031.golden @@ -1,15 +1,15 @@   …  @@ -2,6 …  …      2     2    -  3  import (   3  import (  -  4  "fmt"  4  "fmt"  -       5 +  "stri… -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"  4   "fmt"  +       5 +  "str…  +  5  )   6  )    6     7    -  7  func mai…  8  func main… +  7  func mai…  8  func mai…    …  @@ -9,5 …  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func get… 12  func getC… - 12 -  retu… 13 +  conte… -      14 +  retur… - 13  }  15  }  \ No newline at end of file + 11  func get… 12  func get…  + 12 -  retu… 13 +  cont…  +      14 +  retu…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf032.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf032.golden index b449f59eca2ece529c135498aa6fb2390bdcb57c..4a71409e9b273fbe3095c77ae6b14817e1d4a712 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf032.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf032.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +…  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "stri… -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "stri… +  5  )   6  )    6     7    -  7  func main…  8  func main… +  7  func main…  8  func main…   …  @@ -9,5 +…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getC… 12  func getC… - 12 -  retur… 13 +  conte… -      14 +  retur… - 13  }  15  }  \ No newline at end of file + 11  func getC… 12  func getC… + 12 -  retur… 13 +  conte… +      14 +  retur… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf033.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf033.golden index 461b215a58fad21d566f89245afc09ba5369d6a1..9273c0133a6bb74a1d9ff0786ec5b8d001cf1eb6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf033.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf033.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +…  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strin… -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "stri…  +  5  )   6  )    6     7    -  7  func main…  8  func main(… +  7  func main…  8  func main…    …  @@ -9,5 +…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getC… 12  func getCo… - 12 -  retur… 13 +  conten… -      14 +  return… - 13  }  15  }  \ No newline at end of file + 11  func getC… 12  func getC…  + 12 -  retur… 13 +  conte…  +      14 +  retur…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf034.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf034.golden index 32f90649da12531bd2cb6fa45ff44fba7552e8f5..bafd04e96979aba50254250e9260e9079606bd6c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf034.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf034.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2…  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strin… -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strin… +  5  )   6  )    6     7    -  7  func main(…  8  func main(… +  7  func main(…  8  func main(…   …  @@ -9,5 +1…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getCo… 12  func getCo… - 12 -  return… 13 +  conten… -      14 +  return… - 13  }  15  }  \ No newline at end of file + 11  func getCo… 12  func getCo… + 12 -  return… 13 +  conten… +      14 +  return… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf035.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf035.golden index 94ec837f15afc57c55f11843c7200a7fce454222..8ac20fa259d92f9c4a13c1b7d0b3ece1ef65639c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf035.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf035.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2…  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "string… -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strin…  +  5  )   6  )    6     7    -  7  func main(…  8  func main()… +  7  func main(…  8  func main(…    …  @@ -9,5 +1…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getCo… 12  func getCon… - 12 -  return… 13 +  content… -      14 +  return … - 13  }  15  }  \ No newline at end of file + 11  func getCo… 12  func getCo…  + 12 -  return… 13 +  conten…  +      14 +  return…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf036.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf036.golden index ec7781a0cc6c81e034ec87566795e43b1a26ff01..a138a46233c89e3526ceb96c1c672aadd7daa919 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf036.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf036.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,…  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "string… -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "string… +  5  )   6  )    6     7    -  7  func main()…  8  func main()… +  7  func main()…  8  func main()…   …  @@ -9,5 +10…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getCon… 12  func getCon… - 12 -  return … 13 +  content… -      14 +  return … - 13  }  15  }  \ No newline at end of file + 11  func getCon… 12  func getCon… + 12 -  return … 13 +  content… +      14 +  return … + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf037.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf037.golden index ddfe2db319abb6e53aa35bd99b5fa7a5faf4031a..dd0cb8c2799baa35864ca202dd67a97b5434b8bc 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf037.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf037.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,…  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings" -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "string…  +  5  )   6  )    6     7    -  7  func main()…  8  func main() { +  7  func main()…  8  func main()…    …  @@ -9,5 +10…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getCon… 12  func getCont… - 12 -  return … 13 +  content … -      14 +  return c… - 13  }  15  }  \ No newline at end of file + 11  func getCon… 12  func getCon…  + 12 -  return … 13 +  content…  +      14 +  return …  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf038.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf038.golden index b577f654b09fa3bb14586154377a342fdd1863de..b0084aa014a51992926f11b26cef01b4fc21ab12 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf038.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf038.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7…  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings" -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings" +  5  )   6  )    6     7    -  7  func main() {  8  func main() { +  7  func main() {  8  func main() {   …  @@ -9,5 +10,…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getCont… 12  func getCont… - 12 -  return "… 13 +  content … -      14 +  return c… - 13  }  15  }  \ No newline at end of file + 11  func getCont… 12  func getCont… + 12 -  return "… 13 +  content … +      14 +  return c… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf039.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf039.golden index 4a73ba8c7996260c7aeec5c1b3c112dfbcc7223a..ae1bde4711283fe156a8a349f6499c030e3daa66 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf039.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf039.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7…  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {  8  func main() {  +  7  func main() {  8  func main() {    …  @@ -9,5 +10,…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getCont… 12  func getConte… - 12 -  return "… 13 +  content :… -      14 +  return co… - 13  }  15  }  \ No newline at end of file + 11  func getCont… 12  func getCont…  + 12 -  return "… 13 +  content …  +      14 +  return c…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf040.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf040.golden index d0ca9dd0d86109752758fb32f20222a26b265b9c..7efec8881d7252d4e0f5a444f372a19e12e5e035 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf040.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf040.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 …  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getConte… 12  func getConte… - 12 -  return "H… 13 +  content :… -      14 +  return co… - 13  }  15  }  \ No newline at end of file + 11  func getConte… 12  func getConte… + 12 -  return "H… 13 +  content :… +      14 +  return co… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf041.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf041.golden index 99d3354d5c221f3b2be2929e8f7a298ebcf3e703..10c4f687102fb8aed1d0456cde43a67ebf2a06d3 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf041.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf041.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 …  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getConte… 12  func getConten… - 12 -  return "H… 13 +  content :=… -      14 +  return con… - 13  }  15  }  \ No newline at end of file + 11  func getConte… 12  func getConte…  + 12 -  return "H… 13 +  content :…  +      14 +  return co…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf042.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf042.golden index c8a77bd140fc69c7a61a41ec236e685304e4f89e..9af1da8df7623454ca6d493baa5c1e248c988c8c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf042.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf042.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @…  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 …  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getConten… 12  func getConten… - 12 -  return "He… 13 +  content :=… -      14 +  return con… - 13  }  15  }  \ No newline at end of file + 11  func getConten… 12  func getConten… + 12 -  return "He… 13 +  content :=… +      14 +  return con… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf043.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf043.golden index 8ade1d1ea2b3cefc7a21e4f910fffe3ab5a1d89b..d4a9545f90cba3e7004f989b4b3231b921119b57 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf043.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf043.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @…  …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 …  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getConten… 12  func getContent… - 12 -  return "He… 13 +  content := … -      14 +  return cont… - 13  }  15  }  \ No newline at end of file + 11  func getConten… 12  func getConten…  + 12 -  return "He… 13 +  content :=…  +      14 +  return con…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf044.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf044.golden index 1ad6b5535fa110765d18bd5e2caf0b70e90e48e1..31b3e5b8a566adde3453c3681ecfbd14721ea8d3 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf044.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf044.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@   …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent… 12  func getContent… - 12 -  return "Hel… 13 +  content := … -      14 +  return cont… - 13  }  15  }  \ No newline at end of file + 11  func getContent… 12  func getContent… + 12 -  return "Hel… 13 +  content := … +      14 +  return cont… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf045.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf045.golden index 8ca1f58abdbcb8349874759a0c5524a52ad96be9..715b72802b8c564615318eec9afc966e4913ec4c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf045.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf045.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@   …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @…  …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent… 12  func getContent(… - 12 -  return "Hel… 13 +  content := s… -      14 +  return conte… - 13  }  15  }  \ No newline at end of file + 11  func getContent… 12  func getContent…  + 12 -  return "Hel… 13 +  content := …  +      14 +  return cont…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf046.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf046.golden index 03d1b9c64c67d800b91081b4e859338373f88f25..8f750e45dde66d7378ebd1c3cac9dcc42fd35928 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf046.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf046.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@   …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent(… 12  func getContent(… - 12 -  return "Hell… 13 +  content := s… -      14 +  return conte… - 13  }  15  }  \ No newline at end of file + 11  func getContent(… 12  func getContent(… + 12 -  return "Hell… 13 +  content := s… +      14 +  return conte… + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf047.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf047.golden index f004da12761c69ed654ff734ac766c3c8fea02eb..88d0334c820b4178059342fa2e1da9abc31554a7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf047.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf047.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@   …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent(… 12  func getContent()… - 12 -  return "Hell… 13 +  content := st… -      14 +  return content - 13  }  15  }  \ No newline at end of file + 11  func getContent(… 12  func getContent(…  + 12 -  return "Hell… 13 +  content := s…  +      14 +  return conte…  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf048.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf048.golden index 680fa666a5aef23bfa545dde302a09fa4f713b89..7f61027cd84e09baa6fbb032373a17dd2604e793 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf048.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf048.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent()… 12  func getContent()… - 12 -  return "Hello… 13 +  content := st… -      14 +  return content - 13  }  15  }  \ No newline at end of file + 11  func getContent()… 12  func getContent()… + 12 -  return "Hello… 13 +  content := st… +      14 +  return content + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf049.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf049.golden index 94761fc143dfc6db4fd0235b9fe6bd3a62042c20..9bb7c27c780a323330ce8809d49ca3a530e3446c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf049.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf049.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent()… 12  func getContent() … - 12 -  return "Hello… 13 +  content := str… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent()… 12  func getContent()…  + 12 -  return "Hello… 13 +  content := st…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf050.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf050.golden index ecaa8650163d8a8e7ef7310cb948b4053f744d19..ce5e92957c386876a86cb4560a4eadf8a7e08dc7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf050.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf050.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() … 12  func getContent() … - 12 -  return "Hello,… 13 +  content := str… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() … 12  func getContent() … + 12 -  return "Hello,… 13 +  content := str… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf051.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf051.golden index d51fb42d579badf489df6296ac367285bd8eb6a3..82adeb499fc4b5b6d15f9553765f3d1b4d1979dc 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf051.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf051.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() … 12  func getContent() s… - 12 -  return "Hello,… 13 +  content := stri… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() … 12  func getContent() …  + 12 -  return "Hello,… 13 +  content := str…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf052.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf052.golden index 425969f00c9e4b1e675d3f49171d321760148506..ae6953eb26ea0aaeddb450b4da018c5cdc3797d0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf052.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf052.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() s… 12  func getContent() s… - 12 -  return "Hello, … 13 +  content := stri… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() s… 12  func getContent() s… + 12 -  return "Hello, … 13 +  content := stri… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf053.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf053.golden index bdc318e5a6aba0b930a3b6ee64341a6c072dc00b..51a38de9c1ef157ddf956975a705bd8c99927d91 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf053.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf053.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() s… 12  func getContent() st… - 12 -  return "Hello, … 13 +  content := strin… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() s… 12  func getContent() s…  + 12 -  return "Hello, … 13 +  content := stri…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf054.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf054.golden index 6de336844a81e870ee71da54807aeccfde9900e2..24c8e4d4b1fb74c8c2ab1e52127bc7dfdef8cde0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf054.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf054.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() st… 12  func getContent() st… - 12 -  return "Hello, w… 13 +  content := strin… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() st… 12  func getContent() st… + 12 -  return "Hello, w… 13 +  content := strin… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf055.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf055.golden index fc3fd550e3a1510ea22cf0bdc0eb203d9eda19b2..cc0efd45a2cd5aa42b0734988df64ea2d05f880c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf055.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf055.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() st… 12  func getContent() str… - 12 -  return "Hello, w… 13 +  content := string… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() st… 12  func getContent() st…  + 12 -  return "Hello, w… 13 +  content := strin…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf056.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf056.golden index f401fd97cd95a5708429a0af399a774616ae2cdf..4de6f41ffaf0e87c4eda3263b57f42d84fc38aea 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf056.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf056.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() str… 12  func getContent() str… - 12 -  return "Hello, wo… 13 +  content := string… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() str… 12  func getContent() str… + 12 -  return "Hello, wo… 13 +  content := string… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf057.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf057.golden index 642474089eb8438137eddce59242c8156678ae56..77419b66cf6caa014ddcb5324c3d8fe08b0fbdda 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf057.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf057.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() str… 12  func getContent() stri… - 12 -  return "Hello, wo… 13 +  content := strings… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() str… 12  func getContent() str…  + 12 -  return "Hello, wo… 13 +  content := string…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf058.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf058.golden index 7020f20533466599c9eae92c692641e75aace894..5992c78e7352a1d59605deaa364ff8b3e6262bf9 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf058.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf058.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() stri… 12  func getContent() stri… - 12 -  return "Hello, wor… 13 +  content := strings… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() stri… 12  func getContent() stri… + 12 -  return "Hello, wor… 13 +  content := strings… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf059.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf059.golden index 3739c41cdd63edac3c99d0ff7e0f72b8bad57868..544a55196beb09c4784f668be8326bd5edb7e34e 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf059.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf059.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() stri… 12  func getContent() strin… - 12 -  return "Hello, wor… 13 +  content := strings.… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() stri… 12  func getContent() stri…  + 12 -  return "Hello, wor… 13 +  content := strings…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf060.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf060.golden index 88bee32f8faacc3d3070eea75045d963bcb3cd43..be01c935ada5686d689419f32873e280ac87b819 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf060.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf060.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() strin… 12  func getContent() strin… - 12 -  return "Hello, worl… 13 +  content := strings.… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() strin… 12  func getContent() strin… + 12 -  return "Hello, worl… 13 +  content := strings.… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf061.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf061.golden index ed76c34d49e9456c9c2b706256a60c4e637464ba..c7b19c70c3cf547cfd8d8468426a767c3f1bc8eb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf061.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf061.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() strin… 12  func getContent() string… - 12 -  return "Hello, worl… 13 +  content := strings.T… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() strin… 12  func getContent() strin…  + 12 -  return "Hello, worl… 13 +  content := strings.…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf062.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf062.golden index 68cbde591ebe1686710fa0192a56ea2ac0f3d4ab..8cf7d33c9dc489bfac63f416d78f90e8c9b240ee 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf062.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf062.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string… 12  func getContent() string… - 12 -  return "Hello, world… 13 +  content := strings.T… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string… 12  func getContent() string… + 12 -  return "Hello, world… 13 +  content := strings.T… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf063.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf063.golden index 270624fb371a3586c3ccf639b85f9f5e8169c42a..ed1e489534d52ccb007df6102fcdd6955eacbe11 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf063.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf063.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string… 12  func getContent() string { - 12 -  return "Hello, world… 13 +  content := strings.To… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string… 12  func getContent() string…  + 12 -  return "Hello, world… 13 +  content := strings.T…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf064.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf064.golden index 742ba611866c933ef59811466ed9cf5a38d1d1db..264b2f157f302c9efe51aa19fdf6652b21966357 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf064.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf064.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string { 12  func getContent() string { - 12 -  return "Hello, world!" 13 +  content := strings.To… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string { 12  func getContent() string { + 12 -  return "Hello, world!" 13 +  content := strings.To… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf065.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf065.golden index 730da08d4d6b3b5232df61c7d9021a7d2a8f135e..769077f8ddd3f8945e593a7dc829e32d0fc2a0da 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf065.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf065.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string { 12  func getContent() string {  - 12 -  return "Hello, world!" 13 +  content := strings.ToU… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string { 12  func getContent() string {  + 12 -  return "Hello, world!" 13 +  content := strings.To…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf066.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf066.golden index 2fbccef307eda98ec1b2ff5c5e32fd9dc90a69b7..41175031e8f238872ba86604bed92cc3852ee38f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf066.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf066.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToU… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToU… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf067.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf067.golden index ecc226a80c7a442b1cccc55233909617fd327532..f6988276acd56bd73a1e4f5ae3896c423a6d2b06 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf067.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf067.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUp… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToU…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf068.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf068.golden index d9d30f9898e51307420665a76f5ab0cd1405f38c..fc6241eae81aa7d386813dc04432d47876ce0fd7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf068.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf068.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUp… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUp… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf069.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf069.golden index 1f796501fc35398bacbab2414be5d1b1ca1ffda2..7d9ec994c9e1e13c40f954879feb1a5d1f600439 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf069.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf069.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpp… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUp…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf070.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf070.golden index 6e75a491e398f6215bc1e3473f26a4d8c8727aff..2083a6eae970030b41a3cd0b941863927c55a185 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf070.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf070.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpp… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpp… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf071.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf071.golden index 5598999b53f0444ec82a84aab31d5050e22a0c5d..760cdb047ee5ac89224e2c48b663bb09ae577433 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf071.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf071.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUppe… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpp…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf072.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf072.golden index 1a62bde3ad9bcd11a320aebaa706234e05237bc8..b38d7f6d21bd1f4f4e8f1929bb0d0c12f509e184 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf072.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf072.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUppe… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUppe… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf073.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf073.golden index f07b0b6f73330a23f59c28058e09893447c9a748..46afcacf662110f5f75a26556e554bd871df6d45 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf073.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf073.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUppe…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf074.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf074.golden index e9b81c3709c5d0a587156b0570a9f82f71556a08..414b8830390e69f43c724734053a31a2461b0d41 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf074.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf074.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf075.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf075.golden index 695e08b6de2977a87f4201d4bb65c645cdf25b22..e64acc77814513ff1650e77ddab0e195cb2b2cdc 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf075.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf075.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper(… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf076.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf076.golden index f947ca0edb808b63b782b60e4754ae4ceb8ae349..d2b86deb4a1113f6313c40caf31837d4900c64eb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf076.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf076.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper(… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper(… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf077.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf077.golden index 34889805ca9a6b10ab165e8772a8d2a440a4024a..b22b38baab4104282cf5dc1d7a49d0882c883fdd 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf077.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf077.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper(…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf078.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf078.golden index a38efeccbeeb6f433ed37c6dcd9f4040307c1bcf..12827013422b14ab15f0d124a65588c5ab1a47dc 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf078.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf078.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf079.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf079.golden index 7c5ad6184ecc5ca6c9aaf319cd19dd8952cbfb1e..2d50d36a9bd2b63bec0e0b463dccb5a0b7ebfd8d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf079.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf079.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("H… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf080.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf080.golden index 9f8268b85a3304fe9c02b4933c462614b6641971..dcfc005d89889ca3216f1d13d578332f24519b88 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf080.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf080.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("H… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("H… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf081.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf081.golden index 9b196dde1502783cbfecf8f2eccf69929ff7d0e3..a8ba35922b863854e348ee949bca17304598158f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf081.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf081.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("He… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("H…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf082.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf082.golden index beb31c279cafd0d4057a934df7e8b9cfb97b2add..7160250698adaad0fb9fdf21e6602866577c2e95 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf082.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf082.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("He… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("He… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf083.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf083.golden index 3cc4e51554c89c1f92f95c3cf9e765206802e1a7..2aa2d2d1e9cd296520d4c0a0362586d221ea5547 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf083.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf083.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hel… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("He…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf084.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf084.golden index e1088062d155a0c8d6060ccf086b123cb8bc83f8..365fa7567ae83238ef14c9853b6019f8d9d76a81 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf084.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf084.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hel… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hel… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf085.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf085.golden index ae34624943ffc9720e459c116e9a52eefe64dbf0..591f662b6b13b1a93be2394e776aa663585659b2 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf085.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf085.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hell… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hel…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf086.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf086.golden index c796ddbb7d60951efa1075f19f631063c4344d1c..4cbe0d54aae59078129851e100b6228f678b00d0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf086.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf086.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hell… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hell… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf087.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf087.golden index 150c205dea385ef8f435f4a1997162dada5ef6e2..b03ee8eadedfda27d6989fa531603bac3b653f59 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf087.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf087.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4 [38;2;32;31;38;48;2;241;239;239m "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hell…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf088.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf088.golden index e7732246f361500be015ff355ac2a22969dc234e..dad8e4a09a350c3085942ab29c31fb0476129a76 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf088.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf088.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf089.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf089.golden index 2e87019222c8c9d9ab35a2edba051d9abbb35758..361ce9c4119c1ec870b3f16775dc9ca5fc28bc71 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf089.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf089.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello,… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf090.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf090.golden index 4b6f5af7ad23fa326e64e5bc153cdca5131c9370..ac5688381c2a73dd8e83189f88ce1464ba55362d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf090.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf090.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello,… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello,… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf091.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf091.golden index c91af1fe7772558f51e193f97fd6b1fafd0b4bd6..9335a76abd6d37a2dc52c20bf38f1e3470455ebe 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf091.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf091.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, … -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello,…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf092.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf092.golden index 3cccf9fe7856dec65a3ded19be178c1ef6310427..a089778adc04f6ae5ebc54c0576babaae46c2579 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf092.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf092.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, … -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, … +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf093.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf093.golden index 526df4c34ce93abc73c69815f35c50dc2cf22f86..d74e0e4dfd8964ad1dbce8d4b6bab2629999939b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf093.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf093.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, W… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, …  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf094.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf094.golden index 898b7fe69ccc18803a86e5a8ddfa64628878f40d..159da99b8898d95891669209ebe5369e52d105de 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf094.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf094.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, W… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, W… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf095.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf095.golden index 08da2f518c583e2aaa8a3e5553535403b0e882c8..7bf03eaa9224a70e982ddce0073d9f36f04ae547 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf095.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf095.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wo… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, W…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf096.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf096.golden index 6572fd06f0ccd045a3b0c732550f61bea6212a5e..e3135d8681efc69853b2381184d4f7b8a16e8b32 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf096.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf096.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wo… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wo… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf097.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf097.golden index 4fe8a543581660bec84bb36c6c69e5662b602bbd..de2c0c5aa41e04c385374e75a2a0f0255faaefce 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf097.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf097.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wor… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wo…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf098.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf098.golden index 9f58d145e7c51d0fe33620aa32e67b4913a06bc4..56052a977fce039b57aeee0d0ec402a1d1a04bed 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf098.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf098.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wor… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wor… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf099.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf099.golden index d1d405ae0735057efb1a86972b1604c55932adb9..f61adea5d8c82ff47df19349face74487f1257ce 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf099.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf099.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Worl… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Wor…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf100.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf100.golden index 0d98b2832ff12bd4758fe352ac7faef59f774b75..58be05012e0b61d77d34126e7741d50cbbd41277 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf100.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf100.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Worl… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Worl… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf101.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf101.golden index 09b06341a6d3ef10ab389e7fbbdcd2dfb6b18277..a1f145e36a97eae035efea876b85d32b3fc390ff 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf101.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf101.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, Worl…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf102.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf102.golden index 0c41c9283b62a11f644cfa3d48d36bd451b0ab86..6fd5678e6859b1fe5e54afb1b54dbc894b0595d4 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf102.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf102.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf103.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf103.golden index 080691afe7d95b7f375e804ef94ea040327adb32..58d22841956cfae75a87aaeed04eb8b3dd7ca586 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf103.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf103.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf104.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf104.golden index 49660f90c921295bd85669649c42f990cc5fb8ab..31c3e8981d90b33b7eb45e9c8b1bddf6cc36efca 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf104.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf104.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!… -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!… +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf105.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf105.golden index 4cc20b9bb78466888aedcd5d77610c67ea2b4129..25254c9b09f9e582887c8bc738de4d1e30ef260c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf105.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf105.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!") -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!…  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf106.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf106.golden index 1d297be1126e10392c6098f912f1fa7f21108fb2..5546a1538824cf03333077aa3b8bcc02f30d5f14 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf106.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf106.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!") -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!") +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf107.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf107.golden index 1bd852aeafb29570bf7712877a082f2a4ee75efb..fcee0eac1c1e60e4bfa27522ede8c7fe0ca9a49e 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf107.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf107.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf108.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf108.golden index e22a98ecf771bc651d26af440a361286dcb167f7..376bae2594d8e175cdd84b90846fe43c639c4d69 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf108.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf108.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf109.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf109.golden index f9c4df3820188b745ecbf7a3ce6ad03b76ae3fdc..95d673f67bfd11f2bf5f56b6cc33960160f4be1f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf109.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf109.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf110.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf110.golden index 23a88346fe130912de771815531d4cdd7d930899..12fb2103fda145ee2c326171ba74ede6b8500a69 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf110.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Split/WidthOf110.golden @@ -1,15 +1,15 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf011.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf011.golden index 6d9e7fb12dbc617fec93ba909fc18c6e4db889c6..980ddd8d547ee6d9622b58b31dc52c050bf07c55 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf011.golden @@ -1,16 +1,16 @@   …   …  …   2   2    -  3   3  … -  4   4  … -     5 + … -  5   6  ) +  3   3  … +  4   4  … +     5 + … +  5   6  )   6   7    -  7   8  … +  7   8  …   …   …  … -  9  10  } +  9  10  }  10  11    - 11  12  … - 12    - … -    13 + … -    14 + … - 13  15  } \ No newline at end of file + 11  12  … + 12    - … +    13 + … +    14 + … + 13  15  } \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf012.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf012.golden index 748489c58f16c60d1f8517cdd494acf8a0029800..118d4c2e1865d9cc50cf1a9f4187792f1c368772 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf012.golden @@ -1,16 +1,16 @@   …   …  @…   2   2    -  3   3  i… -  4   4  … -     5 +  … -  5   6  )  +  3   3  i… +  4   4   … +     5 +  … +  5   6  )    6   7    -  7   8  f… +  7   8  f…   …   …  @… -  9  10  }  +  9  10  }   10  11    - 11  12  f… - 12    -  … -    13 +  … -    14 +  … - 13  15  }  \ No newline at end of file + 11  12  f… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf013.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf013.golden index bb95009a65b7290bf9ee59d1f23981ea7e40e2c6..abbdb692cb6f6c09df620c88f6b0a6b86e4ef96f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf013.golden @@ -1,16 +1,16 @@   …   …  @@…   2   2    -  3   3  im… -  4   4  … -     5 +  … -  5   6  )  +  3   3  im… +  4   4   … +     5 +  … +  5   6  )    6   7    -  7   8  fu… +  7   8  fu…   …   …  @@… -  9  10  }  +  9  10  }   10  11    - 11  12  fu… - 12    -  … -    13 +  … -    14 +  … - 13  15  }  \ No newline at end of file + 11  12  fu… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf014.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf014.golden index 3fe21e837dad1bb327f40dbbb1dced49a67517f9..afab1410ed5fa9a7ff215fc3f7ca69123ce48981 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf014.golden @@ -1,16 +1,16 @@   …   …  @@ …   2   2    -  3   3  imp… -  4   4  … -     5 +  … -  5   6  )  +  3   3  imp… +  4   4   … +     5 +  … +  5   6  )    6   7    -  7   8  fun… +  7   8  fun…   …   …  @@ … -  9  10  }  +  9  10  }   10  11    - 11  12  fun… - 12    -  … -    13 +  … -    14 +  … - 13  15  }  \ No newline at end of file + 11  12  fun… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf015.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf015.golden index ef2d752d9bf77ca4bf0bfe918f97247f8ff4a227..47898c566201f8d5c4ce8cb87e2e317f9157f323 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf015.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf015.golden @@ -1,16 +1,16 @@   …   …  @@ -…   2   2    -  3   3  impo… -  4   4  … -     5 +  … -  5   6  )  +  3   3  impo… +  4   4   … +     5 +  … +  5   6  )    6   7    -  7   8  func… +  7   8  func…   …   …  @@ -… -  9  10  }  +  9  10  }   10  11    - 11  12  func… - 12    -  … -    13 +  … -    14 +  … - 13  15  }  \ No newline at end of file + 11  12  func… + 12    -  … +    13 +  … +    14 +  … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf016.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf016.golden index 02215b20ab147994f0b2912bae955476bb22f256..b5d0f35783d462c9438357bef765d2d60e43ed19 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf016.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf016.golden @@ -1,16 +1,16 @@   …   …  @@ -2…   2   2    -  3   3  impor… -  4   4  "… -     5 +  "… -  5   6  )  +  3   3  impor… +  4   4   "… +     5 +  "… +  5   6  )    6   7    -  7   8  func … +  7   8  func …   …   …  @@ -9… -  9  10  }  +  9  10  }   10  11    - 11  12  func … - 12    -  r… -    13 +  c… -    14 +  r… - 13  15  }  \ No newline at end of file + 11  12  func … + 12    -  r… +    13 +  c… +    14 +  r… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf017.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf017.golden index 75fb9e340f6ba08d9a75c2070f47cbc4f204a807..58ed4f19ce4870ebe5dd6296c145d13f08f2044f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf017.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf017.golden @@ -1,16 +1,16 @@   …   …  @@ -2,…   2   2    -  3   3  import… -  4   4  "f… -     5 +  "s… -  5   6  )  +  3   3  import… +  4   4   "f… +     5 +  "s… +  5   6  )    6   7    -  7   8  func m… +  7   8  func m…   …   …  @@ -9,… -  9  10  }  +  9  10  }   10  11    - 11  12  func g… - 12    -  re… -    13 +  co… -    14 +  re… - 13  15  }  \ No newline at end of file + 11  12  func g… + 12    -  re… +    13 +  co… +    14 +  re… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf018.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf018.golden index b88efe67b7c2bfa9fc4b21673335d62bcff4d670..73b420a33879df651950fb58d29e985f3d9d5e0a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf018.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf018.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6…   2   2    -  3   3  import ( -  4   4  "fm… -     5 +  "st… -  5   6  )  +  3   3  import ( +  4   4   "fm… +     5 +  "st… +  5   6  )    6   7    -  7   8  func ma… +  7   8  func ma…   …   …  @@ -9,5… -  9  10  }  +  9  10  }   10  11    - 11  12  func ge… - 12    -  ret… -    13 +  con… -    14 +  ret… - 13  15  }  \ No newline at end of file + 11  12  func ge… + 12    -  ret… +    13 +  con… +    14 +  ret… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf019.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf019.golden index 7674dc6548331bd0f3525aa576887aa9d2a2a08d..e67fa43de7a3152291a9b08fad158fe4b8d8ff5a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf019.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf019.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 …   2   2    -  3   3  import (  -  4   4  "fmt" -     5 +  "str… -  5   6  )  +  3   3  import (  +  4   4   "fmt" +     5 +  "str… +  5   6  )    6   7    -  7   8  func mai… +  7   8  func mai…   …   …  @@ -9,5 … -  9  10  }  +  9  10  }   10  11    - 11  12  func get… - 12    -  retu… -    13 +  cont… -    14 +  retu… - 13  15  }  \ No newline at end of file + 11  12  func get… + 12    -  retu… +    13 +  cont… +    14 +  retu… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf020.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf020.golden index b09286df1c10dad61c1125d79ff3b309ba681835..07e8afd1fb5d87b6f7ac1a833989e9c73f7a08ae 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf020.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf020.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +…   2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "stri… -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "stri… +  5   6  )    6   7    -  7   8  func main… +  7   8  func main…   …   …  @@ -9,5 +… -  9  10  }  +  9  10  }   10  11    - 11  12  func getC… - 12    -  retur… -    13 +  conte… -    14 +  retur… - 13  15  }  \ No newline at end of file + 11  12  func getC… + 12    -  retur… +    13 +  conte… +    14 +  retur… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf021.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf021.golden index fe16360c1bbb5a60342a23e8e893518a428a6758..94299ef624a3fbfeb83bfd0a8c412f040314afd4 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf021.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf021.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2…   2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strin… -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strin… +  5   6  )    6   7    -  7   8  func main(… +  7   8  func main(…   …   …  @@ -9,5 +1… -  9  10  }  +  9  10  }   10  11    - 11  12  func getCo… - 12    -  return… -    13 +  conten… -    14 +  return… - 13  15  }  \ No newline at end of file + 11  12  func getCo… + 12    -  return… +    13 +  conten… +    14 +  return… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf022.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf022.golden index b06eb126c1d5120653f99761747b34a739019774..38c4c162a2bdfcbb2aec1952c7d797dadbe8c9d9 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf022.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf022.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,…   2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "string… -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "string… +  5   6  )    6   7    -  7   8  func main()… +  7   8  func main()…   …   …  @@ -9,5 +10… -  9  10  }  +  9  10  }   10  11    - 11  12  func getCon… - 12    -  return … -    13 +  content… -    14 +  return … - 13  15  }  \ No newline at end of file + 11  12  func getCon… + 12    -  return … +    13 +  content… +    14 +  return … + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf023.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf023.golden index 7f6fb654f9e4db70cae4bd5d9cd543f2e93874e1..8d96b56fe8a222fadf2b62364256c2597a4f5e2d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf023.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf023.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7…   2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings" -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings" +  5   6  )    6   7    -  7   8  func main() { +  7   8  func main() {   …   …  @@ -9,5 +10,… -  9  10  }  +  9  10  }   10  11    - 11  12  func getCont… - 12    -  return "… -    13 +  content … -    14 +  return c… - 13  15  }  \ No newline at end of file + 11  12  func getCont… + 12    -  return "… +    13 +  content … +    14 +  return c… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf024.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf024.golden index 9b9ca147e01cd264439e57272794584726f4b55c..009000c442042aabb50bdff598002b1b92e5d0fc 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf024.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf024.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 …   2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6… -  9  10  }  +  9  10  }   10  11    - 11  12  func getConte… - 12    -  return "H… -    13 +  content :… -    14 +  return co… - 13  15  }  \ No newline at end of file + 11  12  func getConte… + 12    -  return "H… +    13 +  content :… +    14 +  return co… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf025.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf025.golden index 2b2a75a47ff2868ffe9a226c4b26a199a71377a0..36412d17092b292702df8dccb64da381f6b7439f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf025.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf025.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @…   2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 … -  9  10  }  +  9  10  }   10  11    - 11  12  func getConten… - 12    -  return "He… -    13 +  content :=… -    14 +  return con… - 13  15  }  \ No newline at end of file + 11  12  func getConten… + 12    -  return "He… +    13 +  content :=… +    14 +  return con… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf026.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf026.golden index f3b513a268e51e80540d2f3234ac3ea8a0083457..d6ce5b40b7f1ded424b842c7419ebfd3422d8bea 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf026.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf026.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@    2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @… -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent… - 12    -  return "Hel… -    13 +  content := … -    14 +  return cont… - 13  15  }  \ No newline at end of file + 11  12  func getContent… + 12    -  return "Hel… +    13 +  content := … +    14 +  return cont… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf027.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf027.golden index efcdc287e72e527f8a7ca6fe96b9a69a17fbfdef..1d8d1a7b102989665a6fb5daa3f45671e240bb9a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf027.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf027.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@  -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent(… - 12    -  return "Hell… -    13 +  content := s… -    14 +  return conte… - 13  15  }  \ No newline at end of file + 11  12  func getContent(… + 12    -  return "Hell… +    13 +  content := s… +    14 +  return conte… + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf028.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf028.golden index 5e93bd89799535cc8adc78443f5ceb1fd2906e9a..cd64972ae97ea3a43e6d8bbec01f6556e14ba209 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf028.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf028.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent()… - 12    -  return "Hello… -    13 +  content := st… -    14 +  return content - 13  15  }  \ No newline at end of file + 11  12  func getContent()… + 12    -  return "Hello… +    13 +  content := st… +    14 +  return content + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf029.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf029.golden index 31d19ed9ea527f53243b5cf29dc43601e5eedc47..9630522016ffb5c9fbcc1b35c79af01807a461d6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf029.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf029.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() … - 12    -  return "Hello,… -    13 +  content := str… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() … + 12    -  return "Hello,… +    13 +  content := str… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf030.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf030.golden index c6f75f81c34d5a7009ae8e21b98ef04bb5569014..c968b68bbc5571f9e3a0ca7a57b8465c8d5d501c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf030.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf030.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() s… - 12    -  return "Hello, … -    13 +  content := stri… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() s… + 12    -  return "Hello, … +    13 +  content := stri… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf031.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf031.golden index eac4baf479645e413a609c06fb2ee8593e08daa7..1e8e394258062076591dbadd12ab6e3062b354e1 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf031.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf031.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() st… - 12    -  return "Hello, w… -    13 +  content := strin… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() st… + 12    -  return "Hello, w… +    13 +  content := strin… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf032.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf032.golden index 6ae377659bd78c0a0675678679d5961ce1d81b29..106501b3c9003cd8d663ee80f6ff7e8c6432e413 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf032.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf032.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() str… - 12    -  return "Hello, wo… -    13 +  content := string… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() str… + 12    -  return "Hello, wo… +    13 +  content := string… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf033.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf033.golden index 69b1579b4b0ac62c4f322d2b8f0c69cefb60dc55..f1dcb3abfb3eda3d465699211b3fae06258e55c5 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf033.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf033.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() stri… - 12    -  return "Hello, wor… -    13 +  content := strings… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() stri… + 12    -  return "Hello, wor… +    13 +  content := strings… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf034.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf034.golden index 9424324d0be67db8976097d5514426c771cdc113..5fa2170cf92f1881d4ba6e7f7a1b21a7092ed448 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf034.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf034.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() strin… - 12    -  return "Hello, worl… -    13 +  content := strings.… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() strin… + 12    -  return "Hello, worl… +    13 +  content := strings.… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf035.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf035.golden index d10efbabae25a2634d8394546d0739214809f235..cc742db50aa4a556f10f963483e267783e2ae463 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf035.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf035.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string… - 12    -  return "Hello, world… -    13 +  content := strings.T… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string… + 12    -  return "Hello, world… +    13 +  content := strings.T… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf036.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf036.golden index 0ba4930b0ba7d3e8aedabebe42a72f20e3358cf1..9ec6dbba298c91f82166508728172710372b77b5 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf036.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf036.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string { - 12    -  return "Hello, world!" -    13 +  content := strings.To… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string { + 12    -  return "Hello, world!" +    13 +  content := strings.To… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf037.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf037.golden index d472073751d5f12fede2c3581b472a219f4066ac..f33c7a7aef1dc8c2d56e61cfbef846fdf4641ec6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf037.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf037.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToU… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToU… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf038.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf038.golden index 0c97edfa4534ae8043aca70ecad07cb9b7950430..c87bc8d61c1341c9a066c501ff5b230b04ce0277 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf038.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf038.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUp… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUp… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf039.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf039.golden index 1a69f9119aebfde0aa4dde24ae326075f69d2d62..ab2f47e1d7e5ada9820747d9305cba1e7aa63710 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf039.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf039.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpp… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpp… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf040.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf040.golden index 1fa51a9e2840438aa94f306a294a82d22d0f5482..bc1c6c04db45d3d8dfddf23440dcfa430cec7fb0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf040.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf040.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUppe… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUppe… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf041.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf041.golden index 6e103c6d200dedfe7c207184ffffa8a084078743..aa382a513632ffd40e9fee31463d5cb29213e441 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf041.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf041.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf042.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf042.golden index 5947ba3147292f9246d01fb10ae7633759e572a2..6c721a82c4afc6423070b7c07cf909ec055bcc5d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf042.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf042.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper(… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper(… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf043.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf043.golden index 26853c9f6c01987d603fbdcec1f7c899c54cebc8..d2d80c72db4368679e3cc87c89143633cec3d8fd 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf043.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf043.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf044.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf044.golden index 819b8446bf1db7537c87baac7a68036199f7b51e..943719010fe4e96b29d702c2e49533bc5577cd2b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf044.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf044.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("H… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("H… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf045.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf045.golden index c3a25aa0dd0d83da61eab7b5fb6077bfed8f0339..591ce67300df856c778afe8c883818cd0ef40918 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf045.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf045.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("He… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("He… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf046.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf046.golden index 1066e2babf1558e32c84ff6ca62b95c1d71aa8f1..25ab875c4f1b5cb40ce08eb24503e93aa79bb083 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf046.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf046.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hel… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hel… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf047.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf047.golden index 17a6b9b9e545377987264a54805c4d21403938bd..58a8199865345c094709c677c238af4d55126867 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf047.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf047.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hell… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hell… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf048.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf048.golden index 8143d3072122759101dcf6bc9167a1fee6562dbf..83ede19e2d8d68234852af840c82cc98d6358968 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf048.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf048.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf049.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf049.golden index 8996acad434b941424e18b97f3e8a5c8ef7b9dd3..f531bcbf029d81258a3a77073cc469dfab59da36 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf049.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf049.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello,… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello,… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf050.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf050.golden index eb97f1bcf6e3de3ef6e8142756663b00355d1284..42d3bf74913c04219f87a6044becf0967ae35046 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf050.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf050.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, … -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, … +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf051.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf051.golden index b3d8be7afe555fa8f9bf22184af5ced239efb78d..8a0e974e715ecfd2d15beb026b8887eb98aa15c2 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf051.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf051.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, W… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, W… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf052.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf052.golden index 2d3ce57371b223e89e9ba39e22ebfcd308be6d25..5eaaa47e038ee480ebd8825cc8b7cfe3b05686f7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf052.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf052.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, Wo… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, Wo… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf053.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf053.golden index 42f239edc1cbe274bc88c111e25810eb4fc6dd2a..08ad6ddffccc6ba92cf63749775a5ccbb6ffdfec 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf053.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf053.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, Wor… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, Wor… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf054.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf054.golden index ed1a28da0da183fbe275eb6411e6ddab4d92c6f9..2dff941c3c03509f116b639f725995df15e050e7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf054.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf054.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, Worl… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, Worl… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf055.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf055.golden index 1a5474f10bb0ae447c740bb0ffa8588852c47d86..6c4244529a4fa5aa863b4d7654fa230417d8415f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf055.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf055.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf056.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf056.golden index da13ee8e21c0a763a11d61170e669407c882523b..e142e86ec29f9ccfc392512fb6a1ebdd7ef47b79 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf056.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf056.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!… -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!… +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf057.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf057.golden index ab82a59950c59f7dddd899d591098a9c50f5888b..0fc779146b016da6d50f41adef48995ac66ee3ce 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf057.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf057.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!") -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!") +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf058.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf058.golden index 285caf3659ba538e0c12da796836045311ecad67..4833a8a0263aada505f2e115c5dfb9fc469def67 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf058.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf058.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf059.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf059.golden index 4f27df6e9a17775b68ceabb81828878adb2d4da6..7b2771b39f26769a36ce9acd7c5b13bf61108298 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf059.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf059.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf060.golden b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf060.golden index 0131c7b18d76b8df2eb5ee0e5d2927eaff35f001..6cff1caaad1de797a272c79b02e692268b5649da 100644 --- a/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf060.golden +++ b/internal/exp/diffview/testdata/TestDiffViewWidth/Unified/WidthOf060.golden @@ -1,16 +1,16 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf00.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf00.golden index c9848ade3c32d3c908502850c017371a12c36ab3..9ec2cc1f1d60f2ab2e26aea0ac9860accd927534 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf00.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf00.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5  )   5  )  +  5  )   5  )    6     6    -  7  func main() {   7  func main() {  -  8 -  fmt.Println("Hello,…  8 +  content := "Hello, … -       9 +  fmt.Println(content) -  9  }  10  }  \ No newline at end of file +  7  func main() {   7  func main() {  +  8 -  fmt.Println("Hello,…  8 +  content := "Hello, … +       9 +  fmt.Println(content) +  9  }  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf01.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf01.golden index f136651ffebaa946c9d74b0338653d2127de813c..473d996d55dd396c57a3f54ac33080501d3f692c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf01.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf01.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  …unc main() {   7  …unc main() {  -  8 -… fmt.Println("Hello, …  8 +… content := "Hello, w… -       9 +… fmt.Println(content)  -  9    10    \ No newline at end of file +  7  …unc main() {   7  …unc main() {  +  8 -… fmt.Println("Hello, …  8 +… content := "Hello, w… +       9 +… fmt.Println(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf02.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf02.golden index 4aefe2e840d519f13e6f189ef815fdfa913d0ddc..270924bb42b6a2c148b550ae67c74fdb213980a9 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf02.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf02.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  …nc main() {   7  …nc main() {  -  8 -… fmt.Println("Hello, w…  8 +… content := "Hello, wo… -       9 +… fmt.Println(content)  -  9    10    \ No newline at end of file +  7  …nc main() {   7  …nc main() {  +  8 -… fmt.Println("Hello, w…  8 +… content := "Hello, wo… +       9 +… fmt.Println(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf03.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf03.golden index 663e619ab981b85f5abbadba4c2f9d87aebd4883..a2d2007c22d981307c17247a23f0096a7d2f72b0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf03.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf03.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  …c main() {   7  …c main() {  -  8 -… fmt.Println("Hello, wo…  8 +… content := "Hello, wor… -       9 +… fmt.Println(content)  -  9    10    \ No newline at end of file +  7  …c main() {   7  …c main() {  +  8 -… fmt.Println("Hello, wo…  8 +… content := "Hello, wor… +       9 +… fmt.Println(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf04.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf04.golden index 38634c92e31c01d8c0aeee2e66b1dc80677c9ea7..407565b5ce6fe40545656ef814309fe4f35e7679 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf04.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf04.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  … main() {   7  … main() {  -  8 -…fmt.Println("Hello, wor…  8 +…content := "Hello, worl… -       9 +…fmt.Println(content)  -  9    10    \ No newline at end of file +  7  … main() {   7  … main() {  +  8 -…fmt.Println("Hello, wor…  8 +…content := "Hello, worl… +       9 +…fmt.Println(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf05.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf05.golden index a3617ce891cda2c9a83605845e13cdb00fd04117..7e2988668b1be238ffe74db71886312f18c59a9d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf05.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf05.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  …main() {   7  …main() {  -  8 -…mt.Println("Hello, worl…  8 +…ontent := "Hello, world… -       9 +…mt.Println(content)  -  9    10    \ No newline at end of file +  7  …main() {   7  …main() {  +  8 -…mt.Println("Hello, worl…  8 +…ontent := "Hello, world… +       9 +…mt.Println(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf06.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf06.golden index eb417ae0ccbe29a97943d7d73382e66fb8747978..c0eebb94811fc3963094b942a6e3d92313570901 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf06.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf06.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  …ain() {   7  …ain() {  -  8 -…t.Println("Hello, world…  8 +…ntent := "Hello, world!" -       9 +…t.Println(content)  -  9    10    \ No newline at end of file +  7  …ain() {   7  …ain() {  +  8 -…t.Println("Hello, world…  8 +…ntent := "Hello, world!" +       9 +…t.Println(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf07.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf07.golden index 899748cccb9dc66dfc06632025cc90cdea8f49b8..d2d3307543e4ce996c82c51a5c30a75155c51865 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf07.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf07.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  …in() {   7  …in() {  -  8 -….Println("Hello, world!…  8 +…tent := "Hello, world!"  -       9 +….Println(content)  -  9    10    \ No newline at end of file +  7  …in() {   7  …in() {  +  8 -….Println("Hello, world!…  8 +…tent := "Hello, world!"  +       9 +….Println(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf08.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf08.golden index 8118b8268b334a246999396ccc22b8fcf5580eed..13d4a33d04fe3bf2a229c982082f9a13203ced3e 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf08.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf08.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  …n() {   7  …n() {  -  8 -…Println("Hello, world!")  8 +…ent := "Hello, world!"  -       9 +…Println(content)  -  9    10    \ No newline at end of file +  7  …n() {   7  …n() {  +  8 -…Println("Hello, world!")  8 +…ent := "Hello, world!"  +       9 +…Println(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf09.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf09.golden index a5fc063e7e3a3d692d5bf77a61bbc0941b38d8a8..393ec8889fce9e10eaf03c6648b160b5193d1f35 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf09.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf09.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  …() {   7  …() {  -  8 -…rintln("Hello, world!")   8 +…nt := "Hello, world!"  -       9 +…rintln(content)  -  9    10    \ No newline at end of file +  7  …() {   7  …() {  +  8 -…rintln("Hello, world!")   8 +…nt := "Hello, world!"  +       9 +…rintln(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf10.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf10.golden index 3476582fd1f855920427bafde2b5dc36486343e1..90dcd606b64433a056bcf54b69e3467251d465a1 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf10.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf10.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  …) {   7  …) {  -  8 -…intln("Hello, world!")   8 +…t := "Hello, world!"  -       9 +…intln(content)  -  9    10    \ No newline at end of file +  7  …) {   7  …) {  +  8 -…intln("Hello, world!")   8 +…t := "Hello, world!"  +       9 +…intln(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf11.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf11.golden index 26f063c6f74d0bbd8b8be62146b3419cf8080325..cede44c77dc6a1ad54e03e33a855ec1b8bee42eb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf11.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf11.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  … {   7  … {  -  8 -…ntln("Hello, world!")   8 +… := "Hello, world!"  -       9 +…ntln(content)  -  9    10    \ No newline at end of file +  7  … {   7  … {  +  8 -…ntln("Hello, world!")   8 +… := "Hello, world!"  +       9 +…ntln(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf12.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf12.golden index e775533e802c39a26c6df11afbadb91256f00467..f7713314c869c193271796f8b44669708c12fd51 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf12.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf12.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7  …{   7  …{  -  8 -…tln("Hello, world!")   8 +…:= "Hello, world!"  -       9 +…tln(content)  -  9    10    \ No newline at end of file +  7  …{   7  …{  +  8 -…tln("Hello, world!")   8 +…:= "Hello, world!"  +       9 +…tln(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf13.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf13.golden index 3f50e8681a9ee20368681ba422630826fd8f3d23..ec342bcd1a9dc48b955f1c585af2fd3c15591cdd 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf13.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf13.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7     7    -  8 -…ln("Hello, world!")   8 +…= "Hello, world!"  -       9 +…ln(content)  -  9    10    \ No newline at end of file +  7  …   7  …  +  8 -…ln("Hello, world!")   8 +…= "Hello, world!"  +       9 +…ln(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf14.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf14.golden index 5447ca0f0f4bca5561c9794f4a5700a3dc04f96b..53cea6723e9d28d66cfac2371dc992d70a2bfd90 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf14.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf14.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7     7    -  8 -…n("Hello, world!")   8 +… "Hello, world!"  -       9 +…n(content)  -  9    10    \ No newline at end of file +  7  …   7  …  +  8 -…n("Hello, world!")   8 +… "Hello, world!"  +       9 +…n(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf15.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf15.golden index 64f046c56b56560a4dd92d2d794e05281a815798..2fb5652a4e2d05f3b4efd6e58cc9ecb71ce545c0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf15.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf15.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7     7    -  8 -…("Hello, world!")   8 +…"Hello, world!"  -       9 +…(content)  -  9    10    \ No newline at end of file +  7  …   7  …  +  8 -…("Hello, world!")   8 +…"Hello, world!"  +       9 +…(content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf16.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf16.golden index b207f7f1dc1d4d25c5efd9fd6cd38673178ef1f0..adf8f07ef00c85c0bffc683abd31741b38d8f0d2 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf16.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf16.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7     7    -  8 -…"Hello, world!")   8 +…Hello, world!"  -       9 +…content)  -  9    10    \ No newline at end of file +  7  …   7  …  +  8 -…"Hello, world!")   8 +…Hello, world!"  +       9 +…content)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf17.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf17.golden index 5d659dae8b830adf3a1ac578c1915d186b23157d..d7b7a7ea86c9d6477465c61aead42e974e1b938a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf17.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf17.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7     7    -  8 -…Hello, world!")   8 +…ello, world!"  -       9 +…ontent)  -  9    10    \ No newline at end of file +  7  …   7  …  +  8 -…Hello, world!")   8 +…ello, world!"  +       9 +…ontent)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf18.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf18.golden index 16fecd3ea6aac8f92def3b3602cac2ff7c5879f9..715237891b424eb91814b91a287b17d063a1d2b8 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf18.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf18.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7     7    -  8 -…ello, world!")   8 +…llo, world!"  -       9 +…ntent)  -  9    10    \ No newline at end of file +  7  …   7  …  +  8 -…ello, world!")   8 +…llo, world!"  +       9 +…ntent)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf19.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf19.golden index 7c4606472de514d41cada9befc971bf630a2ad2e..6fa5925e13d0f617d23c8f62e692bbef68969dd2 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf19.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf19.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7     7    -  8 -…llo, world!")   8 +…lo, world!"  -       9 +…tent)  -  9    10    \ No newline at end of file +  7  …   7  …  +  8 -…llo, world!")   8 +…lo, world!"  +       9 +…tent)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf20.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf20.golden index acfd59dc2b5fa8574ab2d0b2ce33bba33ab9f452..c0bf9235426e010557385870a5dd95e74bffb6b7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf20.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Split/XOffsetOf20.golden @@ -1,7 +1,7 @@   …  @@ -5,5 +5,6 @@    …    -  5     5    +  5  …   5  …    6     6    -  7     7    -  8 -…lo, world!")   8 +…o, world!"  -       9 +…ent)  -  9    10    \ No newline at end of file +  7  …   7  …  +  8 -…lo, world!")   8 +…o, world!"  +       9 +…ent)  +  9  …  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf00.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf00.golden index dd633a6f596ef2a1654430639e0547088daedf41..94b2873d06832d68d902b591c3e8ed07960d165f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf00.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf00.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5  )  +  5   5  )    6   6    -  7   7  func main() {  -  8    -  fmt.Println("Hello, world!")  -     8 +  content := "Hello, world!"  -     9 +  fmt.Println(content)  -  9  10  }  \ No newline at end of file +  7   7  func main() {  +  8    -  fmt.Println("Hello, world!")  +     8 +  content := "Hello, world!"  +     9 +  fmt.Println(content)  +  9  10  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf01.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf01.golden index 8fa9bb8163b5b0bd1905d17dd39eca2414da2970..c9cf2ba5c67d9a207c92d303d464007dde1befb4 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf01.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf01.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  …unc main() {  -  8    -… fmt.Println("Hello, world!")  -     8 +… content := "Hello, world!"  -     9 +… fmt.Println(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …unc main() {  +  8    -… fmt.Println("Hello, world!")  +     8 +… content := "Hello, world!"  +     9 +… fmt.Println(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf02.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf02.golden index b22c0ff36e32ed710aed00453a055d93344e4571..83de454cb48931a7515d520410cfd3c834e3c1f7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf02.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf02.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  …nc main() {  -  8    -… fmt.Println("Hello, world!")  -     8 +… content := "Hello, world!"  -     9 +… fmt.Println(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …nc main() {  +  8    -… fmt.Println("Hello, world!")  +     8 +… content := "Hello, world!"  +     9 +… fmt.Println(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf03.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf03.golden index 3195a4dcb8b31e848b73d8b96f47d086fa0f8c7c..953b5d6e18c97bfab677573107546b9c406714d9 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf03.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf03.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  …c main() {  -  8    -… fmt.Println("Hello, world!")  -     8 +… content := "Hello, world!"  -     9 +… fmt.Println(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …c main() {  +  8    -… fmt.Println("Hello, world!")  +     8 +… content := "Hello, world!"  +     9 +… fmt.Println(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf04.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf04.golden index ab30137b9c3994b82ea9e8f0c7dfd032d9198a66..30ef912446ba3f5d31a86199f77319a756078f91 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf04.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf04.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  … main() {  -  8    -…fmt.Println("Hello, world!")  -     8 +…content := "Hello, world!"  -     9 +…fmt.Println(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  … main() {  +  8    -…fmt.Println("Hello, world!")  +     8 +…content := "Hello, world!"  +     9 +…fmt.Println(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf05.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf05.golden index e7482736d73ea79e49b03cf33fed35d81283444c..e3068f96ee77bb62ddf13203d6d90c0689f80428 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf05.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf05.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  …main() {  -  8    -…mt.Println("Hello, world!")  -     8 +…ontent := "Hello, world!"  -     9 +…mt.Println(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …main() {  +  8    -…mt.Println("Hello, world!")  +     8 +…ontent := "Hello, world!"  +     9 +…mt.Println(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf06.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf06.golden index 6b17b7def25d0a80c75a12965a30de66ffa08801..2112d73c61e72d0d027815ec85a54e9f60ca3358 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf06.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf06.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  …ain() {  -  8    -…t.Println("Hello, world!")  -     8 +…ntent := "Hello, world!"  -     9 +…t.Println(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …ain() {  +  8    -…t.Println("Hello, world!")  +     8 +…ntent := "Hello, world!"  +     9 +…t.Println(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf07.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf07.golden index a5bc5b1b905e1b347365817ffa00ebc6bc98a8b1..54b71be135d454289d77e7a02657d1555b8ecd33 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf07.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf07.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  …in() {  -  8    -….Println("Hello, world!")  -     8 +…tent := "Hello, world!"  -     9 +….Println(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …in() {  +  8    -….Println("Hello, world!")  +     8 +…tent := "Hello, world!"  +     9 +….Println(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf08.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf08.golden index a042c5c8633fc3b49374bc13e2d0f0ee3ebb6860..722115cc24309d4cf633ea5a6e566073047f30d0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf08.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf08.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  …n() {  -  8    -…Println("Hello, world!")  -     8 +…ent := "Hello, world!"  -     9 +…Println(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …n() {  +  8    -…Println("Hello, world!")  +     8 +…ent := "Hello, world!"  +     9 +…Println(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf09.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf09.golden index 9d1284213fa2376e76fd9305c9e8bede06e9d37b..5f7bdbdcdd5be4cd11a389c0c783a78183b7bdf8 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf09.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf09.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  …() {  -  8    -…rintln("Hello, world!")  -     8 +…nt := "Hello, world!"  -     9 +…rintln(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …() {  +  8    -…rintln("Hello, world!")  +     8 +…nt := "Hello, world!"  +     9 +…rintln(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf10.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf10.golden index 73a2a7a578547ecd1f4a1452ff0ae8fffaab4f16..45559be79cdb9ededcc648e270de7cd35e7d2568 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf10.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf10.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  …) {  -  8    -…intln("Hello, world!")  -     8 +…t := "Hello, world!"  -     9 +…intln(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …) {  +  8    -…intln("Hello, world!")  +     8 +…t := "Hello, world!"  +     9 +…intln(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf11.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf11.golden index f1a7b6d483266f1e507dff3e4314fad5d7b561b4..e43d883ca53c33655ef3cba3fcfb8c198f6ba08b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf11.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf11.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  … {  -  8    -…ntln("Hello, world!")  -     8 +… := "Hello, world!"  -     9 +…ntln(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  … {  +  8    -…ntln("Hello, world!")  +     8 +… := "Hello, world!"  +     9 +…ntln(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf12.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf12.golden index 1981f4bf1ca064474854b672c8efe8ef9441e560..f869ba9a4296fea7bc075dee39d803bfb593571f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf12.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf12.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7  …{  -  8    -…tln("Hello, world!")  -     8 +…:= "Hello, world!"  -     9 +…tln(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …{  +  8    -…tln("Hello, world!")  +     8 +…:= "Hello, world!"  +     9 +…tln(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf13.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf13.golden index a0c0fb30c50a3575805d9166da8a4cdd37674d1e..0c6ceea7ffb1bc8538ecfa791d93ddafbda184ab 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf13.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf13.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7    -  8    -…ln("Hello, world!")  -     8 +…= "Hello, world!"  -     9 +…ln(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …  +  8    -…ln("Hello, world!")  +     8 +…= "Hello, world!"  +     9 +…ln(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf14.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf14.golden index 47c5ccc7be998a34088c881bf316b2b499252a05..e5189e842557d9fdb3c1bbcb64bcb88022b5e3fb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf14.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf14.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7    -  8    -…n("Hello, world!")  -     8 +… "Hello, world!"  -     9 +…n(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …  +  8    -…n("Hello, world!")  +     8 +… "Hello, world!"  +     9 +…n(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf15.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf15.golden index 3e7787d77ad14a1ff828f3e604ea79e22c1f0b8d..5ae21ff9d9614a3a938886f54621c38d479f6aaf 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf15.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf15.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7    -  8    -…("Hello, world!")  -     8 +…"Hello, world!"  -     9 +…(content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …  +  8    -…("Hello, world!")  +     8 +…"Hello, world!"  +     9 +…(content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf16.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf16.golden index 5fe0d8d0ef38693f80b8a517f5b28ed11a3ef32b..0fada9a25ff6e1292855cecb452b84ae446214ca 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf16.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf16.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7    -  8    -…"Hello, world!")  -     8 +…Hello, world!"  -     9 +…content)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …  +  8    -…"Hello, world!")  +     8 +…Hello, world!"  +     9 +…content)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf17.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf17.golden index a1a21ab38ba64515558c64e62fe03e64d5051fc1..77edd36e83f048673a1a1962ff0839bbd291a2dc 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf17.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf17.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7    -  8    -…Hello, world!")  -     8 +…ello, world!"  -     9 +…ontent)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …  +  8    -…Hello, world!")  +     8 +…ello, world!"  +     9 +…ontent)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf18.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf18.golden index 2cfaef8115cd6ec460f44ea1c4bd7cd1e8da6cdb..84a830655e2f83046e03421608ce2f767653e28f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf18.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf18.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7    -  8    -…ello, world!")  -     8 +…llo, world!"  -     9 +…ntent)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …  +  8    -…ello, world!")  +     8 +…llo, world!"  +     9 +…ntent)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf19.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf19.golden index c6496c19b7417efa7763783ba7b182dacc9db6b0..9fb8b3b88efda9d50ad6cde9fe1d57305dd7fea6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf19.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf19.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7    -  8    -…llo, world!")  -     8 +…lo, world!"  -     9 +…tent)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …  +  8    -…llo, world!")  +     8 +…lo, world!"  +     9 +…tent)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf20.golden b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf20.golden index b2dbd15fa8d3222f7dab9612b2317d3eaf052676..410d365f438ae62a002ef06b8e9fc2867545119c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf20.golden +++ b/internal/exp/diffview/testdata/TestDiffViewXOffset/Unified/XOffsetOf20.golden @@ -1,8 +1,8 @@   …   …  @@ -5,5 +5,6 @@   -  5   5    -  6   6    -  7   7    -  8    -…lo, world!")  -     8 +…o, world!"  -     9 +…ent)  -  9  10    \ No newline at end of file +  5   5  …  +  6   6  …  +  7   7  …  +  8    -…lo, world!")  +     8 +…o, world!"  +     9 +…ent)  +  9  10  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden index 6515d553ee9c3077bcf503e96fc6fbaad662bfd4..8d4a293fdd17ce5cbd8d709656573105a8cc7b09 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf00.golden @@ -1,5 +1,5 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf01.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf01.golden index 922ebc16416c1ff5ac7c36c818e707b46951e830..59b706f531489a560427504d00b4ed513a2f0429 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf01.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf01.golden @@ -1,5 +1,5 @@   2     2    -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf02.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf02.golden index 3c757b4a947d64e87fffc4dd040a665f8b56b506..a3e47b440f42bcadf6644a9ce09b4a3eced04193 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf02.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf02.golden @@ -1,5 +1,5 @@ -  3  import (   3  import (  -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  3  import (   3  import (  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf03.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf03.golden index 801f1b0bcdeb2b431316fefd3d1dc17eeda3ca52..823ceecf70c4ba985ab52af71e5d73b502e486ef 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf03.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf03.golden @@ -1,5 +1,5 @@ -  4  "fmt"   4  "fmt"  -       5 +  "strings"  -  5  )   6  )  +  4   "fmt"   4   "fmt"  +       5 +  "strings"  +  5  )   6  )    6     7      …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf04.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf04.golden index 2fb641655367a1d8fc751bbd0444a2d4ea7d11fe..51cc05362f49e9733efb56c02af96d584ed3b507 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf04.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf04.golden @@ -1,5 +1,5 @@ -       5 +  "strings"  -  5  )   6  )  +       5 +  "strings"  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf05.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf05.golden index 928c63623f5fd88e0ed34dc03fc90e6404ac4390..f8052af3a03a3e0d71c7e6914ae61e0cfe1cd208 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf05.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf05.golden @@ -1,5 +1,5 @@ -  5  )   6  )  +  5  )   6  )    6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …      …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf06.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf06.golden index 134ff01120a7bd4a2f80c1e65cfb174b7852bca8..00209b6b75b82c568e0f04349dd366a8c303b9e0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf06.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf06.golden @@ -1,5 +1,5 @@   6     7    -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf07.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf07.golden index 51843c42adc8774acf09a79cb235806324aea57e..49f92c490c17a8d125f1a7ca6854573e72ef3e65 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf07.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf07.golden @@ -1,5 +1,5 @@ -  7  func main() {   8  func main() {  +  7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11      …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden index d34bf595e33b47b491d0f857aeb6b81390a2e5bf..6f01089b12f29dff3c4a31bff325a543dc660355 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf08.golden @@ -1,5 +1,5 @@   …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  + 11  func getContent() string {  12  func getContent() string {    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden index 3706e309d70f9d5f205759fa5cedddb3058340c2..d368d1e85520195ead3015f57012ffefa0502d0d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf09.golden @@ -1,5 +1,5 @@ -  9  }  10  }  +  9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")    …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf10.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf10.golden index 5fd504aac99cb59bf8e2bc652e0dfffcd0e48ef2..09c4fa2b1b7eb1941caf79650cd494e9b56727d0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf10.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf10.golden @@ -1,5 +1,5 @@  10    11    - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  \ No newline at end of file + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden index 6d36f26029566dc85857299fd6054f1b8a338d1e..fca02b528feae2e2620f53d77bdbdc55e06096f0 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden @@ -1,5 +1,5 @@ - 11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  + 11  func getContent() string {  12  func getContent() string {  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }             \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden index 43fb8d355221bd73fee2b27cd3b481eb6094c150..5e347b97b1af201404fc830d47501dac3d6b8b36 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden @@ -1,5 +1,5 @@ - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  - 13  }  15  }  + 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  +      14 +  return content  + 13  }  15  }                        \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden index 8bef8d4e6a2713175f0d6242ef99a78fa5b195bc..1496bd70374c1879a7b5a628ab923124242508c1 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden @@ -1,5 +1,5 @@ -      14 +  return content  - 13  }  15  }  +      14 +  return content  + 13  }  15  }                                   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden index eed5712fe427c783f84ebef0b16322459e3de751..80b0d239540b60cb3e84a3323a8085b86ad428fa 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden @@ -1,4 +1,4 @@ - 13  }  15  }  + 13  }  15  }                                   diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden index f73f2e5107400bb11415c48d3b8446009f22373d..e11e6df667cfa9dc3d909f30fef8895c16dc85c2 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf00.golden @@ -1,5 +1,5 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  -  4   4  "fmt"  +  3   3  import (  +  4   4   "fmt"    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf01.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf01.golden index a2da7f190863608734fbf3f449f24b3fa0b65cfc..52c1ff0ee9ddec7f746590d4a5efd7630eb97fd4 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf01.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf01.golden @@ -1,5 +1,5 @@   2   2    -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf02.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf02.golden index 79e537e2db8bfe77db540fea4473c4cc6f83b407..0d3ef94eccf5119a182afaecfdf5ad85880d3271 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf02.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf02.golden @@ -1,5 +1,5 @@ -  3   3  import (  -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  3   3  import (  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf03.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf03.golden index 53f8513a024887efe60ac3fb105eeab7647400aa..37d7ae5851327dd0d05ecb6cfc8d1dcc447c0be7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf03.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf03.golden @@ -1,5 +1,5 @@ -  4   4  "fmt"  -     5 +  "strings"  -  5   6  )  +  4   4   "fmt"  +     5 +  "strings"  +  5   6  )    6   7      …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf04.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf04.golden index 2d4fd565311ef7a06e79aba83c7de7fe869479e5..cdc84e4407a0ac070af67944cbf2b470182a865d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf04.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf04.golden @@ -1,5 +1,5 @@ -     5 +  "strings"  -  5   6  )  +     5 +  "strings"  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf05.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf05.golden index 0f5336993d91f4b736e06250efae27169cd105b4..7d36fccbe412a8d49e3c1bc78ae91d2f5433e4de 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf05.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf05.golden @@ -1,5 +1,5 @@ -  5   6  )  +  5   6  )    6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@     …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf06.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf06.golden index 4a58338c54b1770a14a806eca1fe2f53a425c50f..32c230ed26134c7427738a89829c8c511ea97922 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf06.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf06.golden @@ -1,5 +1,5 @@   6   7    -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf07.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf07.golden index 3e212731a61ba73315f177af7c07bafdf3878dbe..95f4c23477af7c7b87731b4170b96ce3bf94e755 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf07.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf07.golden @@ -1,5 +1,5 @@ -  7   8  func main() {  +  7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11      …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden index afc8217aa8e375c16880a43ed5b336f91d156dc6..bf5e674b322acebb23134ff841fbbbfa27eeb752 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf08.golden @@ -1,5 +1,5 @@   …   …  @@ -9,5 +10,6 @@   -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  + 11  12  func getContent() string {    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden index f6ed57fa6d22a57330216a657572604fd1afca89..ad0bfca4be7b761b73d833849de6b0c369d92586 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf09.golden @@ -1,5 +1,5 @@ -  9  10  }  +  9  10  }   10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  + 11  12  func getContent() string {  + 12    -  return "Hello, world!"    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden index 9703601b959a88c999b6d54320bf339eeab53c1d..5998ba6ec7df46f91fe969858c19559fe873c330 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf10.golden @@ -1,5 +1,5 @@  10  11    - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")    …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf11.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf11.golden index 2d0d5dc5dcf0d55cc78f02ff69b26c0b7a90584e..5f686c57c49ca7f7db94c766fff568f55725fa36 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf11.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf11.golden @@ -1,5 +1,5 @@ - 11  12  func getContent() string {  - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  \ No newline at end of file + 11  12  func getContent() string {  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf12.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf12.golden index 9ade24d5f1d0e81cb7e86c0c96998297f9412c32..1d8d95395c0e5900b270bb4d6f03ddef56f9bbe3 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf12.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf12.golden @@ -1,5 +1,5 @@ - 12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  + 12    -  return "Hello, world!"  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf13.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf13.golden index ac8d340dd7c0dc2433d65c568c7537fea9aafe85..469accfc86b39051e1f0d22944328f5ae0ddb911 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf13.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf13.golden @@ -1,5 +1,5 @@ -    13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  - 13  15  }  +    13 +  content := strings.ToUpper("Hello, World!")  +    14 +  return content  + 13  15  }                    \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf14.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf14.golden index 17bffdd193c6e30fec1b9de039f3268bb0c869cf..547e576181a8e1abe5d24f3fce8f5dce2988bb3c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf14.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf14.golden @@ -1,5 +1,5 @@ -    14 +  return content  - 13  15  }  +    14 +  return content  + 13  15  }                             \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf15.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf15.golden index b10490ae372c833632bc415259ccfe9f0c5b8075..005a5ea98096a1a703fb31ccd9b6e94ee0fe874a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf15.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Unified/YOffsetOf15.golden @@ -1,4 +1,4 @@ - 13  15  }  + 13  15  }                             From 3ece67a485ab8efe44491cfbd10f11412de31023 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 12 Jun 2025 15:58:37 -0300 Subject: [PATCH 44/64] refactor(diffview): make code a little bit shorter --- internal/exp/diffview/diffview.go | 129 ++++++++++++++++-------------- 1 file changed, 71 insertions(+), 58 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index e63bacb7edd79863bc36247cc50595cb74dbd92a..37c126513bff31efd2409902aecc3720ff6a1346 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -342,12 +342,13 @@ func (dv *DiffView) renderUnified() string { outer: for i, h := range dv.unified.Hunks { + ls := dv.style.DividerLine if dv.lineNumbers { - write(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) - write(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(ls.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad("…", dv.afterNumDigits))) } content := ansi.Truncate(dv.hunkLineFor(h), dv.fullCodeWidth, "…") - write(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(content)) + write(ls.Code.Width(dv.fullCodeWidth).Render(content)) write("\n") printedLines++ @@ -360,13 +361,13 @@ outer: isLastHunk := i+1 == len(dv.unified.Hunks) isLastLine := j+1 == len(h.Lines) if hasReachedHeight && (!isLastHunk || !isLastLine) { - lineStyle := dv.lineStyleForType(l.Kind) + ls := dv.lineStyleForType(l.Kind) if dv.lineNumbers { - write(lineStyle.LineNumber.Render(pad("…", dv.beforeNumDigits))) - write(lineStyle.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(ls.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad("…", dv.afterNumDigits))) } write(fullContentStyle.Render( - lineStyle.Code.Width(dv.fullCodeWidth).Render(" …"), + ls.Code.Width(dv.fullCodeWidth).Render(" …"), )) write("\n") break outer @@ -384,36 +385,39 @@ outer: switch l.Kind { case udiff.Equal: - content := getContent(dv.style.EqualLine) + ls := dv.style.EqualLine + content := getContent(ls) if dv.lineNumbers { - write(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) - write(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) + write(ls.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } write(fullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(ternary(leadingEllipsis, " …", " ") + content), + ls.Code.Width(dv.fullCodeWidth).Render(ternary(leadingEllipsis, " …", " ") + content), )) beforeLine++ afterLine++ case udiff.Insert: - content := getContent(dv.style.InsertLine) + ls := dv.style.InsertLine + content := getContent(ls) if dv.lineNumbers { - write(dv.style.InsertLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) - write(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) + write(ls.LineNumber.Render(pad(" ", dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } write(fullContentStyle.Render( - dv.style.InsertLine.Symbol.Render(ternary(leadingEllipsis, "+…", "+ ")) + - dv.style.InsertLine.Code.Width(dv.codeWidth).Render(content), + ls.Symbol.Render(ternary(leadingEllipsis, "+…", "+ ")) + + ls.Code.Width(dv.codeWidth).Render(content), )) afterLine++ case udiff.Delete: - content := getContent(dv.style.DeleteLine) + ls := dv.style.DeleteLine + content := getContent(ls) if dv.lineNumbers { - write(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) - write(dv.style.DeleteLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) + write(ls.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad(" ", dv.afterNumDigits))) } write(fullContentStyle.Render( - dv.style.DeleteLine.Symbol.Render(ternary(leadingEllipsis, "-…", "- ")) + - dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(content), + ls.Symbol.Render(ternary(leadingEllipsis, "-…", "- ")) + + ls.Code.Width(dv.codeWidth).Render(content), )) beforeLine++ } @@ -424,11 +428,12 @@ outer: } for printedLines < dv.height { + ls := dv.style.MissingLine if dv.lineNumbers { - write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) - write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) + write(ls.LineNumber.Render(pad(" ", dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad(" ", dv.afterNumDigits))) } - write(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) + write(ls.Code.Width(dv.fullCodeWidth).Render(" ")) write("\n") printedLines++ } @@ -452,15 +457,16 @@ func (dv *DiffView) renderSplit() string { outer: for i, h := range dv.splitHunks { + ls := dv.style.DividerLine if dv.lineNumbers { - write(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad("…", dv.beforeNumDigits))) } content := ansi.Truncate(dv.hunkLineFor(dv.unified.Hunks[i]), dv.fullCodeWidth, "…") - write(dv.style.DividerLine.Code.Width(dv.fullCodeWidth).Render(content)) + write(ls.Code.Width(dv.fullCodeWidth).Render(content)) if dv.lineNumbers { - write(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(ls.LineNumber.Render(pad("…", dv.afterNumDigits))) } - write(dv.style.DividerLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) + write(ls.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) write("\n") printedLines++ @@ -473,25 +479,25 @@ outer: isLastHunk := i+1 == len(dv.unified.Hunks) isLastLine := j+1 == len(h.lines) if hasReachedHeight && (!isLastHunk || !isLastLine) { - lineStyle := dv.style.MissingLine + ls := dv.style.MissingLine if l.before != nil { - lineStyle = dv.lineStyleForType(l.before.Kind) + ls = dv.lineStyleForType(l.before.Kind) } if dv.lineNumbers { - write(lineStyle.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad("…", dv.beforeNumDigits))) } write(beforeFullContentStyle.Render( - lineStyle.Code.Width(dv.fullCodeWidth).Render(" …"), + ls.Code.Width(dv.fullCodeWidth).Render(" …"), )) - lineStyle = dv.style.MissingLine + ls = dv.style.MissingLine if l.after != nil { - lineStyle = dv.lineStyleForType(l.after.Kind) + ls = dv.lineStyleForType(l.after.Kind) } if dv.lineNumbers { - write(lineStyle.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(ls.LineNumber.Render(pad("…", dv.afterNumDigits))) } write(afterFullContentStyle.Render( - lineStyle.Code.Width(dv.fullCodeWidth).Render(" …"), + ls.Code.Width(dv.fullCodeWidth).Render(" …"), )) write("\n") break outer @@ -510,62 +516,68 @@ outer: switch { case l.before == nil: + ls := dv.style.MissingLine if dv.lineNumbers { - write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad(" ", dv.beforeNumDigits))) } write(beforeFullContentStyle.Render( - dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" "), + ls.Code.Width(dv.fullCodeWidth).Render(" "), )) case l.before.Kind == udiff.Equal: - content := getContent(l.before.Content, dv.style.EqualLine) + ls := dv.style.EqualLine + content := getContent(l.before.Content, ls) leadingEllipsis := getLeadingEllipsis(content) if dv.lineNumbers { - write(dv.style.EqualLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } write(beforeFullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(ternary(leadingEllipsis, " …", " ") + content), + ls.Code.Width(dv.fullCodeWidth).Render(ternary(leadingEllipsis, " …", " ") + content), )) beforeLine++ case l.before.Kind == udiff.Delete: - content := getContent(l.before.Content, dv.style.DeleteLine) + ls := dv.style.DeleteLine + content := getContent(l.before.Content, ls) leadingEllipsis := getLeadingEllipsis(content) if dv.lineNumbers { - write(dv.style.DeleteLine.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad(beforeLine, dv.beforeNumDigits))) } write(beforeFullContentStyle.Render( - dv.style.DeleteLine.Symbol.Render(ternary(leadingEllipsis, "-…", "- ")) + - dv.style.DeleteLine.Code.Width(dv.codeWidth).Render(content), + ls.Symbol.Render(ternary(leadingEllipsis, "-…", "- ")) + + ls.Code.Width(dv.codeWidth).Render(content), )) beforeLine++ } switch { case l.after == nil: + ls := dv.style.MissingLine if dv.lineNumbers { - write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) + write(ls.LineNumber.Render(pad(" ", dv.afterNumDigits))) } write(afterFullContentStyle.Render( - dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" "), + ls.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" "), )) case l.after.Kind == udiff.Equal: - content := getContent(l.after.Content, dv.style.EqualLine) + ls := dv.style.EqualLine + content := getContent(l.after.Content, ls) leadingEllipsis := getLeadingEllipsis(content) if dv.lineNumbers { - write(dv.style.EqualLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) + write(ls.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } write(afterFullContentStyle.Render( - dv.style.EqualLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(ternary(leadingEllipsis, " …", " ") + content), + ls.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(ternary(leadingEllipsis, " …", " ") + content), )) afterLine++ case l.after.Kind == udiff.Insert: - content := getContent(l.after.Content, dv.style.InsertLine) + ls := dv.style.InsertLine + content := getContent(l.after.Content, ls) leadingEllipsis := getLeadingEllipsis(content) if dv.lineNumbers { - write(dv.style.InsertLine.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) + write(ls.LineNumber.Render(pad(afterLine, dv.afterNumDigits))) } write(afterFullContentStyle.Render( - dv.style.InsertLine.Symbol.Render(ternary(leadingEllipsis, "+…", "+ ")) + - dv.style.InsertLine.Code.Width(dv.codeWidth+btoi(dv.extraColOnAfter)).Render(content), + ls.Symbol.Render(ternary(leadingEllipsis, "+…", "+ ")) + + ls.Code.Width(dv.codeWidth+btoi(dv.extraColOnAfter)).Render(content), )) afterLine++ } @@ -577,14 +589,15 @@ outer: } for printedLines < dv.height { + ls := dv.style.MissingLine if dv.lineNumbers { - write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) + write(ls.LineNumber.Render(pad(" ", dv.beforeNumDigits))) } - write(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) + write(ls.Code.Width(dv.fullCodeWidth).Render(" ")) if dv.lineNumbers { - write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) + write(ls.LineNumber.Render(pad(" ", dv.afterNumDigits))) } - write(dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) + write(ls.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) write("\n") printedLines++ } From 7ee35973a216846d5e3cb85e57aa5f19cb769823 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Thu, 12 Jun 2025 16:06:51 -0300 Subject: [PATCH 45/64] test(diffview): allow tests to run in parallel --- internal/exp/diffview/diffview_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index bc70d8ce5f3aae6c0f3b3729c81bb4b4dbe16ae0..91e8a7d4e3f76838196ed29c74e92b0f5e90b272 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -133,6 +133,8 @@ func TestDiffView(t *testing.T) { t.Run(behaviorName, func(t *testing.T) { for themeName, themeFunc := range ThemeFuncs { t.Run(themeName, func(t *testing.T) { + t.Parallel() + dv := diffview.New() dv = layoutFunc(dv) dv = themeFunc(dv) @@ -158,6 +160,8 @@ func TestDiffView(t *testing.T) { func TestDiffViewTabs(t *testing.T) { for layoutName, layoutFunc := range LayoutFuncs { t.Run(layoutName, func(t *testing.T) { + t.Parallel() + dv := diffview.New(). Before("main.go", TestTabsBefore). After("main.go", TestTabsAfter). @@ -180,6 +184,8 @@ func TestDiffViewWidth(t *testing.T) { } t.Run(fmt.Sprintf("WidthOf%03d", width), func(t *testing.T) { + t.Parallel() + dv := diffview.New(). Before("main.go", TestMultipleHunksBefore). After("main.go", TestMultipleHunksAfter). @@ -203,6 +209,8 @@ func TestDiffViewHeight(t *testing.T) { t.Run(layoutName, func(t *testing.T) { for height := 1; height <= 20; height++ { t.Run(fmt.Sprintf("HeightOf%03d", height), func(t *testing.T) { + t.Parallel() + dv := diffview.New(). Before("main.go", TestMultipleHunksBefore). After("main.go", TestMultipleHunksAfter). @@ -226,6 +234,8 @@ func TestDiffViewXOffset(t *testing.T) { t.Run(layoutName, func(t *testing.T) { for xOffset := range 21 { t.Run(fmt.Sprintf("XOffsetOf%02d", xOffset), func(t *testing.T) { + t.Parallel() + dv := diffview.New(). Before("main.go", TestDefaultBefore). After("main.go", TestDefaultAfter). @@ -250,6 +260,8 @@ func TestDiffViewYOffset(t *testing.T) { t.Run(layoutName, func(t *testing.T) { for yOffset := range 17 { t.Run(fmt.Sprintf("YOffsetOf%02d", yOffset), func(t *testing.T) { + t.Parallel() + dv := diffview.New(). Before("main.go", TestMultipleHunksBefore). After("main.go", TestMultipleHunksAfter). From c8fd01b13267212c3deee032e6b068a7ee3f1a67 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Fri, 13 Jun 2025 15:15:05 -0300 Subject: [PATCH 46/64] fix: fix "failed to generate title: context deadline exceeded" error This only happens on initializing a new project. --- internal/llm/agent/agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go index c19451e1d0ef46597b8e3f9d56f9e0ebdf4362cb..dbf72fe9dbabbbd4bf455bc84a9bb571080b6c63 100644 --- a/internal/llm/agent/agent.go +++ b/internal/llm/agent/agent.go @@ -241,7 +241,7 @@ func (a *agent) processGeneration(ctx context.Context, sessionID, content string logging.ErrorPersist("panic while generating title") }) titleErr := a.generateTitle(context.Background(), sessionID, content) - if titleErr != nil { + if titleErr != nil && !errors.Is(titleErr, context.Canceled) && !errors.Is(titleErr, context.DeadlineExceeded) { logging.ErrorPersist(fmt.Sprintf("failed to generate title: %v", titleErr)) } }() From 5eac07a4104f5ed10a2a26d06f9219f7c11828c4 Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Mon, 16 Jun 2025 15:34:57 +0200 Subject: [PATCH 47/64] feat: implement lsp errors --- .../tui/components/chat/messages/messages.go | 2 +- .../tui/components/chat/sidebar/sidebar.go | 122 +++++++++++++++++- internal/tui/components/core/helpers.go | 16 ++- internal/tui/page/chat/chat.go | 2 +- internal/tui/styles/crush.go | 2 +- internal/tui/styles/icons.go | 5 +- todos.md | 4 +- 7 files changed, 139 insertions(+), 14 deletions(-) diff --git a/internal/tui/components/chat/messages/messages.go b/internal/tui/components/chat/messages/messages.go index c31ca41691d7329c80d3791ac4928cb3baeb6968..51901308b6a20b65bbaa0779d8e3340675d2b1e5 100644 --- a/internal/tui/components/chat/messages/messages.go +++ b/internal/tui/components/chat/messages/messages.go @@ -167,7 +167,7 @@ func (m *messageCmp) renderAssistantMessage() string { case message.FinishReasonPermissionDenied: infoMsg = "permission denied" } - assistant := t.S().Muted.Render(fmt.Sprintf("⬡ %s (%s)", models.SupportedModels[m.message.Model].Name, infoMsg)) + assistant := t.S().Muted.Render(fmt.Sprintf("%s %s (%s)", styles.ModelIcon, models.SupportedModels[m.message.Model].Name, infoMsg)) parts = append(parts, core.Section(assistant, m.textWidth())) } diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go index 2e86f6a9750f858a10cbdba02cfcbaf439a1cdfa..9ed5c9a28a4fe65f8b23338ea259e82e5e6ef2f9 100644 --- a/internal/tui/components/chat/sidebar/sidebar.go +++ b/internal/tui/components/chat/sidebar/sidebar.go @@ -1,11 +1,16 @@ package sidebar import ( + "fmt" "os" "strings" tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/llm/models" + "github.com/charmbracelet/crush/internal/logging" + "github.com/charmbracelet/crush/internal/lsp" + "github.com/charmbracelet/crush/internal/lsp/protocol" "github.com/charmbracelet/crush/internal/pubsub" "github.com/charmbracelet/crush/internal/session" "github.com/charmbracelet/crush/internal/tui/components/chat" @@ -32,10 +37,13 @@ type sidebarCmp struct { session session.Session logo string cwd string + lspClients map[string]*lsp.Client } -func NewSidebarCmp() Sidebar { - return &sidebarCmp{} +func NewSidebarCmp(lspClients map[string]*lsp.Client) Sidebar { + return &sidebarCmp{ + lspClients: lspClients, + } } func (m *sidebarCmp) Init() tea.Cmd { @@ -75,6 +83,8 @@ func (m *sidebarCmp) View() tea.View { parts = append(parts, m.cwd, "", + m.currentModelBlock(), + "", m.lspBlock(), "", m.mcpBlock(), @@ -137,12 +147,44 @@ func (m *sidebarCmp) lspBlock() string { if l.Disabled { iconColor = t.FgMuted } + lspErrs := map[protocol.DiagnosticSeverity]int{ + protocol.SeverityError: 0, + protocol.SeverityWarning: 0, + protocol.SeverityHint: 0, + protocol.SeverityInformation: 0, + } + if client, ok := m.lspClients[n]; ok { + for _, diagnostics := range client.GetDiagnostics() { + for _, diagnostic := range diagnostics { + if severity, ok := lspErrs[diagnostic.Severity]; ok { + lspErrs[diagnostic.Severity] = severity + 1 + } + } + } + } + + errs := []string{} + if lspErrs[protocol.SeverityError] > 0 { + errs = append(errs, t.S().Base.Foreground(t.Error).Render(fmt.Sprintf("%s%d", styles.ErrorIcon, lspErrs[protocol.SeverityError]))) + } + if lspErrs[protocol.SeverityWarning] > 0 { + errs = append(errs, t.S().Base.Foreground(t.Warning).Render(fmt.Sprintf("%s%d", styles.WarningIcon, lspErrs[protocol.SeverityWarning]))) + } + if lspErrs[protocol.SeverityHint] > 0 { + errs = append(errs, t.S().Base.Foreground(t.FgHalfMuted).Render(fmt.Sprintf("%s%d", styles.HintIcon, lspErrs[protocol.SeverityHint]))) + } + if lspErrs[protocol.SeverityInformation] > 0 { + errs = append(errs, t.S().Base.Foreground(t.FgHalfMuted).Render(fmt.Sprintf("%s%d", styles.InfoIcon, lspErrs[protocol.SeverityInformation]))) + } + + logging.Info("LSP Errors", "errors", errs) lspList = append(lspList, core.Status( core.StatusOpts{ - IconColor: iconColor, - Title: n, - Description: l.Command, + IconColor: iconColor, + Title: n, + Description: l.Command, + ExtraContent: strings.Join(errs, " "), }, m.width, ), @@ -195,6 +237,76 @@ func (m *sidebarCmp) mcpBlock() string { ) } +func formatTokensAndCost(tokens, contextWindow int64, cost float64) string { + t := styles.CurrentTheme() + // Format tokens in human-readable format (e.g., 110K, 1.2M) + var formattedTokens string + switch { + case tokens >= 1_000_000: + formattedTokens = fmt.Sprintf("%.1fM", float64(tokens)/1_000_000) + case tokens >= 1_000: + formattedTokens = fmt.Sprintf("%.1fK", float64(tokens)/1_000) + default: + formattedTokens = fmt.Sprintf("%d", tokens) + } + + // Remove .0 suffix if present + if strings.HasSuffix(formattedTokens, ".0K") { + formattedTokens = strings.Replace(formattedTokens, ".0K", "K", 1) + } + if strings.HasSuffix(formattedTokens, ".0M") { + formattedTokens = strings.Replace(formattedTokens, ".0M", "M", 1) + } + + percentage := (float64(tokens) / float64(contextWindow)) * 100 + + baseStyle := t.S().Base + + formattedCost := baseStyle.Foreground(t.FgMuted).Render(fmt.Sprintf("$%.2f", cost)) + + formattedTokens = baseStyle.Foreground(t.FgMuted).Render(fmt.Sprintf("(%s)", formattedTokens)) + formattedPercentage := baseStyle.Foreground(t.FgSubtle).Render(fmt.Sprintf("%d%%", int(percentage))) + formattedTokens = fmt.Sprintf("%s %s", formattedPercentage, formattedTokens) + if percentage > 80 { + // add the warning icon + formattedTokens = fmt.Sprintf("%s %s", styles.WarningIcon, formattedTokens) + } + + return fmt.Sprintf("%s %s", formattedTokens, formattedCost) +} + +func (s *sidebarCmp) currentModelBlock() string { + cfg := config.Get() + agentCfg := cfg.Agents[config.AgentCoder] + selectedModelID := agentCfg.Model + model := models.SupportedModels[selectedModelID] + + t := styles.CurrentTheme() + + modelIcon := t.S().Base.Foreground(t.FgSubtle).Render(styles.ModelIcon) + modelName := t.S().Text.Render(model.Name) + modelInfo := fmt.Sprintf("%s %s", modelIcon, modelName) + parts := []string{ + // section, + // "", + modelInfo, + } + if s.session.ID != "" { + parts = append( + parts, + " "+formatTokensAndCost( + s.session.CompletionTokens+s.session.PromptTokens, + model.ContextWindow, + s.session.Cost, + ), + ) + } + return lipgloss.JoinVertical( + lipgloss.Left, + parts..., + ) +} + func cwd() string { cwd := config.WorkingDirectory() t := styles.CurrentTheme() diff --git a/internal/tui/components/core/helpers.go b/internal/tui/components/core/helpers.go index e586b0563278080eb85c7e0bbaa4dbee86e670e9..3621956393a8b73f5f35f659ad9d72ebe77c53aa 100644 --- a/internal/tui/components/core/helpers.go +++ b/internal/tui/components/core/helpers.go @@ -42,6 +42,7 @@ type StatusOpts struct { TitleColor color.Color Description string DescriptionColor color.Color + ExtraContent string // Additional content to append after the description } func Status(ops StatusOpts, width int) string { @@ -67,14 +68,23 @@ func Status(ops StatusOpts, width int) string { icon = t.S().Base.Foreground(iconColor).Render(icon) title = t.S().Base.Foreground(titleColor).Render(title) if description != "" { - description = ansi.Truncate(description, width-lipgloss.Width(icon)-lipgloss.Width(title)-2, "…") + extraContent := len(ops.ExtraContent) + if extraContent > 0 { + extraContent += 1 + } + description = ansi.Truncate(description, width-lipgloss.Width(icon)-lipgloss.Width(title)-2-extraContent, "…") } description = t.S().Base.Foreground(descriptionColor).Render(description) - return strings.Join([]string{ + content := []string{ icon, title, description, - }, " ") + } + if ops.ExtraContent != "" { + content = append(content, ops.ExtraContent) + } + + return strings.Join(content, " ") } type ButtonOpts struct { diff --git a/internal/tui/page/chat/chat.go b/internal/tui/page/chat/chat.go index fa374abb0bee72330d840b858b5219d82554b5ed..94fa4dd353043aaf76dbd44f7253574d72f4927d 100644 --- a/internal/tui/page/chat/chat.go +++ b/internal/tui/page/chat/chat.go @@ -209,7 +209,7 @@ func (p *chatPage) Bindings() []key.Binding { func NewChatPage(app *app.App) ChatPage { sidebarContainer := layout.NewContainer( - sidebar.NewSidebarCmp(), + sidebar.NewSidebarCmp(app.LSPClients), layout.WithPadding(1, 1, 1, 1), ) editorContainer := layout.NewContainer( diff --git a/internal/tui/styles/crush.go b/internal/tui/styles/crush.go index b35008c2a65e9c8b19ec456515d0a72823185c0b..41acdfad103e70b19955a84722a27876575d15b4 100644 --- a/internal/tui/styles/crush.go +++ b/internal/tui/styles/crush.go @@ -32,7 +32,7 @@ func NewCrushTheme() *Theme { // Status Success: charmtone.Guac, Error: charmtone.Sriracha, - Warning: charmtone.Uni, + Warning: charmtone.Zest, Info: charmtone.Malibu, // Colors diff --git a/internal/tui/styles/icons.go b/internal/tui/styles/icons.go index 2b02442437918adbc675bd3ff01b5e5cd71902b7..4f44077bd377fa4211bffedf88a116d7ff6f5813 100644 --- a/internal/tui/styles/icons.go +++ b/internal/tui/styles/icons.go @@ -4,11 +4,12 @@ const ( CheckIcon string = "✓" ErrorIcon string = "×" WarningIcon string = "⚠" - InfoIcon string = "" - HintIcon string = "i" + InfoIcon string = "ⓘ" + HintIcon string = "∵" SpinnerIcon string = "..." LoadingIcon string = "⟳" DocumentIcon string = "🖼" + ModelIcon string = "⬡" // Tool call icons ToolPending string = "●" diff --git a/todos.md b/todos.md index 85ce7a39c019fe86508888c1254049091ff87e2c..9f03c059deecb22d86f42074050e4e7e15038174 100644 --- a/todos.md +++ b/todos.md @@ -3,7 +3,8 @@ - [x] Implement help - [x] Show full help - [x] Make help dependent on the focused pane and page -- [ ] Implement current model in the sidebar +- [x] Implement current model in the sidebar +- [x] Implement LSP errors - [ ] Implement changed files - [ ] Events when tool error - [ ] Support bash commands @@ -23,6 +24,7 @@ - [ ] Address UX issues - [ ] Fix issue with numbers (padding) view tool - [ ] Implement responsive mode +- [ ] Update interactive mode to use the spinner - [ ] Revisit the core list component - [ ] This component has become super complex we might need to fix this. - [ ] Investigate ways to make the spinner less CPU intensive From 5056d443ec70303de4b1ee5d92c9eb02ceb158ee Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Mon, 16 Jun 2025 16:53:41 +0200 Subject: [PATCH 48/64] fix: remove pool logic --- internal/llm/tools/fetch.go | 64 ++++++++----------------------- internal/llm/tools/grep.go | 19 ++++----- internal/llm/tools/sourcegraph.go | 63 ++++++++---------------------- 3 files changed, 40 insertions(+), 106 deletions(-) diff --git a/internal/llm/tools/fetch.go b/internal/llm/tools/fetch.go index 2662210d128f5e86e2dcbba0d262722850de4b38..7acf23bae61df88792dd805317bdf8a67095dd0d 100644 --- a/internal/llm/tools/fetch.go +++ b/internal/llm/tools/fetch.go @@ -7,7 +7,6 @@ import ( "io" "net/http" "strings" - "sync" "time" md "github.com/JohannesKaufmann/html-to-markdown" @@ -29,10 +28,8 @@ type FetchPermissionsParams struct { } type fetchTool struct { - client *http.Client - clientPool map[int]*http.Client - clientPoolMu sync.RWMutex - permissions permission.Service + client *http.Client + permissions permission.Service } const ( @@ -78,51 +75,10 @@ func NewFetchTool(permissions permission.Service) BaseTool { IdleConnTimeout: 90 * time.Second, }, }, - clientPool: make(map[int]*http.Client), permissions: permissions, } } -// getClientForTimeout returns a cached client for the given timeout or the default client -func (t *fetchTool) getClientForTimeout(timeout int) *http.Client { - if timeout <= 0 { - return t.client - } - - maxTimeout := 120 // 2 minutes - if timeout > maxTimeout { - timeout = maxTimeout - } - - // Check if we have a cached client for this timeout - t.clientPoolMu.RLock() - if client, exists := t.clientPool[timeout]; exists { - t.clientPoolMu.RUnlock() - return client - } - t.clientPoolMu.RUnlock() - - // Create and cache a new client - t.clientPoolMu.Lock() - defer t.clientPoolMu.Unlock() - - // Double-check in case another goroutine created it - if client, exists := t.clientPool[timeout]; exists { - return client - } - - client := &http.Client{ - Timeout: time.Duration(timeout) * time.Second, - Transport: &http.Transport{ - MaxIdleConns: 100, - MaxIdleConnsPerHost: 10, - IdleConnTimeout: 90 * time.Second, - }, - } - t.clientPool[timeout] = client - return client -} - func (t *fetchTool) Info() ToolInfo { return ToolInfo{ Name: FetchToolName, @@ -185,16 +141,26 @@ func (t *fetchTool) Run(ctx context.Context, call ToolCall) (ToolResponse, error return ToolResponse{}, permission.ErrorPermissionDenied } - client := t.getClientForTimeout(params.Timeout) + // Handle timeout with context + requestCtx := ctx + if params.Timeout > 0 { + maxTimeout := 120 // 2 minutes + if params.Timeout > maxTimeout { + params.Timeout = maxTimeout + } + var cancel context.CancelFunc + requestCtx, cancel = context.WithTimeout(ctx, time.Duration(params.Timeout)*time.Second) + defer cancel() + } - req, err := http.NewRequestWithContext(ctx, "GET", params.URL, nil) + req, err := http.NewRequestWithContext(requestCtx, "GET", params.URL, nil) if err != nil { return ToolResponse{}, fmt.Errorf("failed to create request: %w", err) } req.Header.Set("User-Agent", "crush/1.0") - resp, err := client.Do(req) + resp, err := t.client.Do(req) if err != nil { return ToolResponse{}, fmt.Errorf("failed to fetch URL: %w", err) } diff --git a/internal/llm/tools/grep.go b/internal/llm/tools/grep.go index b4eae224d617fdf6ec358d52f5c1011de3df3cab..61d4fb79a614da282fb48cb23b8e0405f28d23ac 100644 --- a/internal/llm/tools/grep.go +++ b/internal/llm/tools/grep.go @@ -402,19 +402,20 @@ func fileContainsPattern(filePath string, pattern *regexp.Regexp) (bool, int, st return false, 0, "", scanner.Err() } +var binaryExts = map[string]struct{}{ + ".exe": {}, ".dll": {}, ".so": {}, ".dylib": {}, + ".bin": {}, ".obj": {}, ".o": {}, ".a": {}, + ".zip": {}, ".tar": {}, ".gz": {}, ".bz2": {}, + ".jpg": {}, ".jpeg": {}, ".png": {}, ".gif": {}, + ".pdf": {}, ".doc": {}, ".docx": {}, ".xls": {}, + ".mp3": {}, ".mp4": {}, ".avi": {}, ".mov": {}, +} + // isBinaryFile performs a quick check to determine if a file is binary func isBinaryFile(filePath string) bool { // Check file extension first (fastest) ext := strings.ToLower(filepath.Ext(filePath)) - binaryExts := map[string]bool{ - ".exe": true, ".dll": true, ".so": true, ".dylib": true, - ".bin": true, ".obj": true, ".o": true, ".a": true, - ".zip": true, ".tar": true, ".gz": true, ".bz2": true, - ".jpg": true, ".jpeg": true, ".png": true, ".gif": true, - ".pdf": true, ".doc": true, ".docx": true, ".xls": true, - ".mp3": true, ".mp4": true, ".avi": true, ".mov": true, - } - if binaryExts[ext] { + if _, isBinary := binaryExts[ext]; isBinary { return true } diff --git a/internal/llm/tools/sourcegraph.go b/internal/llm/tools/sourcegraph.go index 0fb517512db18e4a817bf99e95971920018052d2..29518b7b818da5746d195ea8b7da521d80429962 100644 --- a/internal/llm/tools/sourcegraph.go +++ b/internal/llm/tools/sourcegraph.go @@ -8,7 +8,6 @@ import ( "io" "net/http" "strings" - "sync" "time" ) @@ -25,9 +24,7 @@ type SourcegraphResponseMetadata struct { } type sourcegraphTool struct { - client *http.Client - clientPool map[int]*http.Client - clientPoolMu sync.RWMutex + client *http.Client } const ( @@ -138,50 +135,9 @@ func NewSourcegraphTool() BaseTool { IdleConnTimeout: 90 * time.Second, }, }, - clientPool: make(map[int]*http.Client), } } -// getClientForTimeout returns a cached client for the given timeout or the default client -func (t *sourcegraphTool) getClientForTimeout(timeout int) *http.Client { - if timeout <= 0 { - return t.client - } - - maxTimeout := 120 // 2 minutes - if timeout > maxTimeout { - timeout = maxTimeout - } - - // Check if we have a cached client for this timeout - t.clientPoolMu.RLock() - if client, exists := t.clientPool[timeout]; exists { - t.clientPoolMu.RUnlock() - return client - } - t.clientPoolMu.RUnlock() - - // Create and cache a new client - t.clientPoolMu.Lock() - defer t.clientPoolMu.Unlock() - - // Double-check in case another goroutine created it - if client, exists := t.clientPool[timeout]; exists { - return client - } - - client := &http.Client{ - Timeout: time.Duration(timeout) * time.Second, - Transport: &http.Transport{ - MaxIdleConns: 100, - MaxIdleConnsPerHost: 10, - IdleConnTimeout: 90 * time.Second, - }, - } - t.clientPool[timeout] = client - return client -} - func (t *sourcegraphTool) Info() ToolInfo { return ToolInfo{ Name: SourcegraphToolName, @@ -227,7 +183,18 @@ func (t *sourcegraphTool) Run(ctx context.Context, call ToolCall) (ToolResponse, if params.ContextWindow <= 0 { params.ContextWindow = 10 // Default context window } - client := t.getClientForTimeout(params.Timeout) + + // Handle timeout with context + requestCtx := ctx + if params.Timeout > 0 { + maxTimeout := 120 // 2 minutes + if params.Timeout > maxTimeout { + params.Timeout = maxTimeout + } + var cancel context.CancelFunc + requestCtx, cancel = context.WithTimeout(ctx, time.Duration(params.Timeout)*time.Second) + defer cancel() + } type graphqlRequest struct { Query string `json:"query"` @@ -248,7 +215,7 @@ func (t *sourcegraphTool) Run(ctx context.Context, call ToolCall) (ToolResponse, graphqlQuery := string(graphqlQueryBytes) req, err := http.NewRequestWithContext( - ctx, + requestCtx, "POST", "https://sourcegraph.com/.api/graphql", bytes.NewBuffer([]byte(graphqlQuery)), @@ -260,7 +227,7 @@ func (t *sourcegraphTool) Run(ctx context.Context, call ToolCall) (ToolResponse, req.Header.Set("Content-Type", "application/json") req.Header.Set("User-Agent", "crush/1.0") - resp, err := client.Do(req) + resp, err := t.client.Do(req) if err != nil { return ToolResponse{}, fmt.Errorf("failed to fetch URL: %w", err) } From b700ec37047bd80a0b0210135a5390911946f3a4 Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Mon, 16 Jun 2025 16:57:26 +0200 Subject: [PATCH 49/64] feat: use range --- internal/llm/tools/grep.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/llm/tools/grep.go b/internal/llm/tools/grep.go index 61d4fb79a614da282fb48cb23b8e0405f28d23ac..3064ee633cf0e54bfb9d14efdd475cda15a38c85 100644 --- a/internal/llm/tools/grep.go +++ b/internal/llm/tools/grep.go @@ -434,7 +434,7 @@ func isBinaryFile(filePath string) bool { } // Check for null bytes (common in binary files) - for i := 0; i < n; i++ { + for i := range n { if buffer[i] == 0 { return true } From 65e734689c2d36259a9b174783c4ad6bc81d88c4 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Fri, 13 Jun 2025 15:29:41 -0300 Subject: [PATCH 50/64] feat: add `.crush` automatically to `.gitignore` on initializing --- internal/tui/components/dialogs/commands/commands.go | 3 ++- internal/tui/components/dialogs/init/init.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/tui/components/dialogs/commands/commands.go b/internal/tui/components/dialogs/commands/commands.go index 7006117a33d916d0e822a2347b6b8993e99b7ddd..67f591b6bf3971826d8dffb0f8cc63d1bf1e57fd 100644 --- a/internal/tui/components/dialogs/commands/commands.go +++ b/internal/tui/components/dialogs/commands/commands.go @@ -239,7 +239,8 @@ func (c *commandDialogCmp) defaultCommands() []Command { The file you create will be given to agentic coding agents (such as yourself) that operate in this repository. Make it about 20 lines long. If there's already a CRUSH.md, improve it. - If there are Cursor rules (in .cursor/rules/ or .cursorrules) or Copilot rules (in .github/copilot-instructions.md), make sure to include them.` + If there are Cursor rules (in .cursor/rules/ or .cursorrules) or Copilot rules (in .github/copilot-instructions.md), make sure to include them. + Add the .crush directory to the .gitignore file if it's not already there.` return util.CmdHandler(chat.SendMsg{ Text: prompt, }) diff --git a/internal/tui/components/dialogs/init/init.go b/internal/tui/components/dialogs/init/init.go index 347dc643da559bcb53449ec22765d550cf8f400f..74d0dc0b3d9d4630b28c4b240fb17fbe611ba21f 100644 --- a/internal/tui/components/dialogs/init/init.go +++ b/internal/tui/components/dialogs/init/init.go @@ -180,7 +180,8 @@ func (m *initDialogCmp) handleInitialization(initialize bool) tea.Cmd { The file you create will be given to agentic coding agents (such as yourself) that operate in this repository. Make it about 20 lines long. If there's already a CRUSH.md, improve it. -If there are Cursor rules (in .cursor/rules/ or .cursorrules) or Copilot rules (in .github/copilot-instructions.md), make sure to include them.` +If there are Cursor rules (in .cursor/rules/ or .cursorrules) or Copilot rules (in .github/copilot-instructions.md), make sure to include them. +Add the .crush directory to the .gitignore file if it's not already there.` // Mark the project as initialized if err := config.MarkProjectInitialized(); err != nil { From e8f07b0ce55bfd57eb93fadc098d9e9c002be150 Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Mon, 16 Jun 2025 17:50:08 +0200 Subject: [PATCH 51/64] feat: add file changes need to still handle realtime file changes --- internal/fileutil/fileutil.go | 24 ++++ .../tui/components/chat/sidebar/sidebar.go | 133 +++++++++++++++++- internal/tui/components/core/helpers.go | 13 +- internal/tui/page/chat/chat.go | 2 +- todos.md | 1 + 5 files changed, 165 insertions(+), 8 deletions(-) diff --git a/internal/fileutil/fileutil.go b/internal/fileutil/fileutil.go index 92fc9d39c585f7784c7fe8ca21a0cf8d6958cbcb..4955c0811d586a4035808d9813a35b3c7c2f8d10 100644 --- a/internal/fileutil/fileutil.go +++ b/internal/fileutil/fileutil.go @@ -211,3 +211,27 @@ func PrettyPath(path string) string { } return path } + +func DirTrim(pwd string, lim int) string { + var ( + out string + sep = string(filepath.Separator) + ) + dirs := strings.Split(pwd, sep) + if lim > len(dirs)-1 || lim <= 0 { + return pwd + } + for i := len(dirs) - 1; i > 0; i-- { + out = sep + out + if i == len(dirs)-1 { + out = dirs[i] + } else if i >= len(dirs)-lim { + out = string(dirs[i][0]) + out + } else { + out = "..." + out + break + } + } + out = filepath.Join("~", out) + return out +} diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go index 9ed5c9a28a4fe65f8b23338ea259e82e5e6ef2f9..b0726239a545f8dc890a0bcc1932110150242519 100644 --- a/internal/tui/components/chat/sidebar/sidebar.go +++ b/internal/tui/components/chat/sidebar/sidebar.go @@ -1,12 +1,16 @@ package sidebar import ( + "context" "fmt" "os" "strings" tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/crush/internal/config" + "github.com/charmbracelet/crush/internal/diff" + "github.com/charmbracelet/crush/internal/fileutil" + "github.com/charmbracelet/crush/internal/history" "github.com/charmbracelet/crush/internal/llm/models" "github.com/charmbracelet/crush/internal/logging" "github.com/charmbracelet/crush/internal/lsp" @@ -21,12 +25,22 @@ import ( "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/crush/internal/version" "github.com/charmbracelet/lipgloss/v2" + "github.com/charmbracelet/x/ansi" ) const ( logoBreakpoint = 65 ) +type SessionFile struct { + FilePath string + Additions int + Deletions int +} +type SessionFilesMsg struct { + Files []SessionFile +} + type Sidebar interface { util.Model layout.Sizeable @@ -38,11 +52,14 @@ type sidebarCmp struct { logo string cwd string lspClients map[string]*lsp.Client + history history.Service + files []SessionFile } -func NewSidebarCmp(lspClients map[string]*lsp.Client) Sidebar { +func NewSidebarCmp(history history.Service, lspClients map[string]*lsp.Client) Sidebar { return &sidebarCmp{ lspClients: lspClients, + history: history, } } @@ -58,6 +75,12 @@ func (m *sidebarCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) { if msg.ID != m.session.ID { m.session = msg } + return m, m.loadSessionFiles + case SessionFilesMsg: + m.files = msg.Files + logging.Info("Loaded session files", "count", len(m.files)) + return m, nil + case chat.SessionClearedMsg: m.session = session.Session{} case pubsub.Event[session.Session]: @@ -85,6 +108,8 @@ func (m *sidebarCmp) View() tea.View { "", m.currentModelBlock(), "", + m.filesBlock(), + "", m.lspBlock(), "", m.mcpBlock(), @@ -95,6 +120,58 @@ func (m *sidebarCmp) View() tea.View { ) } +func (m *sidebarCmp) loadSessionFiles() tea.Msg { + files, err := m.history.ListBySession(context.Background(), m.session.ID) + if err != nil { + return util.InfoMsg{ + Type: util.InfoTypeError, + Msg: err.Error(), + } + } + + type fileHistory struct { + initialVersion history.File + latestVersion history.File + } + + fileMap := make(map[string]fileHistory) + + for _, file := range files { + if existing, ok := fileMap[file.Path]; ok { + // Update the latest version + if existing.latestVersion.CreatedAt < file.CreatedAt { + existing.latestVersion = file + } + if file.Version == history.InitialVersion { + existing.initialVersion = file + } + fileMap[file.Path] = existing + } else { + // Add the initial version + fileMap[file.Path] = fileHistory{ + initialVersion: file, + latestVersion: file, + } + } + } + + sessionFiles := make([]SessionFile, 0, len(fileMap)) + for path, fh := range fileMap { + if fh.initialVersion.Version == history.InitialVersion { + _, additions, deletions := diff.GenerateDiff(fh.initialVersion.Content, fh.latestVersion.Content, fh.initialVersion.Path) + sessionFiles = append(sessionFiles, SessionFile{ + FilePath: path, + Additions: additions, + Deletions: deletions, + }) + } + } + + return SessionFilesMsg{ + Files: sessionFiles, + } +} + func (m *sidebarCmp) SetSize(width, height int) tea.Cmd { if width < logoBreakpoint && m.width >= logoBreakpoint { m.logo = m.logoBlock(true) @@ -122,6 +199,59 @@ func (m *sidebarCmp) logoBlock(compact bool) string { }) } +func (m *sidebarCmp) filesBlock() string { + maxWidth := min(m.width, 58) + t := styles.CurrentTheme() + + section := t.S().Muted.Render( + core.Section("Files", maxWidth), + ) + + if len(m.files) == 0 { + return lipgloss.JoinVertical( + lipgloss.Left, + section, + "", + t.S().Base.Foreground(t.Border).Render("None"), + ) + } + + fileList := []string{section, ""} + + for _, file := range m.files { + // Extract just the filename from the path + + // Create status indicators for additions/deletions + var statusParts []string + if file.Additions > 0 { + statusParts = append(statusParts, t.S().Base.Foreground(t.Success).Render(fmt.Sprintf("+%d", file.Additions))) + } + if file.Deletions > 0 { + statusParts = append(statusParts, t.S().Base.Foreground(t.Error).Render(fmt.Sprintf("-%d", file.Deletions))) + } + + extraContent := strings.Join(statusParts, " ") + filePath := fileutil.DirTrim(fileutil.PrettyPath(file.FilePath), 2) + filePath = ansi.Truncate(filePath, maxWidth-lipgloss.Width(extraContent)-2, "…") + fileList = append(fileList, + core.Status( + core.StatusOpts{ + IconColor: t.FgMuted, + NoIcon: true, + Title: filePath, + ExtraContent: extraContent, + }, + m.width, + ), + ) + } + + return lipgloss.JoinVertical( + lipgloss.Left, + fileList..., + ) +} + func (m *sidebarCmp) lspBlock() string { maxWidth := min(m.width, 58) t := styles.CurrentTheme() @@ -177,7 +307,6 @@ func (m *sidebarCmp) lspBlock() string { errs = append(errs, t.S().Base.Foreground(t.FgHalfMuted).Render(fmt.Sprintf("%s%d", styles.InfoIcon, lspErrs[protocol.SeverityInformation]))) } - logging.Info("LSP Errors", "errors", errs) lspList = append(lspList, core.Status( core.StatusOpts{ diff --git a/internal/tui/components/core/helpers.go b/internal/tui/components/core/helpers.go index 3621956393a8b73f5f35f659ad9d72ebe77c53aa..3396b04f3eaff769c1dc47cd7292a5f3e337cd3b 100644 --- a/internal/tui/components/core/helpers.go +++ b/internal/tui/components/core/helpers.go @@ -38,6 +38,7 @@ func Title(title string, width int) string { type StatusOpts struct { Icon string IconColor color.Color + NoIcon bool // If true, no icon will be displayed Title string TitleColor color.Color Description string @@ -51,6 +52,8 @@ func Status(ops StatusOpts, width int) string { iconColor := t.Success if ops.Icon != "" { icon = ops.Icon + } else if ops.NoIcon { + icon = "" } if ops.IconColor != nil { iconColor = ops.IconColor @@ -65,7 +68,6 @@ func Status(ops StatusOpts, width int) string { if ops.DescriptionColor != nil { descriptionColor = ops.DescriptionColor } - icon = t.S().Base.Foreground(iconColor).Render(icon) title = t.S().Base.Foreground(titleColor).Render(title) if description != "" { extraContent := len(ops.ExtraContent) @@ -75,11 +77,12 @@ func Status(ops StatusOpts, width int) string { description = ansi.Truncate(description, width-lipgloss.Width(icon)-lipgloss.Width(title)-2-extraContent, "…") } description = t.S().Base.Foreground(descriptionColor).Render(description) - content := []string{ - icon, - title, - description, + + content := []string{} + if icon != "" { + content = append(content, t.S().Base.Foreground(iconColor).Render(icon)) } + content = append(content, title, description) if ops.ExtraContent != "" { content = append(content, ops.ExtraContent) } diff --git a/internal/tui/page/chat/chat.go b/internal/tui/page/chat/chat.go index 94fa4dd353043aaf76dbd44f7253574d72f4927d..179147cbb3b3b9025957a60b04b5fa557d9136c3 100644 --- a/internal/tui/page/chat/chat.go +++ b/internal/tui/page/chat/chat.go @@ -209,7 +209,7 @@ func (p *chatPage) Bindings() []key.Binding { func NewChatPage(app *app.App) ChatPage { sidebarContainer := layout.NewContainer( - sidebar.NewSidebarCmp(app.LSPClients), + sidebar.NewSidebarCmp(app.History, app.LSPClients), layout.WithPadding(1, 1, 1, 1), ) editorContainer := layout.NewContainer( diff --git a/todos.md b/todos.md index 9f03c059deecb22d86f42074050e4e7e15038174..50aa388e03352e05961308dea3b9b036f980f71c 100644 --- a/todos.md +++ b/todos.md @@ -27,6 +27,7 @@ - [ ] Update interactive mode to use the spinner - [ ] Revisit the core list component - [ ] This component has become super complex we might need to fix this. +- [ ] Handle correct LSP and MCP status icon - [ ] Investigate ways to make the spinner less CPU intensive - [ ] General cleanup and documentation - [ ] Update the readme From ec1b652dbaa0d89e51ba58ec356f138c3534d82c Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Mon, 16 Jun 2025 17:58:12 +0200 Subject: [PATCH 52/64] chore: small ux tweeks --- internal/tui/components/chat/sidebar/sidebar.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go index b0726239a545f8dc890a0bcc1932110150242519..6b111a887d747ccd6634256d5b06e6f89d36d811 100644 --- a/internal/tui/components/chat/sidebar/sidebar.go +++ b/internal/tui/components/chat/sidebar/sidebar.go @@ -203,8 +203,8 @@ func (m *sidebarCmp) filesBlock() string { maxWidth := min(m.width, 58) t := styles.CurrentTheme() - section := t.S().Muted.Render( - core.Section("Files", maxWidth), + section := t.S().Subtle.Render( + core.Section("Modified Files", maxWidth), ) if len(m.files) == 0 { @@ -256,7 +256,7 @@ func (m *sidebarCmp) lspBlock() string { maxWidth := min(m.width, 58) t := styles.CurrentTheme() - section := t.S().Muted.Render( + section := t.S().Subtle.Render( core.Section("LSPs", maxWidth), ) @@ -330,7 +330,7 @@ func (m *sidebarCmp) mcpBlock() string { maxWidth := min(m.width, 58) t := styles.CurrentTheme() - section := t.S().Muted.Render( + section := t.S().Subtle.Render( core.Section("MCPs", maxWidth), ) @@ -393,8 +393,8 @@ func formatTokensAndCost(tokens, contextWindow int64, cost float64) string { formattedCost := baseStyle.Foreground(t.FgMuted).Render(fmt.Sprintf("$%.2f", cost)) - formattedTokens = baseStyle.Foreground(t.FgMuted).Render(fmt.Sprintf("(%s)", formattedTokens)) - formattedPercentage := baseStyle.Foreground(t.FgSubtle).Render(fmt.Sprintf("%d%%", int(percentage))) + formattedTokens = baseStyle.Foreground(t.FgSubtle).Render(fmt.Sprintf("(%s)", formattedTokens)) + formattedPercentage := baseStyle.Foreground(t.FgMuted).Render(fmt.Sprintf("%d%%", int(percentage))) formattedTokens = fmt.Sprintf("%s %s", formattedPercentage, formattedTokens) if percentage > 80 { // add the warning icon @@ -416,8 +416,6 @@ func (s *sidebarCmp) currentModelBlock() string { modelName := t.S().Text.Render(model.Name) modelInfo := fmt.Sprintf("%s %s", modelIcon, modelName) parts := []string{ - // section, - // "", modelInfo, } if s.session.ID != "" { From 382b7f89cc32be33fda2b5c06c9dcb017fa26278 Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Sat, 14 Jun 2025 13:33:09 +0200 Subject: [PATCH 53/64] fix: remove broken patch tool --- internal/exp/diffview/diffview.go | 7 +- internal/llm/agent/tools.go | 1 - internal/llm/tools/patch.go | 372 ------------------ .../tui/components/chat/messages/renderer.go | 35 -- .../dialogs/permissions/permissions.go | 16 - internal/tui/tui.go | 11 - 6 files changed, 1 insertion(+), 441 deletions(-) delete mode 100644 internal/llm/tools/patch.go diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 37c126513bff31efd2409902aecc3720ff6a1346..92dca75aaf59f26b959ad12506a6d7f414b80c98 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -3,7 +3,6 @@ package diffview import ( "fmt" "image/color" - "os" "strconv" "strings" @@ -70,11 +69,7 @@ func New() *DiffView { lineNumbers: true, tabWidth: 8, } - if lipgloss.HasDarkBackground(os.Stdin, os.Stdout) { - dv.style = DefaultDarkStyle - } else { - dv.style = DefaultLightStyle - } + dv.style = DefaultDarkStyle return dv } diff --git a/internal/llm/agent/tools.go b/internal/llm/agent/tools.go index 763f53ea6f2246f2acae3f8c2907abf8be34a1d0..0fe2c530ca6dc30916fd2dfa094ad6303bf39443 100644 --- a/internal/llm/agent/tools.go +++ b/internal/llm/agent/tools.go @@ -33,7 +33,6 @@ func CoderAgentTools( tools.NewLsTool(), tools.NewSourcegraphTool(), tools.NewViewTool(lspClients), - tools.NewPatchTool(lspClients, permissions, history), tools.NewWriteTool(lspClients, permissions, history), NewAgentTool(sessions, messages, lspClients), }, otherTools..., diff --git a/internal/llm/tools/patch.go b/internal/llm/tools/patch.go deleted file mode 100644 index f66017e25cd647190421eda40c5628b24bd1b58c..0000000000000000000000000000000000000000 --- a/internal/llm/tools/patch.go +++ /dev/null @@ -1,372 +0,0 @@ -package tools - -import ( - "context" - "encoding/json" - "fmt" - "os" - "path/filepath" - "time" - - "github.com/charmbracelet/crush/internal/config" - "github.com/charmbracelet/crush/internal/diff" - "github.com/charmbracelet/crush/internal/history" - "github.com/charmbracelet/crush/internal/logging" - "github.com/charmbracelet/crush/internal/lsp" - "github.com/charmbracelet/crush/internal/permission" -) - -type PatchParams struct { - PatchText string `json:"patch_text"` -} - -type PatchResponseMetadata struct { - FilesChanged []string `json:"files_changed"` - Additions int `json:"additions"` - Removals int `json:"removals"` -} - -type patchTool struct { - lspClients map[string]*lsp.Client - permissions permission.Service - files history.Service -} - -const ( - PatchToolName = "patch" - patchDescription = `Applies a patch to multiple files in one operation. This tool is useful for making coordinated changes across multiple files. - -The patch text must follow this format: -*** Begin Patch -*** Update File: /path/to/file -@@ Context line (unique within the file) - Line to keep --Line to remove -+Line to add - Line to keep -*** Add File: /path/to/new/file -+Content of the new file -+More content -*** Delete File: /path/to/file/to/delete -*** End Patch - -Before using this tool: -1. Use the FileRead tool to understand the files' contents and context -2. Verify all file paths are correct (use the LS tool) - -CRITICAL REQUIREMENTS FOR USING THIS TOOL: - -1. UNIQUENESS: Context lines MUST uniquely identify the specific sections you want to change -2. PRECISION: All whitespace, indentation, and surrounding code must match exactly -3. VALIDATION: Ensure edits result in idiomatic, correct code -4. PATHS: Always use absolute file paths (starting with /) - -The tool will apply all changes in a single atomic operation.` -) - -func NewPatchTool(lspClients map[string]*lsp.Client, permissions permission.Service, files history.Service) BaseTool { - return &patchTool{ - lspClients: lspClients, - permissions: permissions, - files: files, - } -} - -func (p *patchTool) Info() ToolInfo { - return ToolInfo{ - Name: PatchToolName, - Description: patchDescription, - Parameters: map[string]any{ - "patch_text": map[string]any{ - "type": "string", - "description": "The full patch text that describes all changes to be made", - }, - }, - Required: []string{"patch_text"}, - } -} - -func (p *patchTool) Run(ctx context.Context, call ToolCall) (ToolResponse, error) { - var params PatchParams - if err := json.Unmarshal([]byte(call.Input), ¶ms); err != nil { - return NewTextErrorResponse("invalid parameters"), nil - } - - if params.PatchText == "" { - return NewTextErrorResponse("patch_text is required"), nil - } - - // Identify all files needed for the patch and verify they've been read - filesToRead := diff.IdentifyFilesNeeded(params.PatchText) - for _, filePath := range filesToRead { - absPath := filePath - if !filepath.IsAbs(absPath) { - wd := config.WorkingDirectory() - absPath = filepath.Join(wd, absPath) - } - - if getLastReadTime(absPath).IsZero() { - return NewTextErrorResponse(fmt.Sprintf("you must read the file %s before patching it. Use the FileRead tool first", filePath)), nil - } - - fileInfo, err := os.Stat(absPath) - if err != nil { - if os.IsNotExist(err) { - return NewTextErrorResponse(fmt.Sprintf("file not found: %s", absPath)), nil - } - return ToolResponse{}, fmt.Errorf("failed to access file: %w", err) - } - - if fileInfo.IsDir() { - return NewTextErrorResponse(fmt.Sprintf("path is a directory, not a file: %s", absPath)), nil - } - - modTime := fileInfo.ModTime() - lastRead := getLastReadTime(absPath) - if modTime.After(lastRead) { - return NewTextErrorResponse( - fmt.Sprintf("file %s has been modified since it was last read (mod time: %s, last read: %s)", - absPath, modTime.Format(time.RFC3339), lastRead.Format(time.RFC3339), - )), nil - } - } - - // Check for new files to ensure they don't already exist - filesToAdd := diff.IdentifyFilesAdded(params.PatchText) - for _, filePath := range filesToAdd { - absPath := filePath - if !filepath.IsAbs(absPath) { - wd := config.WorkingDirectory() - absPath = filepath.Join(wd, absPath) - } - - _, err := os.Stat(absPath) - if err == nil { - return NewTextErrorResponse(fmt.Sprintf("file already exists and cannot be added: %s", absPath)), nil - } else if !os.IsNotExist(err) { - return ToolResponse{}, fmt.Errorf("failed to check file: %w", err) - } - } - - // Load all required files - currentFiles := make(map[string]string) - for _, filePath := range filesToRead { - absPath := filePath - if !filepath.IsAbs(absPath) { - wd := config.WorkingDirectory() - absPath = filepath.Join(wd, absPath) - } - - content, err := os.ReadFile(absPath) - if err != nil { - return ToolResponse{}, fmt.Errorf("failed to read file %s: %w", absPath, err) - } - currentFiles[filePath] = string(content) - } - - // Process the patch - patch, fuzz, err := diff.TextToPatch(params.PatchText, currentFiles) - if err != nil { - return NewTextErrorResponse(fmt.Sprintf("failed to parse patch: %s", err)), nil - } - - if fuzz > 3 { - return NewTextErrorResponse(fmt.Sprintf("patch contains fuzzy matches (fuzz level: %d). Please make your context lines more precise", fuzz)), nil - } - - // Convert patch to commit - commit, err := diff.PatchToCommit(patch, currentFiles) - if err != nil { - return NewTextErrorResponse(fmt.Sprintf("failed to create commit from patch: %s", err)), nil - } - - // Get session ID and message ID - sessionID, messageID := GetContextValues(ctx) - if sessionID == "" || messageID == "" { - return ToolResponse{}, fmt.Errorf("session ID and message ID are required for creating a patch") - } - - // Request permission for all changes - for path, change := range commit.Changes { - switch change.Type { - case diff.ActionAdd: - dir := filepath.Dir(path) - patchDiff, _, _ := diff.GenerateDiff("", *change.NewContent, path) - p := p.permissions.Request( - permission.CreatePermissionRequest{ - SessionID: sessionID, - Path: dir, - ToolName: PatchToolName, - Action: "create", - Description: fmt.Sprintf("Create file %s", path), - Params: EditPermissionsParams{ - FilePath: path, - Diff: patchDiff, - }, - }, - ) - if !p { - return ToolResponse{}, permission.ErrorPermissionDenied - } - case diff.ActionUpdate: - currentContent := "" - if change.OldContent != nil { - currentContent = *change.OldContent - } - newContent := "" - if change.NewContent != nil { - newContent = *change.NewContent - } - patchDiff, _, _ := diff.GenerateDiff(currentContent, newContent, path) - dir := filepath.Dir(path) - p := p.permissions.Request( - permission.CreatePermissionRequest{ - SessionID: sessionID, - Path: dir, - ToolName: PatchToolName, - Action: "update", - Description: fmt.Sprintf("Update file %s", path), - Params: EditPermissionsParams{ - FilePath: path, - Diff: patchDiff, - }, - }, - ) - if !p { - return ToolResponse{}, permission.ErrorPermissionDenied - } - case diff.ActionDelete: - dir := filepath.Dir(path) - patchDiff, _, _ := diff.GenerateDiff(*change.OldContent, "", path) - p := p.permissions.Request( - permission.CreatePermissionRequest{ - SessionID: sessionID, - Path: dir, - ToolName: PatchToolName, - Action: "delete", - Description: fmt.Sprintf("Delete file %s", path), - Params: EditPermissionsParams{ - FilePath: path, - Diff: patchDiff, - }, - }, - ) - if !p { - return ToolResponse{}, permission.ErrorPermissionDenied - } - } - } - - // Apply the changes to the filesystem - err = diff.ApplyCommit(commit, func(path string, content string) error { - absPath := path - if !filepath.IsAbs(absPath) { - wd := config.WorkingDirectory() - absPath = filepath.Join(wd, absPath) - } - - // Create parent directories if needed - dir := filepath.Dir(absPath) - if err := os.MkdirAll(dir, 0o755); err != nil { - return fmt.Errorf("failed to create parent directories for %s: %w", absPath, err) - } - - return os.WriteFile(absPath, []byte(content), 0o644) - }, func(path string) error { - absPath := path - if !filepath.IsAbs(absPath) { - wd := config.WorkingDirectory() - absPath = filepath.Join(wd, absPath) - } - return os.Remove(absPath) - }) - if err != nil { - return NewTextErrorResponse(fmt.Sprintf("failed to apply patch: %s", err)), nil - } - - // Update file history for all modified files - changedFiles := []string{} - totalAdditions := 0 - totalRemovals := 0 - - for path, change := range commit.Changes { - absPath := path - if !filepath.IsAbs(absPath) { - wd := config.WorkingDirectory() - absPath = filepath.Join(wd, absPath) - } - changedFiles = append(changedFiles, absPath) - - oldContent := "" - if change.OldContent != nil { - oldContent = *change.OldContent - } - - newContent := "" - if change.NewContent != nil { - newContent = *change.NewContent - } - - // Calculate diff statistics - _, additions, removals := diff.GenerateDiff(oldContent, newContent, path) - totalAdditions += additions - totalRemovals += removals - - // Update history - file, err := p.files.GetByPathAndSession(ctx, absPath, sessionID) - if err != nil && change.Type != diff.ActionAdd { - // If not adding a file, create history entry for existing file - _, err = p.files.Create(ctx, sessionID, absPath, oldContent) - if err != nil { - logging.Debug("Error creating file history", "error", err) - } - } - - if err == nil && change.Type != diff.ActionAdd && file.Content != oldContent { - // User manually changed content, store intermediate version - _, err = p.files.CreateVersion(ctx, sessionID, absPath, oldContent) - if err != nil { - logging.Debug("Error creating file history version", "error", err) - } - } - - // Store new version - if change.Type == diff.ActionDelete { - _, err = p.files.CreateVersion(ctx, sessionID, absPath, "") - } else { - _, err = p.files.CreateVersion(ctx, sessionID, absPath, newContent) - } - if err != nil { - logging.Debug("Error creating file history version", "error", err) - } - - // Record file operations - recordFileWrite(absPath) - recordFileRead(absPath) - } - - // Run LSP diagnostics on all changed files - for _, filePath := range changedFiles { - waitForLspDiagnostics(ctx, filePath, p.lspClients) - } - - result := fmt.Sprintf("Patch applied successfully. %d files changed, %d additions, %d removals", - len(changedFiles), totalAdditions, totalRemovals) - - diagnosticsText := "" - for _, filePath := range changedFiles { - diagnosticsText += getDiagnostics(filePath, p.lspClients) - } - - if diagnosticsText != "" { - result += "\n\nDiagnostics:\n" + diagnosticsText - } - - return WithResponseMetadata( - NewTextResponse(result), - PatchResponseMetadata{ - FilesChanged: changedFiles, - Additions: totalAdditions, - Removals: totalRemovals, - }), nil -} diff --git a/internal/tui/components/chat/messages/renderer.go b/internal/tui/components/chat/messages/renderer.go index 339aa51b299d368a5d8f3c31b0c10d6d00a8a784..12e34c5d11486859df5d22cfe23d646fff456c91 100644 --- a/internal/tui/components/chat/messages/renderer.go +++ b/internal/tui/components/chat/messages/renderer.go @@ -148,7 +148,6 @@ func init() { registry.register(tools.GrepToolName, func() renderer { return grepRenderer{} }) registry.register(tools.LSToolName, func() renderer { return lsRenderer{} }) registry.register(tools.SourcegraphToolName, func() renderer { return sourcegraphRenderer{} }) - registry.register(tools.PatchToolName, func() renderer { return patchRenderer{} }) registry.register(tools.DiagnosticsToolName, func() renderer { return diagnosticsRenderer{} }) registry.register(agent.AgentToolName, func() renderer { return agentRenderer{} }) } @@ -446,38 +445,6 @@ func (sr sourcegraphRenderer) Render(v *toolCallCmp) string { }) } -// ----------------------------------------------------------------------------- -// Patch renderer -// ----------------------------------------------------------------------------- - -// patchRenderer handles multi-file patches with change summaries -type patchRenderer struct { - baseRenderer -} - -// Render displays patch summary with file count and change statistics -func (pr patchRenderer) Render(v *toolCallCmp) string { - var params tools.PatchParams - if err := pr.unmarshalParams(v.call.Input, ¶ms); err != nil { - return pr.renderError(v, "Invalid patch parameters") - } - - args := newParamBuilder().addMain("multiple files").build() - - return pr.renderWithParams(v, "Patch", args, func() string { - var meta tools.PatchResponseMetadata - if err := pr.unmarshalParams(v.result.Metadata, &meta); err != nil { - return renderPlainContent(v, v.result.Content) - } - - summary := fmt.Sprintf("Changed %d files (%d+ %d-)", - len(meta.FilesChanged), meta.Additions, meta.Removals) - filesList := strings.Join(meta.FilesChanged, "\n") - - return renderPlainContent(v, summary+"\n\n"+filesList) - }) -} - // ----------------------------------------------------------------------------- // Diagnostics renderer // ----------------------------------------------------------------------------- @@ -711,8 +678,6 @@ func prettifyToolName(name string) string { return "View" case tools.WriteToolName: return "Write" - case tools.PatchToolName: - return "Patch" default: return name } diff --git a/internal/tui/components/dialogs/permissions/permissions.go b/internal/tui/components/dialogs/permissions/permissions.go index 0e69eaccc89237bc6ca4bf7fe694a9f48b8d524c..5a4680d9409310c089965efa6801a70633ef5317 100644 --- a/internal/tui/components/dialogs/permissions/permissions.go +++ b/internal/tui/components/dialogs/permissions/permissions.go @@ -279,20 +279,6 @@ func (p *permissionDialogCmp) renderEditContent() string { return "" } -func (p *permissionDialogCmp) renderPatchContent() string { - if pr, ok := p.permission.Params.(tools.EditPermissionsParams); ok { - diff := p.GetOrSetDiff(p.permission.ID, func() (string, error) { - return diff.FormatDiff(pr.Diff, diff.WithTotalWidth(p.contentViewPort.Width())) - }) - - contentHeight := min(p.height-9, lipgloss.Height(diff)) - p.contentViewPort.SetHeight(contentHeight) - p.contentViewPort.SetContent(diff) - return p.styleViewport() - } - return "" -} - func (p *permissionDialogCmp) renderWriteContent() string { if pr, ok := p.permission.Params.(tools.WritePermissionsParams); ok { // Use the cache for diff rendering @@ -381,8 +367,6 @@ func (p *permissionDialogCmp) render() string { contentFinal = p.renderBashContent() case tools.EditToolName: contentFinal = p.renderEditContent() - case tools.PatchToolName: - contentFinal = p.renderPatchContent() case tools.WriteToolName: contentFinal = p.renderWriteContent() case tools.FetchToolName: diff --git a/internal/tui/tui.go b/internal/tui/tui.go index e2c037a586aaad777412372b79b5596f22d569f4..cc5a2003d85d1207b6490592d858ae3e5d553837 100644 --- a/internal/tui/tui.go +++ b/internal/tui/tui.go @@ -8,7 +8,6 @@ import ( "github.com/charmbracelet/crush/internal/app" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/llm/agent" - "github.com/charmbracelet/crush/internal/llm/tools" "github.com/charmbracelet/crush/internal/logging" "github.com/charmbracelet/crush/internal/permission" "github.com/charmbracelet/crush/internal/pubsub" @@ -220,16 +219,6 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { return a, tea.Batch(cmds...) // Key Press Messages case tea.KeyPressMsg: - if msg.String() == "ctrl+t" { - go a.app.Permissions.Request(permission.CreatePermissionRequest{ - SessionID: "123", - ToolName: "bash", - Action: "execute", - Params: tools.BashPermissionsParams{ - Command: "ls -la", - }, - }) - } return a, a.handleKeyPressMsg(msg) } s, _ := a.status.Update(msg) From ed06ea21ffa9c55e847207524169adeed5588202 Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Sat, 14 Jun 2025 14:58:23 +0200 Subject: [PATCH 54/64] feat: use the new diff formatter --- internal/llm/tools/edit.go | 54 +++++++++++-------- .../tui/components/chat/messages/renderer.go | 11 ++-- internal/tui/components/core/helpers.go | 11 ++++ .../dialogs/permissions/permissions.go | 9 ++-- 4 files changed, 55 insertions(+), 30 deletions(-) diff --git a/internal/llm/tools/edit.go b/internal/llm/tools/edit.go index 2411187c1b5e6b93cc9f7fff4cdfa4b2014bbca8..fdbf4042528cfe8e2e213860203a16cb5d82ecf5 100644 --- a/internal/llm/tools/edit.go +++ b/internal/llm/tools/edit.go @@ -24,14 +24,16 @@ type EditParams struct { } type EditPermissionsParams struct { - FilePath string `json:"file_path"` - Diff string `json:"diff"` + FilePath string `json:"file_path"` + OldContent string `json:"old_content,omitempty"` + NewContent string `json:"new_content,omitempty"` } type EditResponseMetadata struct { - Diff string `json:"diff"` - Additions int `json:"additions"` - Removals int `json:"removals"` + Additions int `json:"additions"` + Removals int `json:"removals"` + OldContent string `json:"old_content,omitempty"` + NewContent string `json:"new_content,omitempty"` } type editTool struct { @@ -191,7 +193,7 @@ func (e *editTool) createNewFile(ctx context.Context, filePath, content string) return ToolResponse{}, fmt.Errorf("session ID and message ID are required for creating a new file") } - diff, additions, removals := diff.GenerateDiff( + _, additions, removals := diff.GenerateDiff( "", content, filePath, @@ -209,8 +211,9 @@ func (e *editTool) createNewFile(ctx context.Context, filePath, content string) Action: "write", Description: fmt.Sprintf("Create file %s", filePath), Params: EditPermissionsParams{ - FilePath: filePath, - Diff: diff, + FilePath: filePath, + OldContent: "", + NewContent: content, }, }, ) @@ -243,9 +246,10 @@ func (e *editTool) createNewFile(ctx context.Context, filePath, content string) return WithResponseMetadata( NewTextResponse("File created: "+filePath), EditResponseMetadata{ - Diff: diff, - Additions: additions, - Removals: removals, + OldContent: "", + NewContent: content, + Additions: additions, + Removals: removals, }, ), nil } @@ -301,7 +305,7 @@ func (e *editTool) deleteContent(ctx context.Context, filePath, oldString string return ToolResponse{}, fmt.Errorf("session ID and message ID are required for creating a new file") } - diff, additions, removals := diff.GenerateDiff( + _, additions, removals := diff.GenerateDiff( oldContent, newContent, filePath, @@ -320,8 +324,9 @@ func (e *editTool) deleteContent(ctx context.Context, filePath, oldString string Action: "write", Description: fmt.Sprintf("Delete content from file %s", filePath), Params: EditPermissionsParams{ - FilePath: filePath, - Diff: diff, + FilePath: filePath, + OldContent: oldContent, + NewContent: newContent, }, }, ) @@ -362,9 +367,10 @@ func (e *editTool) deleteContent(ctx context.Context, filePath, oldString string return WithResponseMetadata( NewTextResponse("Content deleted from file: "+filePath), EditResponseMetadata{ - Diff: diff, - Additions: additions, - Removals: removals, + OldContent: oldContent, + NewContent: newContent, + Additions: additions, + Removals: removals, }, ), nil } @@ -422,7 +428,7 @@ func (e *editTool) replaceContent(ctx context.Context, filePath, oldString, newS if sessionID == "" || messageID == "" { return ToolResponse{}, fmt.Errorf("session ID and message ID are required for creating a new file") } - diff, additions, removals := diff.GenerateDiff( + _, additions, removals := diff.GenerateDiff( oldContent, newContent, filePath, @@ -440,8 +446,9 @@ func (e *editTool) replaceContent(ctx context.Context, filePath, oldString, newS Action: "write", Description: fmt.Sprintf("Replace content in file %s", filePath), Params: EditPermissionsParams{ - FilePath: filePath, - Diff: diff, + FilePath: filePath, + OldContent: oldContent, + NewContent: newContent, }, }, ) @@ -482,8 +489,9 @@ func (e *editTool) replaceContent(ctx context.Context, filePath, oldString, newS return WithResponseMetadata( NewTextResponse("Content replaced in file: "+filePath), EditResponseMetadata{ - Diff: diff, - Additions: additions, - Removals: removals, + OldContent: oldContent, + NewContent: newContent, + Additions: additions, + Removals: removals, }), nil } diff --git a/internal/tui/components/chat/messages/renderer.go b/internal/tui/components/chat/messages/renderer.go index 12e34c5d11486859df5d22cfe23d646fff456c91..d63201fe17fe2841b3d2ee77c63edc8bbef0e34f 100644 --- a/internal/tui/components/chat/messages/renderer.go +++ b/internal/tui/components/chat/messages/renderer.go @@ -6,11 +6,11 @@ import ( "strings" "time" - "github.com/charmbracelet/crush/internal/diff" "github.com/charmbracelet/crush/internal/fileutil" "github.com/charmbracelet/crush/internal/highlight" "github.com/charmbracelet/crush/internal/llm/agent" "github.com/charmbracelet/crush/internal/llm/tools" + "github.com/charmbracelet/crush/internal/tui/components/core" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/lipgloss/v2/tree" @@ -257,9 +257,12 @@ func (er editRenderer) Render(v *toolCallCmp) string { return renderPlainContent(v, v.result.Content) } - trunc := truncateHeight(meta.Diff, responseContextHeight) - diffView, _ := diff.FormatDiff(trunc, diff.WithTotalWidth(v.textWidth()-2)) - return diffView + formatter := core.DiffFormatter(). + Before(fileutil.PrettyPath(params.FilePath), meta.OldContent). + After(fileutil.PrettyPath(params.FilePath), meta.NewContent). + Split(). + Width(v.textWidth() - 2) // -2 for padding + return formatter.String() }) } diff --git a/internal/tui/components/core/helpers.go b/internal/tui/components/core/helpers.go index e586b0563278080eb85c7e0bbaa4dbee86e670e9..f147e074dab550b4315481f35b8c5d1fdf39f153 100644 --- a/internal/tui/components/core/helpers.go +++ b/internal/tui/components/core/helpers.go @@ -4,6 +4,8 @@ import ( "image/color" "strings" + "github.com/alecthomas/chroma/v2" + "github.com/charmbracelet/crush/internal/exp/diffview" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" @@ -131,3 +133,12 @@ func SelectableButtons(buttons []ButtonOpts, spacing string) string { return lipgloss.JoinHorizontal(lipgloss.Left, parts...) } + +func DiffFormatter() *diffview.DiffView { + formatDiff := diffview.New() + style := chroma.MustNewStyle("crush", styles.GetChromaTheme()) + diff := formatDiff. + SyntaxHightlight(true). + ChromaStyle(style) + return diff +} diff --git a/internal/tui/components/dialogs/permissions/permissions.go b/internal/tui/components/dialogs/permissions/permissions.go index 5a4680d9409310c089965efa6801a70633ef5317..f36c9ec085c0627174078ec589659b28c912e327 100644 --- a/internal/tui/components/dialogs/permissions/permissions.go +++ b/internal/tui/components/dialogs/permissions/permissions.go @@ -267,10 +267,13 @@ func (p *permissionDialogCmp) renderBashContent() string { func (p *permissionDialogCmp) renderEditContent() string { if pr, ok := p.permission.Params.(tools.EditPermissionsParams); ok { - diff := p.GetOrSetDiff(p.permission.ID, func() (string, error) { - return diff.FormatDiff(pr.Diff, diff.WithTotalWidth(p.contentViewPort.Width())) - }) + formatter := core.DiffFormatter(). + Before(fileutil.PrettyPath(pr.FilePath), pr.OldContent). + After(fileutil.PrettyPath(pr.FilePath), pr.NewContent). + Width(p.contentViewPort.Width()). + Split() + diff := formatter.String() contentHeight := min(p.height-9, lipgloss.Height(diff)) p.contentViewPort.SetHeight(contentHeight) p.contentViewPort.SetContent(diff) From 34fa3c1185b9d7fd8ec09397aab975172acf6355 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 16 Jun 2025 16:34:30 -0300 Subject: [PATCH 55/64] refactor(diffview): wrap default styles into functions Co-authored-by: Christian Rocha --- internal/exp/diffview/diffview.go | 2 +- internal/exp/diffview/diffview_test.go | 14 +- internal/exp/diffview/style.go | 184 +++++++++++++------------ 3 files changed, 102 insertions(+), 98 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 92dca75aaf59f26b959ad12506a6d7f414b80c98..6e8fe858d10455a85455ec371b421ef272d78d9e 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -69,7 +69,7 @@ func New() *DiffView { lineNumbers: true, tabWidth: 8, } - dv.style = DefaultDarkStyle + dv.style = DefaultDarkStyle() return dv } diff --git a/internal/exp/diffview/diffview_test.go b/internal/exp/diffview/diffview_test.go index 847f380a316ac4a1241968d7da8597d3d9b34944..28e84716624d4b0f9efdc4044da74e438cf04b33 100644 --- a/internal/exp/diffview/diffview_test.go +++ b/internal/exp/diffview/diffview_test.go @@ -97,12 +97,12 @@ var ( LightModeFunc = func(dv *diffview.DiffView) *diffview.DiffView { return dv. - Style(diffview.DefaultLightStyle). + Style(diffview.DefaultLightStyle()). ChromaStyle(styles.Get("catppuccin-latte")) } DarkModeFunc = func(dv *diffview.DiffView) *diffview.DiffView { return dv. - Style(diffview.DefaultDarkStyle). + Style(diffview.DefaultDarkStyle()). ChromaStyle(styles.Get("catppuccin-macchiato")) } @@ -165,7 +165,7 @@ func TestDiffViewTabs(t *testing.T) { dv := diffview.New(). Before("main.go", TestTabsBefore). After("main.go", TestTabsAfter). - Style(diffview.DefaultLightStyle). + Style(diffview.DefaultLightStyle()). ChromaStyle(styles.Get("catppuccin-latte")) dv = layoutFunc(dv) @@ -190,7 +190,7 @@ func TestDiffViewWidth(t *testing.T) { Before("main.go", TestMultipleHunksBefore). After("main.go", TestMultipleHunksAfter). Width(width). - Style(diffview.DefaultLightStyle). + Style(diffview.DefaultLightStyle()). ChromaStyle(styles.Get("catppuccin-latte")) dv = layoutFunc(dv) @@ -215,7 +215,7 @@ func TestDiffViewHeight(t *testing.T) { Before("main.go", TestMultipleHunksBefore). After("main.go", TestMultipleHunksAfter). Height(height). - Style(diffview.DefaultLightStyle). + Style(diffview.DefaultLightStyle()). ChromaStyle(styles.Get("catppuccin-latte")) dv = layoutFunc(dv) @@ -239,7 +239,7 @@ func TestDiffViewXOffset(t *testing.T) { dv := diffview.New(). Before("main.go", TestDefaultBefore). After("main.go", TestDefaultAfter). - Style(diffview.DefaultLightStyle). + Style(diffview.DefaultLightStyle()). ChromaStyle(styles.Get("catppuccin-latte")). Width(60). XOffset(xOffset) @@ -265,7 +265,7 @@ func TestDiffViewYOffset(t *testing.T) { dv := diffview.New(). Before("main.go", TestMultipleHunksBefore). After("main.go", TestMultipleHunksAfter). - Style(diffview.DefaultLightStyle). + Style(diffview.DefaultLightStyle()). ChromaStyle(styles.Get("catppuccin-latte")). Height(5). YOffset(yOffset) diff --git a/internal/exp/diffview/style.go b/internal/exp/diffview/style.go index 83d7baeca9c59af9d465e9b130ae742d3138b7ce..e24f67ec7f1aee809cb058ca11268562ff00d74e 100644 --- a/internal/exp/diffview/style.go +++ b/internal/exp/diffview/style.go @@ -24,97 +24,101 @@ type Style struct { } // DefaultLightStyle provides a default light theme style for the diff view. -var DefaultLightStyle = Style{ - DividerLine: LineStyle{ - LineNumber: lipgloss.NewStyle(). - Foreground(charmtone.Iron). - Background(charmtone.Thunder), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Oyster). - Background(charmtone.Anchovy), - }, - MissingLine: LineStyle{ - LineNumber: lipgloss.NewStyle(). - Background(charmtone.Ash), - Code: lipgloss.NewStyle(). - Background(charmtone.Ash), - }, - EqualLine: LineStyle{ - LineNumber: lipgloss.NewStyle(). - Foreground(charmtone.Charcoal). - Background(charmtone.Ash), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Pepper). - Background(charmtone.Salt), - }, - InsertLine: LineStyle{ - LineNumber: lipgloss.NewStyle(). - Foreground(charmtone.Turtle). - Background(lipgloss.Color("#c8e6c9")), - Symbol: lipgloss.NewStyle(). - Foreground(charmtone.Turtle). - Background(lipgloss.Color("#e8f5e9")), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Pepper). - Background(lipgloss.Color("#e8f5e9")), - }, - DeleteLine: LineStyle{ - LineNumber: lipgloss.NewStyle(). - Foreground(charmtone.Cherry). - Background(lipgloss.Color("#ffcdd2")), - Symbol: lipgloss.NewStyle(). - Foreground(charmtone.Cherry). - Background(lipgloss.Color("#ffebee")), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Pepper). - Background(lipgloss.Color("#ffebee")), - }, +func DefaultLightStyle() Style { + return Style{ + DividerLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Iron). + Background(charmtone.Thunder), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Oyster). + Background(charmtone.Anchovy), + }, + MissingLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Background(charmtone.Ash), + Code: lipgloss.NewStyle(). + Background(charmtone.Ash), + }, + EqualLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Charcoal). + Background(charmtone.Ash), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(charmtone.Salt), + }, + InsertLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#c8e6c9")), + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#e8f5e9")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(lipgloss.Color("#e8f5e9")), + }, + DeleteLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#ffcdd2")), + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#ffebee")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Pepper). + Background(lipgloss.Color("#ffebee")), + }, + } } // DefaultDarkStyle provides a default dark theme style for the diff view. -var DefaultDarkStyle = Style{ - DividerLine: LineStyle{ - LineNumber: lipgloss.NewStyle(). - Foreground(charmtone.Smoke). - Background(charmtone.Sapphire), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Smoke). - Background(charmtone.Ox), - }, - MissingLine: LineStyle{ - LineNumber: lipgloss.NewStyle(). - Background(charmtone.Charcoal), - Code: lipgloss.NewStyle(). - Background(charmtone.Charcoal), - }, - EqualLine: LineStyle{ - LineNumber: lipgloss.NewStyle(). - Foreground(charmtone.Ash). - Background(charmtone.Charcoal), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Salt). - Background(charmtone.Pepper), - }, - InsertLine: LineStyle{ - LineNumber: lipgloss.NewStyle(). - Foreground(charmtone.Turtle). - Background(lipgloss.Color("#293229")), - Symbol: lipgloss.NewStyle(). - Foreground(charmtone.Turtle). - Background(lipgloss.Color("#303a30")), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Salt). - Background(lipgloss.Color("#303a30")), - }, - DeleteLine: LineStyle{ - LineNumber: lipgloss.NewStyle(). - Foreground(charmtone.Cherry). - Background(lipgloss.Color("#332929")), - Symbol: lipgloss.NewStyle(). - Foreground(charmtone.Cherry). - Background(lipgloss.Color("#3a3030")), - Code: lipgloss.NewStyle(). - Foreground(charmtone.Salt). - Background(lipgloss.Color("#3a3030")), - }, +func DefaultDarkStyle() Style { + return Style{ + DividerLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Smoke). + Background(charmtone.Sapphire), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Smoke). + Background(charmtone.Ox), + }, + MissingLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Background(charmtone.Charcoal), + Code: lipgloss.NewStyle(). + Background(charmtone.Charcoal), + }, + EqualLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Ash). + Background(charmtone.Charcoal), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(charmtone.Pepper), + }, + InsertLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#293229")), + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Turtle). + Background(lipgloss.Color("#303a30")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(lipgloss.Color("#303a30")), + }, + DeleteLine: LineStyle{ + LineNumber: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#332929")), + Symbol: lipgloss.NewStyle(). + Foreground(charmtone.Cherry). + Background(lipgloss.Color("#3a3030")), + Code: lipgloss.NewStyle(). + Foreground(charmtone.Salt). + Background(lipgloss.Color("#3a3030")), + }, + } } From 8033779ea6704a758d2939478a5bf02103d9b7a2 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 16 Jun 2025 17:21:49 -0300 Subject: [PATCH 56/64] refactor: rename `internal/fileutil` into `internal/fsutil` --- internal/{fileutil => fsext}/fileutil.go | 2 +- internal/{fileutil => fsext}/ls.go | 2 +- internal/llm/tools/glob.go | 8 ++++---- internal/llm/tools/grep.go | 4 ++-- internal/llm/tools/ls.go | 4 ++-- internal/tui/components/chat/editor/editor.go | 4 ++-- internal/tui/components/chat/messages/renderer.go | 14 +++++++------- internal/tui/components/chat/sidebar/sidebar.go | 4 ++-- .../components/dialogs/permissions/permissions.go | 12 ++++++------ 9 files changed, 27 insertions(+), 27 deletions(-) rename internal/{fileutil => fsext}/fileutil.go (99%) rename internal/{fileutil => fsext}/ls.go (99%) diff --git a/internal/fileutil/fileutil.go b/internal/fsext/fileutil.go similarity index 99% rename from internal/fileutil/fileutil.go rename to internal/fsext/fileutil.go index 4955c0811d586a4035808d9813a35b3c7c2f8d10..a401e014ad3b85b91a6cdf1e0c3fa7f1b9420f74 100644 --- a/internal/fileutil/fileutil.go +++ b/internal/fsext/fileutil.go @@ -1,4 +1,4 @@ -package fileutil +package fsext import ( "fmt" diff --git a/internal/fileutil/ls.go b/internal/fsext/ls.go similarity index 99% rename from internal/fileutil/ls.go rename to internal/fsext/ls.go index 1c898a642a82b0b0500d354721a06f18876c4da0..9f93baedb0e6487e39faef9de7c6a00f22547b1a 100644 --- a/internal/fileutil/ls.go +++ b/internal/fsext/ls.go @@ -1,4 +1,4 @@ -package fileutil +package fsext import ( "os" diff --git a/internal/llm/tools/glob.go b/internal/llm/tools/glob.go index 98d908c7d18b72a7590eb8e613bbff00a6d772d6..f01620b38304a9bf3bce52a6941f8f6bf639d827 100644 --- a/internal/llm/tools/glob.go +++ b/internal/llm/tools/glob.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/charmbracelet/crush/internal/config" - "github.com/charmbracelet/crush/internal/fileutil" + "github.com/charmbracelet/crush/internal/fsext" "github.com/charmbracelet/crush/internal/logging" ) @@ -127,7 +127,7 @@ func (g *globTool) Run(ctx context.Context, call ToolCall) (ToolResponse, error) } func globFiles(pattern, searchPath string, limit int) ([]string, bool, error) { - cmdRg := fileutil.GetRgCmd(pattern) + cmdRg := fsext.GetRgCmd(pattern) if cmdRg != nil { cmdRg.Dir = searchPath matches, err := runRipgrep(cmdRg, searchPath, limit) @@ -137,7 +137,7 @@ func globFiles(pattern, searchPath string, limit int) ([]string, bool, error) { logging.Warn(fmt.Sprintf("Ripgrep execution failed: %v. Falling back to doublestar.", err)) } - return fileutil.GlobWithDoubleStar(pattern, searchPath, limit) + return fsext.GlobWithDoubleStar(pattern, searchPath, limit) } func runRipgrep(cmd *exec.Cmd, searchRoot string, limit int) ([]string, error) { @@ -158,7 +158,7 @@ func runRipgrep(cmd *exec.Cmd, searchRoot string, limit int) ([]string, error) { if !filepath.IsAbs(absPath) { absPath = filepath.Join(searchRoot, absPath) } - if fileutil.SkipHidden(absPath) { + if fsext.SkipHidden(absPath) { continue } matches = append(matches, absPath) diff --git a/internal/llm/tools/grep.go b/internal/llm/tools/grep.go index 3064ee633cf0e54bfb9d14efdd475cda15a38c85..b02e77469f164f2b2706272bc60e6a7d6869e608 100644 --- a/internal/llm/tools/grep.go +++ b/internal/llm/tools/grep.go @@ -17,7 +17,7 @@ import ( "time" "github.com/charmbracelet/crush/internal/config" - "github.com/charmbracelet/crush/internal/fileutil" + "github.com/charmbracelet/crush/internal/fsext" ) // regexCache provides thread-safe caching of compiled regex patterns @@ -342,7 +342,7 @@ func searchFilesWithRegex(pattern, rootPath, include string) ([]grepMatch, error return nil // Skip directories } - if fileutil.SkipHidden(path) { + if fsext.SkipHidden(path) { return nil } diff --git a/internal/llm/tools/ls.go b/internal/llm/tools/ls.go index a0426b1393f42bc4729db558641e0c178a680d27..b31a69a6fc997edc769f53685ddb05137000f1a3 100644 --- a/internal/llm/tools/ls.go +++ b/internal/llm/tools/ls.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/charmbracelet/crush/internal/config" - "github.com/charmbracelet/crush/internal/fileutil" + "github.com/charmbracelet/crush/internal/fsext" ) type LSParams struct { @@ -108,7 +108,7 @@ func (l *lsTool) Run(ctx context.Context, call ToolCall) (ToolResponse, error) { return NewTextErrorResponse(fmt.Sprintf("path does not exist: %s", searchPath)), nil } - files, truncated, err := fileutil.ListDirectory(searchPath, params.Ignore, MaxLSFiles) + files, truncated, err := fsext.ListDirectory(searchPath, params.Ignore, MaxLSFiles) if err != nil { return ToolResponse{}, fmt.Errorf("error listing directory: %w", err) } diff --git a/internal/tui/components/chat/editor/editor.go b/internal/tui/components/chat/editor/editor.go index 97493a00508e765baedb35c7df2239fb24b3075a..2302fee3cf35ef99107f33a7140d70c4f2bdff48 100644 --- a/internal/tui/components/chat/editor/editor.go +++ b/internal/tui/components/chat/editor/editor.go @@ -12,7 +12,7 @@ import ( "github.com/charmbracelet/bubbles/v2/textarea" tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/crush/internal/app" - "github.com/charmbracelet/crush/internal/fileutil" + "github.com/charmbracelet/crush/internal/fsext" "github.com/charmbracelet/crush/internal/logging" "github.com/charmbracelet/crush/internal/message" "github.com/charmbracelet/crush/internal/session" @@ -327,7 +327,7 @@ func (m *editorCmp) SetPosition(x, y int) tea.Cmd { } func (m *editorCmp) startCompletions() tea.Msg { - files, _, _ := fileutil.ListDirectory(".", []string{}, 0) + files, _, _ := fsext.ListDirectory(".", []string{}, 0) completionItems := make([]completions.Completion, 0, len(files)) for _, file := range files { file = strings.TrimPrefix(file, "./") diff --git a/internal/tui/components/chat/messages/renderer.go b/internal/tui/components/chat/messages/renderer.go index d63201fe17fe2841b3d2ee77c63edc8bbef0e34f..32322ddefe4ebdd42a949263f9e59b752a6a3b3c 100644 --- a/internal/tui/components/chat/messages/renderer.go +++ b/internal/tui/components/chat/messages/renderer.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/charmbracelet/crush/internal/fileutil" + "github.com/charmbracelet/crush/internal/fsext" "github.com/charmbracelet/crush/internal/highlight" "github.com/charmbracelet/crush/internal/llm/agent" "github.com/charmbracelet/crush/internal/llm/tools" @@ -208,7 +208,7 @@ func (vr viewRenderer) Render(v *toolCallCmp) string { return vr.renderError(v, "Invalid view parameters") } - file := fileutil.PrettyPath(params.FilePath) + file := fsext.PrettyPath(params.FilePath) args := newParamBuilder(). addMain(file). addKeyValue("limit", formatNonZero(params.Limit)). @@ -248,7 +248,7 @@ func (er editRenderer) Render(v *toolCallCmp) string { return er.renderError(v, "Invalid edit parameters") } - file := fileutil.PrettyPath(params.FilePath) + file := fsext.PrettyPath(params.FilePath) args := newParamBuilder().addMain(file).build() return er.renderWithParams(v, "Edit", args, func() string { @@ -258,8 +258,8 @@ func (er editRenderer) Render(v *toolCallCmp) string { } formatter := core.DiffFormatter(). - Before(fileutil.PrettyPath(params.FilePath), meta.OldContent). - After(fileutil.PrettyPath(params.FilePath), meta.NewContent). + Before(fsext.PrettyPath(params.FilePath), meta.OldContent). + After(fsext.PrettyPath(params.FilePath), meta.NewContent). Split(). Width(v.textWidth() - 2) // -2 for padding return formatter.String() @@ -282,7 +282,7 @@ func (wr writeRenderer) Render(v *toolCallCmp) string { return wr.renderError(v, "Invalid write parameters") } - file := fileutil.PrettyPath(params.FilePath) + file := fsext.PrettyPath(params.FilePath) args := newParamBuilder().addMain(file).build() return wr.renderWithParams(v, "Write", args, func() string { @@ -412,7 +412,7 @@ func (lr lsRenderer) Render(v *toolCallCmp) string { if path == "" { path = "." } - path = fileutil.PrettyPath(path) + path = fsext.PrettyPath(path) args := newParamBuilder().addMain(path).build() diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go index 6b111a887d747ccd6634256d5b06e6f89d36d811..007db383c0abcf12a527b55770b00f22a22d6808 100644 --- a/internal/tui/components/chat/sidebar/sidebar.go +++ b/internal/tui/components/chat/sidebar/sidebar.go @@ -9,7 +9,7 @@ import ( tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/diff" - "github.com/charmbracelet/crush/internal/fileutil" + "github.com/charmbracelet/crush/internal/fsext" "github.com/charmbracelet/crush/internal/history" "github.com/charmbracelet/crush/internal/llm/models" "github.com/charmbracelet/crush/internal/logging" @@ -231,7 +231,7 @@ func (m *sidebarCmp) filesBlock() string { } extraContent := strings.Join(statusParts, " ") - filePath := fileutil.DirTrim(fileutil.PrettyPath(file.FilePath), 2) + filePath := fsext.DirTrim(fsext.PrettyPath(file.FilePath), 2) filePath = ansi.Truncate(filePath, maxWidth-lipgloss.Width(extraContent)-2, "…") fileList = append(fileList, core.Status( diff --git a/internal/tui/components/dialogs/permissions/permissions.go b/internal/tui/components/dialogs/permissions/permissions.go index f36c9ec085c0627174078ec589659b28c912e327..65908c2fd79b6fb0eb13cbd1cff097bf60a030fc 100644 --- a/internal/tui/components/dialogs/permissions/permissions.go +++ b/internal/tui/components/dialogs/permissions/permissions.go @@ -8,7 +8,7 @@ import ( "github.com/charmbracelet/bubbles/v2/viewport" tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/crush/internal/diff" - "github.com/charmbracelet/crush/internal/fileutil" + "github.com/charmbracelet/crush/internal/fsext" "github.com/charmbracelet/crush/internal/llm/tools" "github.com/charmbracelet/crush/internal/permission" "github.com/charmbracelet/crush/internal/tui/components/core" @@ -170,7 +170,7 @@ func (p *permissionDialogCmp) renderHeader() string { pathKey := t.S().Muted.Render("Path") pathValue := t.S().Text. Width(p.width - lipgloss.Width(pathKey)). - Render(fmt.Sprintf(" %s", fileutil.PrettyPath(p.permission.Path))) + Render(fmt.Sprintf(" %s", fsext.PrettyPath(p.permission.Path))) headerParts := []string{ lipgloss.JoinHorizontal( @@ -196,7 +196,7 @@ func (p *permissionDialogCmp) renderHeader() string { fileKey := t.S().Muted.Render("File") filePath := t.S().Text. Width(p.width - lipgloss.Width(fileKey)). - Render(fmt.Sprintf(" %s", fileutil.PrettyPath(params.FilePath))) + Render(fmt.Sprintf(" %s", fsext.PrettyPath(params.FilePath))) headerParts = append(headerParts, lipgloss.JoinHorizontal( lipgloss.Left, @@ -211,7 +211,7 @@ func (p *permissionDialogCmp) renderHeader() string { fileKey := t.S().Muted.Render("File") filePath := t.S().Text. Width(p.width - lipgloss.Width(fileKey)). - Render(fmt.Sprintf(" %s", fileutil.PrettyPath(params.FilePath))) + Render(fmt.Sprintf(" %s", fsext.PrettyPath(params.FilePath))) headerParts = append(headerParts, lipgloss.JoinHorizontal( lipgloss.Left, @@ -268,8 +268,8 @@ func (p *permissionDialogCmp) renderBashContent() string { func (p *permissionDialogCmp) renderEditContent() string { if pr, ok := p.permission.Params.(tools.EditPermissionsParams); ok { formatter := core.DiffFormatter(). - Before(fileutil.PrettyPath(pr.FilePath), pr.OldContent). - After(fileutil.PrettyPath(pr.FilePath), pr.NewContent). + Before(fsext.PrettyPath(pr.FilePath), pr.OldContent). + After(fsext.PrettyPath(pr.FilePath), pr.NewContent). Width(p.contentViewPort.Width()). Split() From 20a1704c5426d89c939587f7717cf33c4e858217 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 16 Jun 2025 17:32:20 -0300 Subject: [PATCH 57/64] chore: fix broken performance tests: Co-authored-by: Raphael Amorim --- internal/llm/tools/shell/comparison_test.go | 29 --------------------- internal/llm/tools/shell/shell_test.go | 25 ------------------ 2 files changed, 54 deletions(-) diff --git a/internal/llm/tools/shell/comparison_test.go b/internal/llm/tools/shell/comparison_test.go index 7fcd720b5ecdfba236ed7316dfc26b63d5ff9605..7cfe28034bb5d53148cfef0f4815dd685dd597e4 100644 --- a/internal/llm/tools/shell/comparison_test.go +++ b/internal/llm/tools/shell/comparison_test.go @@ -3,7 +3,6 @@ package shell import ( "context" "os" - "runtime" "testing" "time" @@ -32,34 +31,6 @@ func TestShellPerformanceComparison(t *testing.T) { t.Logf("Quick command took: %v", duration) } -func TestShellCPUUsageComparison(t *testing.T) { - tmpDir, err := os.MkdirTemp("", "shell-test") - require.NoError(t, err) - defer os.RemoveAll(tmpDir) - - shell := GetPersistentShell(tmpDir) - defer shell.Close() - - // Measure CPU and memory usage during a longer command - var m1, m2 runtime.MemStats - runtime.GC() - runtime.ReadMemStats(&m1) - - start := time.Now() - _, stderr, exitCode, _, err := shell.Exec(context.Background(), "sleep 0.1", 1000) - duration := time.Since(start) - - runtime.ReadMemStats(&m2) - - require.NoError(t, err) - assert.Equal(t, 0, exitCode) - assert.Empty(t, stderr) - - memGrowth := m2.Alloc - m1.Alloc - t.Logf("Sleep 0.1s command took: %v", duration) - t.Logf("Memory growth during polling: %d bytes", memGrowth) - t.Logf("GC cycles during test: %d", m2.NumGC-m1.NumGC) -} // Benchmark CPU usage during polling func BenchmarkShellPolling(b *testing.B) { diff --git a/internal/llm/tools/shell/shell_test.go b/internal/llm/tools/shell/shell_test.go index 327ec91db5f2cdffdbb501648df1546e4746fabb..48198426e06ec2ade627bd6f24db0d02ad005b0f 100644 --- a/internal/llm/tools/shell/shell_test.go +++ b/internal/llm/tools/shell/shell_test.go @@ -4,35 +4,10 @@ import ( "context" "os" "testing" - "time" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) -func TestShellPerformanceImprovement(t *testing.T) { - // Create a temporary directory for the shell - tmpDir, err := os.MkdirTemp("", "shell-test") - require.NoError(t, err) - defer os.RemoveAll(tmpDir) - - shell := GetPersistentShell(tmpDir) - defer shell.Close() - - // Test that quick commands complete fast - start := time.Now() - stdout, stderr, exitCode, _, err := shell.Exec(context.Background(), "echo 'hello world'", 0) - duration := time.Since(start) - - require.NoError(t, err) - assert.Equal(t, 0, exitCode) - assert.Contains(t, stdout, "hello world") - assert.Empty(t, stderr) - - // Quick commands should complete very fast with our exponential backoff - assert.Less(t, duration, 50*time.Millisecond, "Quick command should complete fast with exponential backoff") -} - // Benchmark to measure CPU efficiency func BenchmarkShellQuickCommands(b *testing.B) { tmpDir, err := os.MkdirTemp("", "shell-bench") From 8ea7890d99db936074b611ff960dc8fccd50ea04 Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Mon, 16 Jun 2025 12:34:28 +0200 Subject: [PATCH 58/64] perf: lsp batching --- internal/lsp/watcher/watcher.go | 34 ++- .../lsp/watcher/watcher_performance_test.go | 227 ++++++++++++++++++ 2 files changed, 252 insertions(+), 9 deletions(-) create mode 100644 internal/lsp/watcher/watcher_performance_test.go diff --git a/internal/lsp/watcher/watcher.go b/internal/lsp/watcher/watcher.go index 3b8c36d963b88c1c4b60ef23a5c7cd9c26af4025..4db10e5b7163468f9d45b307be493a70028381b5 100644 --- a/internal/lsp/watcher/watcher.go +++ b/internal/lsp/watcher/watcher.go @@ -257,7 +257,10 @@ func (w *WorkspaceWatcher) openHighPriorityFiles(ctx context.Context, serverName } } - // For each pattern, find and open matching files + // Collect all files to open first + var filesToOpen []string + + // For each pattern, find matching files for _, pattern := range patterns { // Use doublestar.Glob to find files matching the pattern (supports ** patterns) matches, err := doublestar.Glob(os.DirFS(w.workspacePath), pattern) @@ -278,7 +281,23 @@ func (w *WorkspaceWatcher) openHighPriorityFiles(ctx context.Context, serverName continue } - // Open the file + filesToOpen = append(filesToOpen, fullPath) + + // Limit the number of files per pattern + if len(filesToOpen) >= 5 && (serverName != "java" && serverName != "jdtls") { + break + } + } + } + + // Open files in batches to reduce overhead + batchSize := 3 + for i := 0; i < len(filesToOpen); i += batchSize { + end := min(i+batchSize, len(filesToOpen)) + + // Open batch of files + for j := i; j < end; j++ { + fullPath := filesToOpen[j] if err := w.client.OpenFile(ctx, fullPath); err != nil { if cnf.DebugLSP { logging.Debug("Error opening high-priority file", "path", fullPath, "error", err) @@ -289,14 +308,11 @@ func (w *WorkspaceWatcher) openHighPriorityFiles(ctx context.Context, serverName logging.Debug("Opened high-priority file", "path", fullPath) } } + } - // Add a small delay to prevent overwhelming the server - time.Sleep(20 * time.Millisecond) - - // Limit the number of files opened per pattern - if filesOpened >= 5 && (serverName != "java" && serverName != "jdtls") { - break - } + // Only add delay between batches, not individual files + if end < len(filesToOpen) { + time.Sleep(50 * time.Millisecond) } } diff --git a/internal/lsp/watcher/watcher_performance_test.go b/internal/lsp/watcher/watcher_performance_test.go new file mode 100644 index 0000000000000000000000000000000000000000..cc985b73355ac21e7f90a1aef786862e57aedf6e --- /dev/null +++ b/internal/lsp/watcher/watcher_performance_test.go @@ -0,0 +1,227 @@ +package watcher + +import ( + "os" + "path/filepath" + "testing" + "time" + + "github.com/bmatcuk/doublestar/v4" +) + +// createTestWorkspace creates a temporary workspace with test files +func createTestWorkspace(tb testing.TB) string { + tmpDir, err := os.MkdirTemp("", "watcher_test") + if err != nil { + tb.Fatal(err) + } + + // Create test files for Go project + testFiles := []string{ + "go.mod", + "go.sum", + "main.go", + "src/lib.go", + "src/utils.go", + "cmd/app.go", + "internal/config.go", + "internal/db.go", + "pkg/api.go", + "pkg/client.go", + "test/main_test.go", + "test/lib_test.go", + "docs/README.md", + "scripts/build.sh", + "Makefile", + } + + for _, file := range testFiles { + fullPath := filepath.Join(tmpDir, file) + dir := filepath.Dir(fullPath) + + if err := os.MkdirAll(dir, 0755); err != nil { + tb.Fatal(err) + } + + if err := os.WriteFile(fullPath, []byte("// test content"), 0644); err != nil { + tb.Fatal(err) + } + } + + return tmpDir +} + +// simulateOldApproach simulates the old file opening approach with per-file delays +func simulateOldApproach(workspacePath string, serverName string) (int, time.Duration) { + start := time.Now() + filesOpened := 0 + + // Define patterns for high-priority files based on server type + var patterns []string + + switch serverName { + case "gopls": + patterns = []string{ + "**/go.mod", + "**/go.sum", + "**/main.go", + } + default: + patterns = []string{ + "**/package.json", + "**/Makefile", + } + } + + // OLD APPROACH: For each pattern, find and open matching files with per-file delays + for _, pattern := range patterns { + matches, err := doublestar.Glob(os.DirFS(workspacePath), pattern) + if err != nil { + continue + } + + for _, match := range matches { + fullPath := filepath.Join(workspacePath, match) + info, err := os.Stat(fullPath) + if err != nil || info.IsDir() { + continue + } + + // Simulate file opening (1ms overhead) + time.Sleep(1 * time.Millisecond) + filesOpened++ + + // OLD: Add delay after each file + time.Sleep(20 * time.Millisecond) + + // Limit files + if filesOpened >= 5 { + break + } + } + } + + return filesOpened, time.Since(start) +} + +// simulateNewApproach simulates the new batched file opening approach +func simulateNewApproach(workspacePath string, serverName string) (int, time.Duration) { + start := time.Now() + filesOpened := 0 + + // Define patterns for high-priority files based on server type + var patterns []string + + switch serverName { + case "gopls": + patterns = []string{ + "**/go.mod", + "**/go.sum", + "**/main.go", + } + default: + patterns = []string{ + "**/package.json", + "**/Makefile", + } + } + + // NEW APPROACH: Collect all files first + var filesToOpen []string + + // For each pattern, find matching files + for _, pattern := range patterns { + matches, err := doublestar.Glob(os.DirFS(workspacePath), pattern) + if err != nil { + continue + } + + for _, match := range matches { + fullPath := filepath.Join(workspacePath, match) + info, err := os.Stat(fullPath) + if err != nil || info.IsDir() { + continue + } + + filesToOpen = append(filesToOpen, fullPath) + + // Limit the number of files per pattern + if len(filesToOpen) >= 5 { + break + } + } + } + + // Open files in batches to reduce overhead + batchSize := 3 + for i := 0; i < len(filesToOpen); i += batchSize { + end := min(i+batchSize, len(filesToOpen)) + + // Open batch of files + for j := i; j < end; j++ { + // Simulate file opening (1ms overhead) + time.Sleep(1 * time.Millisecond) + filesOpened++ + } + + // Only add delay between batches, not individual files + if end < len(filesToOpen) { + time.Sleep(50 * time.Millisecond) + } + } + + return filesOpened, time.Since(start) +} + +func BenchmarkOldApproach(b *testing.B) { + tmpDir := createTestWorkspace(b) + defer os.RemoveAll(tmpDir) + + b.ResetTimer() + for i := 0; i < b.N; i++ { + simulateOldApproach(tmpDir, "gopls") + } +} + +func BenchmarkNewApproach(b *testing.B) { + tmpDir := createTestWorkspace(b) + defer os.RemoveAll(tmpDir) + + b.ResetTimer() + for i := 0; i < b.N; i++ { + simulateNewApproach(tmpDir, "gopls") + } +} + +func TestPerformanceComparison(t *testing.T) { + tmpDir := createTestWorkspace(t) + defer os.RemoveAll(tmpDir) + + // Test old approach + filesOpenedOld, oldDuration := simulateOldApproach(tmpDir, "gopls") + + // Test new approach + filesOpenedNew, newDuration := simulateNewApproach(tmpDir, "gopls") + + t.Logf("Old approach: %d files in %v", filesOpenedOld, oldDuration) + t.Logf("New approach: %d files in %v", filesOpenedNew, newDuration) + + if newDuration > 0 && oldDuration > 0 { + improvement := float64(oldDuration-newDuration) / float64(oldDuration) * 100 + t.Logf("Performance improvement: %.1f%%", improvement) + + if improvement <= 0 { + t.Errorf("Expected performance improvement, but new approach was slower") + } + } + + // Verify same number of files opened + if filesOpenedOld != filesOpenedNew { + t.Errorf("Different number of files opened: old=%d, new=%d", filesOpenedOld, filesOpenedNew) + } + + // Verify new approach is faster + if newDuration >= oldDuration { + t.Errorf("New approach should be faster: old=%v, new=%v", oldDuration, newDuration) + } +} \ No newline at end of file From 052f54c87f86a2b37a138ee11b3ec8a80ee8fdea Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Mon, 16 Jun 2025 12:45:08 +0200 Subject: [PATCH 59/64] fix: format internal/lsp/watcher/watcher_performance_test.go --- .../lsp/watcher/watcher_performance_test.go | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/lsp/watcher/watcher_performance_test.go b/internal/lsp/watcher/watcher_performance_test.go index cc985b73355ac21e7f90a1aef786862e57aedf6e..e1387c191c3d4602c01fe7f1fc8251cf8193d2a6 100644 --- a/internal/lsp/watcher/watcher_performance_test.go +++ b/internal/lsp/watcher/watcher_performance_test.go @@ -19,7 +19,7 @@ func createTestWorkspace(tb testing.TB) string { // Create test files for Go project testFiles := []string{ "go.mod", - "go.sum", + "go.sum", "main.go", "src/lib.go", "src/utils.go", @@ -38,11 +38,11 @@ func createTestWorkspace(tb testing.TB) string { for _, file := range testFiles { fullPath := filepath.Join(tmpDir, file) dir := filepath.Dir(fullPath) - + if err := os.MkdirAll(dir, 0755); err != nil { tb.Fatal(err) } - + if err := os.WriteFile(fullPath, []byte("// test content"), 0644); err != nil { tb.Fatal(err) } @@ -128,7 +128,7 @@ func simulateNewApproach(workspacePath string, serverName string) (int, time.Dur // NEW APPROACH: Collect all files first var filesToOpen []string - + // For each pattern, find matching files for _, pattern := range patterns { matches, err := doublestar.Glob(os.DirFS(workspacePath), pattern) @@ -144,7 +144,7 @@ func simulateNewApproach(workspacePath string, serverName string) (int, time.Dur } filesToOpen = append(filesToOpen, fullPath) - + // Limit the number of files per pattern if len(filesToOpen) >= 5 { break @@ -156,14 +156,14 @@ func simulateNewApproach(workspacePath string, serverName string) (int, time.Dur batchSize := 3 for i := 0; i < len(filesToOpen); i += batchSize { end := min(i+batchSize, len(filesToOpen)) - + // Open batch of files for j := i; j < end; j++ { // Simulate file opening (1ms overhead) time.Sleep(1 * time.Millisecond) filesOpened++ } - + // Only add delay between batches, not individual files if end < len(filesToOpen) { time.Sleep(50 * time.Millisecond) @@ -205,11 +205,11 @@ func TestPerformanceComparison(t *testing.T) { t.Logf("Old approach: %d files in %v", filesOpenedOld, oldDuration) t.Logf("New approach: %d files in %v", filesOpenedNew, newDuration) - + if newDuration > 0 && oldDuration > 0 { improvement := float64(oldDuration-newDuration) / float64(oldDuration) * 100 t.Logf("Performance improvement: %.1f%%", improvement) - + if improvement <= 0 { t.Errorf("Expected performance improvement, but new approach was slower") } @@ -224,4 +224,4 @@ func TestPerformanceComparison(t *testing.T) { if newDuration >= oldDuration { t.Errorf("New approach should be faster: old=%v, new=%v", oldDuration, newDuration) } -} \ No newline at end of file +} From 54d5622bb0ac5e66588c1bd2ad77774d9c5065e2 Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Mon, 16 Jun 2025 23:03:30 +0200 Subject: [PATCH 60/64] fix: remove watcher_performance_test.go --- .../lsp/watcher/watcher_performance_test.go | 227 ------------------ 1 file changed, 227 deletions(-) delete mode 100644 internal/lsp/watcher/watcher_performance_test.go diff --git a/internal/lsp/watcher/watcher_performance_test.go b/internal/lsp/watcher/watcher_performance_test.go deleted file mode 100644 index e1387c191c3d4602c01fe7f1fc8251cf8193d2a6..0000000000000000000000000000000000000000 --- a/internal/lsp/watcher/watcher_performance_test.go +++ /dev/null @@ -1,227 +0,0 @@ -package watcher - -import ( - "os" - "path/filepath" - "testing" - "time" - - "github.com/bmatcuk/doublestar/v4" -) - -// createTestWorkspace creates a temporary workspace with test files -func createTestWorkspace(tb testing.TB) string { - tmpDir, err := os.MkdirTemp("", "watcher_test") - if err != nil { - tb.Fatal(err) - } - - // Create test files for Go project - testFiles := []string{ - "go.mod", - "go.sum", - "main.go", - "src/lib.go", - "src/utils.go", - "cmd/app.go", - "internal/config.go", - "internal/db.go", - "pkg/api.go", - "pkg/client.go", - "test/main_test.go", - "test/lib_test.go", - "docs/README.md", - "scripts/build.sh", - "Makefile", - } - - for _, file := range testFiles { - fullPath := filepath.Join(tmpDir, file) - dir := filepath.Dir(fullPath) - - if err := os.MkdirAll(dir, 0755); err != nil { - tb.Fatal(err) - } - - if err := os.WriteFile(fullPath, []byte("// test content"), 0644); err != nil { - tb.Fatal(err) - } - } - - return tmpDir -} - -// simulateOldApproach simulates the old file opening approach with per-file delays -func simulateOldApproach(workspacePath string, serverName string) (int, time.Duration) { - start := time.Now() - filesOpened := 0 - - // Define patterns for high-priority files based on server type - var patterns []string - - switch serverName { - case "gopls": - patterns = []string{ - "**/go.mod", - "**/go.sum", - "**/main.go", - } - default: - patterns = []string{ - "**/package.json", - "**/Makefile", - } - } - - // OLD APPROACH: For each pattern, find and open matching files with per-file delays - for _, pattern := range patterns { - matches, err := doublestar.Glob(os.DirFS(workspacePath), pattern) - if err != nil { - continue - } - - for _, match := range matches { - fullPath := filepath.Join(workspacePath, match) - info, err := os.Stat(fullPath) - if err != nil || info.IsDir() { - continue - } - - // Simulate file opening (1ms overhead) - time.Sleep(1 * time.Millisecond) - filesOpened++ - - // OLD: Add delay after each file - time.Sleep(20 * time.Millisecond) - - // Limit files - if filesOpened >= 5 { - break - } - } - } - - return filesOpened, time.Since(start) -} - -// simulateNewApproach simulates the new batched file opening approach -func simulateNewApproach(workspacePath string, serverName string) (int, time.Duration) { - start := time.Now() - filesOpened := 0 - - // Define patterns for high-priority files based on server type - var patterns []string - - switch serverName { - case "gopls": - patterns = []string{ - "**/go.mod", - "**/go.sum", - "**/main.go", - } - default: - patterns = []string{ - "**/package.json", - "**/Makefile", - } - } - - // NEW APPROACH: Collect all files first - var filesToOpen []string - - // For each pattern, find matching files - for _, pattern := range patterns { - matches, err := doublestar.Glob(os.DirFS(workspacePath), pattern) - if err != nil { - continue - } - - for _, match := range matches { - fullPath := filepath.Join(workspacePath, match) - info, err := os.Stat(fullPath) - if err != nil || info.IsDir() { - continue - } - - filesToOpen = append(filesToOpen, fullPath) - - // Limit the number of files per pattern - if len(filesToOpen) >= 5 { - break - } - } - } - - // Open files in batches to reduce overhead - batchSize := 3 - for i := 0; i < len(filesToOpen); i += batchSize { - end := min(i+batchSize, len(filesToOpen)) - - // Open batch of files - for j := i; j < end; j++ { - // Simulate file opening (1ms overhead) - time.Sleep(1 * time.Millisecond) - filesOpened++ - } - - // Only add delay between batches, not individual files - if end < len(filesToOpen) { - time.Sleep(50 * time.Millisecond) - } - } - - return filesOpened, time.Since(start) -} - -func BenchmarkOldApproach(b *testing.B) { - tmpDir := createTestWorkspace(b) - defer os.RemoveAll(tmpDir) - - b.ResetTimer() - for i := 0; i < b.N; i++ { - simulateOldApproach(tmpDir, "gopls") - } -} - -func BenchmarkNewApproach(b *testing.B) { - tmpDir := createTestWorkspace(b) - defer os.RemoveAll(tmpDir) - - b.ResetTimer() - for i := 0; i < b.N; i++ { - simulateNewApproach(tmpDir, "gopls") - } -} - -func TestPerformanceComparison(t *testing.T) { - tmpDir := createTestWorkspace(t) - defer os.RemoveAll(tmpDir) - - // Test old approach - filesOpenedOld, oldDuration := simulateOldApproach(tmpDir, "gopls") - - // Test new approach - filesOpenedNew, newDuration := simulateNewApproach(tmpDir, "gopls") - - t.Logf("Old approach: %d files in %v", filesOpenedOld, oldDuration) - t.Logf("New approach: %d files in %v", filesOpenedNew, newDuration) - - if newDuration > 0 && oldDuration > 0 { - improvement := float64(oldDuration-newDuration) / float64(oldDuration) * 100 - t.Logf("Performance improvement: %.1f%%", improvement) - - if improvement <= 0 { - t.Errorf("Expected performance improvement, but new approach was slower") - } - } - - // Verify same number of files opened - if filesOpenedOld != filesOpenedNew { - t.Errorf("Different number of files opened: old=%d, new=%d", filesOpenedOld, filesOpenedNew) - } - - // Verify new approach is faster - if newDuration >= oldDuration { - t.Errorf("New approach should be faster: old=%v, new=%v", oldDuration, newDuration) - } -} From a011b86e050ed6062d18080f1f23669f12a3a497 Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Tue, 17 Jun 2025 10:18:51 +0200 Subject: [PATCH 61/64] chore: small fix --- internal/version/version.go | 2 +- todos.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/version/version.go b/internal/version/version.go index a762fc8a47d9f4b837a53210408a0415546ab2af..fc8b560c52b7c46c92909a30c2be269dd477de5c 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -5,7 +5,7 @@ import "runtime/debug" // Build-time parameters set via -ldflags var Version = "unknown" -// A user may install pug using `go install github.com/charmbracelet/crush@latest`. +// A user may install crush using `go install github.com/charmbracelet/crush@latest`. // without -ldflags, in which case the version above is unset. As a workaround // we use the embedded build version that *is* set when using `go install` (and // is only set for `go install` and not for `go build`). diff --git a/todos.md b/todos.md index 9f03c059deecb22d86f42074050e4e7e15038174..a1b8adb06e7fb997be154e9b80177d25a0449b33 100644 --- a/todos.md +++ b/todos.md @@ -36,3 +36,4 @@ - [ ] Revisit the provider/model/configs - [ ] Implement correct persistent shell - [ ] Store file read/write time somewhere so that the we can make sure that even if we restart we do not need to re-read the same file +- [ ] Send updates to the UI when new LSP diagnostics are available From d7246a9e7c1d4a3f5c7a486ba8ae15c52b48ebee Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Tue, 17 Jun 2025 12:38:08 +0200 Subject: [PATCH 62/64] chore: small sidebar fix --- internal/tui/components/chat/sidebar/sidebar.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go index 007db383c0abcf12a527b55770b00f22a22d6808..8adc223d5bbc1edb49fee551d894ffb9716510ed 100644 --- a/internal/tui/components/chat/sidebar/sidebar.go +++ b/internal/tui/components/chat/sidebar/sidebar.go @@ -107,8 +107,11 @@ func (m *sidebarCmp) View() tea.View { m.cwd, "", m.currentModelBlock(), - "", - m.filesBlock(), + ) + if m.session.ID != "" { + parts = append(parts, "", m.filesBlock()) + } + parts = append(parts, "", m.lspBlock(), "", From ac5fb91e2098504d95b5e140276a11caf3558222 Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Tue, 17 Jun 2025 14:03:12 +0200 Subject: [PATCH 63/64] fix: fix the file history table and implement realtime file updates --- cmd/root.go | 1 + cspell.json | 2 +- internal/db/db.go | 10 -- internal/db/files.sql.go | 45 ++------ .../db/migrations/20250424200609_initial.sql | 2 +- internal/db/models.go | 2 +- internal/db/querier.go | 1 - internal/db/sql/files.sql | 21 +--- internal/history/file.go | 56 ++------- internal/llm/tools/shell/comparison_test.go | 1 - .../tui/components/chat/sidebar/sidebar.go | 109 +++++++++++++----- todos.md | 4 +- 12 files changed, 110 insertions(+), 144 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index a29991e566e851181c332837f07200f1730fc249..9356ac271eb154989ccd690a21cd22d73d78b797 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -256,6 +256,7 @@ func setupSubscriptions(app *app.App, parentCtx context.Context) (chan tea.Msg, setupSubscriber(ctx, &wg, "messages", app.Messages.Subscribe, ch) setupSubscriber(ctx, &wg, "permissions", app.Permissions.Subscribe, ch) setupSubscriber(ctx, &wg, "coderAgent", app.CoderAgent.Subscribe, ch) + setupSubscriber(ctx, &wg, "history", app.History.Subscribe, ch) cleanupFunc := func() { logging.Info("Cancelling all subscriptions") diff --git a/cspell.json b/cspell.json index afdb1e5275851972ef8d0cf2c8503fe9f2f26323..266001569d7d8dfb6713c634286f406ae04b03b1 100644 --- a/cspell.json +++ b/cspell.json @@ -1 +1 @@ -{"flagWords":[],"language":"en","words":["crush","charmbracelet","lipgloss","bubbletea","textinput","Focusable","lsps","Sourcegraph","filepicker","imageorient","rasterx","oksvg","termenv","trashhalo","lucasb","nfnt","srwiley","Lanczos"],"version":"0.2"} \ No newline at end of file +{"version":"0.2","language":"en","flagWords":[],"words":["crush","charmbracelet","lipgloss","bubbletea","textinput","Focusable","lsps","Sourcegraph","filepicker","imageorient","rasterx","oksvg","termenv","trashhalo","lucasb","nfnt","srwiley","Lanczos","fsext"]} \ No newline at end of file diff --git a/internal/db/db.go b/internal/db/db.go index 5badad3a280eb9e11ae0b6a9d068f8f9efb937b6..62ebe0134c683f2a3f69d26ea3f826c9bbf02d14 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -78,9 +78,6 @@ func Prepare(ctx context.Context, db DBTX) (*Queries, error) { if q.listSessionsStmt, err = db.PrepareContext(ctx, listSessions); err != nil { return nil, fmt.Errorf("error preparing query ListSessions: %w", err) } - if q.updateFileStmt, err = db.PrepareContext(ctx, updateFile); err != nil { - return nil, fmt.Errorf("error preparing query UpdateFile: %w", err) - } if q.updateMessageStmt, err = db.PrepareContext(ctx, updateMessage); err != nil { return nil, fmt.Errorf("error preparing query UpdateMessage: %w", err) } @@ -182,11 +179,6 @@ func (q *Queries) Close() error { err = fmt.Errorf("error closing listSessionsStmt: %w", cerr) } } - if q.updateFileStmt != nil { - if cerr := q.updateFileStmt.Close(); cerr != nil { - err = fmt.Errorf("error closing updateFileStmt: %w", cerr) - } - } if q.updateMessageStmt != nil { if cerr := q.updateMessageStmt.Close(); cerr != nil { err = fmt.Errorf("error closing updateMessageStmt: %w", cerr) @@ -254,7 +246,6 @@ type Queries struct { listMessagesBySessionStmt *sql.Stmt listNewFilesStmt *sql.Stmt listSessionsStmt *sql.Stmt - updateFileStmt *sql.Stmt updateMessageStmt *sql.Stmt updateSessionStmt *sql.Stmt } @@ -281,7 +272,6 @@ func (q *Queries) WithTx(tx *sql.Tx) *Queries { listMessagesBySessionStmt: q.listMessagesBySessionStmt, listNewFilesStmt: q.listNewFilesStmt, listSessionsStmt: q.listSessionsStmt, - updateFileStmt: q.updateFileStmt, updateMessageStmt: q.updateMessageStmt, updateSessionStmt: q.updateSessionStmt, } diff --git a/internal/db/files.sql.go b/internal/db/files.sql.go index 28abaa55d736b6eeefb721b69f4bcc7fceb4af37..a52516d20edb189e476ad41bbc7486b2ea8cc18b 100644 --- a/internal/db/files.sql.go +++ b/internal/db/files.sql.go @@ -29,7 +29,7 @@ type CreateFileParams struct { SessionID string `json:"session_id"` Path string `json:"path"` Content string `json:"content"` - Version string `json:"version"` + Version int64 `json:"version"` } func (q *Queries) CreateFile(ctx context.Context, arg CreateFileParams) (File, error) { @@ -98,7 +98,7 @@ const getFileByPathAndSession = `-- name: GetFileByPathAndSession :one SELECT id, session_id, path, content, version, created_at, updated_at FROM files WHERE path = ? AND session_id = ? -ORDER BY created_at DESC +ORDER BY version DESC, created_at DESC LIMIT 1 ` @@ -126,7 +126,7 @@ const listFilesByPath = `-- name: ListFilesByPath :many SELECT id, session_id, path, content, version, created_at, updated_at FROM files WHERE path = ? -ORDER BY created_at DESC +ORDER BY version DESC, created_at DESC ` func (q *Queries) ListFilesByPath(ctx context.Context, path string) ([]File, error) { @@ -164,7 +164,7 @@ const listFilesBySession = `-- name: ListFilesBySession :many SELECT id, session_id, path, content, version, created_at, updated_at FROM files WHERE session_id = ? -ORDER BY created_at ASC +ORDER BY version ASC, created_at ASC ` func (q *Queries) ListFilesBySession(ctx context.Context, sessionID string) ([]File, error) { @@ -202,10 +202,10 @@ const listLatestSessionFiles = `-- name: ListLatestSessionFiles :many SELECT f.id, f.session_id, f.path, f.content, f.version, f.created_at, f.updated_at FROM files f INNER JOIN ( - SELECT path, MAX(created_at) as max_created_at + SELECT path, MAX(version) as max_version, MAX(created_at) as max_created_at FROM files GROUP BY path -) latest ON f.path = latest.path AND f.created_at = latest.max_created_at +) latest ON f.path = latest.path AND f.version = latest.max_version AND f.created_at = latest.max_created_at WHERE f.session_id = ? ORDER BY f.path ` @@ -245,7 +245,7 @@ const listNewFiles = `-- name: ListNewFiles :many SELECT id, session_id, path, content, version, created_at, updated_at FROM files WHERE is_new = 1 -ORDER BY created_at DESC +ORDER BY version DESC, created_at DESC ` func (q *Queries) ListNewFiles(ctx context.Context) ([]File, error) { @@ -278,34 +278,3 @@ func (q *Queries) ListNewFiles(ctx context.Context) ([]File, error) { } return items, nil } - -const updateFile = `-- name: UpdateFile :one -UPDATE files -SET - content = ?, - version = ?, - updated_at = strftime('%s', 'now') -WHERE id = ? -RETURNING id, session_id, path, content, version, created_at, updated_at -` - -type UpdateFileParams struct { - Content string `json:"content"` - Version string `json:"version"` - ID string `json:"id"` -} - -func (q *Queries) UpdateFile(ctx context.Context, arg UpdateFileParams) (File, error) { - row := q.queryRow(ctx, q.updateFileStmt, updateFile, arg.Content, arg.Version, arg.ID) - var i File - err := row.Scan( - &i.ID, - &i.SessionID, - &i.Path, - &i.Content, - &i.Version, - &i.CreatedAt, - &i.UpdatedAt, - ) - return i, err -} diff --git a/internal/db/migrations/20250424200609_initial.sql b/internal/db/migrations/20250424200609_initial.sql index 02caecf0c72a08a6fac44b1b96cb9150f1e07d46..094bf91e990baf76d751e57791d9e32429874b9e 100644 --- a/internal/db/migrations/20250424200609_initial.sql +++ b/internal/db/migrations/20250424200609_initial.sql @@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS files ( session_id TEXT NOT NULL, path TEXT NOT NULL, content TEXT NOT NULL, - version TEXT NOT NULL, + version INTEGER NOT NULL DEFAULT 0, created_at INTEGER NOT NULL, -- Unix timestamp in milliseconds updated_at INTEGER NOT NULL, -- Unix timestamp in milliseconds FOREIGN KEY (session_id) REFERENCES sessions (id) ON DELETE CASCADE, diff --git a/internal/db/models.go b/internal/db/models.go index 07549024a230dc357a7f57d69c42440336065a9a..ec19f99b213e041331b5d6a14dee3648bc14c1de 100644 --- a/internal/db/models.go +++ b/internal/db/models.go @@ -13,7 +13,7 @@ type File struct { SessionID string `json:"session_id"` Path string `json:"path"` Content string `json:"content"` - Version string `json:"version"` + Version int64 `json:"version"` CreatedAt int64 `json:"created_at"` UpdatedAt int64 `json:"updated_at"` } diff --git a/internal/db/querier.go b/internal/db/querier.go index 257012526e54fd08065df410e207bee2a126b9c0..472137273387d85a83a27260037321adccc9230f 100644 --- a/internal/db/querier.go +++ b/internal/db/querier.go @@ -27,7 +27,6 @@ type Querier interface { ListMessagesBySession(ctx context.Context, sessionID string) ([]Message, error) ListNewFiles(ctx context.Context) ([]File, error) ListSessions(ctx context.Context) ([]Session, error) - UpdateFile(ctx context.Context, arg UpdateFileParams) (File, error) UpdateMessage(ctx context.Context, arg UpdateMessageParams) error UpdateSession(ctx context.Context, arg UpdateSessionParams) (Session, error) } diff --git a/internal/db/sql/files.sql b/internal/db/sql/files.sql index aba2a61111088ef7362753dc7b43c79769428473..132a2821f0f9d971c994edcdd84023cb7c7ee1d2 100644 --- a/internal/db/sql/files.sql +++ b/internal/db/sql/files.sql @@ -7,20 +7,20 @@ WHERE id = ? LIMIT 1; SELECT * FROM files WHERE path = ? AND session_id = ? -ORDER BY created_at DESC +ORDER BY version DESC, created_at DESC LIMIT 1; -- name: ListFilesBySession :many SELECT * FROM files WHERE session_id = ? -ORDER BY created_at ASC; +ORDER BY version ASC, created_at ASC; -- name: ListFilesByPath :many SELECT * FROM files WHERE path = ? -ORDER BY created_at DESC; +ORDER BY version DESC, created_at DESC; -- name: CreateFile :one INSERT INTO files ( @@ -36,15 +36,6 @@ INSERT INTO files ( ) RETURNING *; --- name: UpdateFile :one -UPDATE files -SET - content = ?, - version = ?, - updated_at = strftime('%s', 'now') -WHERE id = ? -RETURNING *; - -- name: DeleteFile :exec DELETE FROM files WHERE id = ?; @@ -57,10 +48,10 @@ WHERE session_id = ?; SELECT f.* FROM files f INNER JOIN ( - SELECT path, MAX(created_at) as max_created_at + SELECT path, MAX(version) as max_version, MAX(created_at) as max_created_at FROM files GROUP BY path -) latest ON f.path = latest.path AND f.created_at = latest.max_created_at +) latest ON f.path = latest.path AND f.version = latest.max_version AND f.created_at = latest.max_created_at WHERE f.session_id = ? ORDER BY f.path; @@ -68,4 +59,4 @@ ORDER BY f.path; SELECT * FROM files WHERE is_new = 1 -ORDER BY created_at DESC; +ORDER BY version DESC, created_at DESC; diff --git a/internal/history/file.go b/internal/history/file.go index cf1b92bd436f93e49757dfe1ee6b8cddeef891d3..d8fe6088626be28262f06485c07c95693ddfd219 100644 --- a/internal/history/file.go +++ b/internal/history/file.go @@ -4,9 +4,7 @@ import ( "context" "database/sql" "fmt" - "strconv" "strings" - "time" "github.com/charmbracelet/crush/internal/db" "github.com/charmbracelet/crush/internal/pubsub" @@ -14,7 +12,7 @@ import ( ) const ( - InitialVersion = "initial" + InitialVersion = 0 ) type File struct { @@ -22,7 +20,7 @@ type File struct { SessionID string Path string Content string - Version string + Version int64 CreatedAt int64 UpdatedAt int64 } @@ -35,7 +33,6 @@ type Service interface { GetByPathAndSession(ctx context.Context, path, sessionID string) (File, error) ListBySession(ctx context.Context, sessionID string) ([]File, error) ListLatestSessionFiles(ctx context.Context, sessionID string) ([]File, error) - Update(ctx context.Context, file File) (File, error) Delete(ctx context.Context, id string) error DeleteSessionFiles(ctx context.Context, sessionID string) error } @@ -71,30 +68,13 @@ func (s *service) CreateVersion(ctx context.Context, sessionID, path, content st } // Get the latest version - latestFile := files[0] // Files are ordered by created_at DESC - latestVersion := latestFile.Version - - // Generate the next version - var nextVersion string - if latestVersion == InitialVersion { - nextVersion = "v1" - } else if strings.HasPrefix(latestVersion, "v") { - versionNum, err := strconv.Atoi(latestVersion[1:]) - if err != nil { - // If we can't parse the version, just use a timestamp-based version - nextVersion = fmt.Sprintf("v%d", latestFile.CreatedAt) - } else { - nextVersion = fmt.Sprintf("v%d", versionNum+1) - } - } else { - // If the version format is unexpected, use a timestamp-based version - nextVersion = fmt.Sprintf("v%d", latestFile.CreatedAt) - } + latestFile := files[0] // Files are ordered by version DESC, created_at DESC + nextVersion := latestFile.Version + 1 return s.createWithVersion(ctx, sessionID, path, content, nextVersion) } -func (s *service) createWithVersion(ctx context.Context, sessionID, path, content, version string) (File, error) { +func (s *service) createWithVersion(ctx context.Context, sessionID, path, content string, version int64) (File, error) { // Maximum number of retries for transaction conflicts const maxRetries = 3 var file File @@ -126,16 +106,8 @@ func (s *service) createWithVersion(ctx context.Context, sessionID, path, conten // Check if this is a uniqueness constraint violation if strings.Contains(txErr.Error(), "UNIQUE constraint failed") { if attempt < maxRetries-1 { - // If we have retries left, generate a new version and try again - if strings.HasPrefix(version, "v") { - versionNum, parseErr := strconv.Atoi(version[1:]) - if parseErr == nil { - version = fmt.Sprintf("v%d", versionNum+1) - continue - } - } - // If we can't parse the version, use a timestamp-based version - version = fmt.Sprintf("v%d", time.Now().Unix()) + // If we have retries left, increment version and try again + version++ continue } } @@ -198,20 +170,6 @@ func (s *service) ListLatestSessionFiles(ctx context.Context, sessionID string) return files, nil } -func (s *service) Update(ctx context.Context, file File) (File, error) { - dbFile, err := s.q.UpdateFile(ctx, db.UpdateFileParams{ - ID: file.ID, - Content: file.Content, - Version: file.Version, - }) - if err != nil { - return File{}, err - } - updatedFile := s.fromDBItem(dbFile) - s.Publish(pubsub.UpdatedEvent, updatedFile) - return updatedFile, nil -} - func (s *service) Delete(ctx context.Context, id string) error { file, err := s.Get(ctx, id) if err != nil { diff --git a/internal/llm/tools/shell/comparison_test.go b/internal/llm/tools/shell/comparison_test.go index 7cfe28034bb5d53148cfef0f4815dd685dd597e4..550714f9f5b3c48d4bdc5ab364badef9d7fb274b 100644 --- a/internal/llm/tools/shell/comparison_test.go +++ b/internal/llm/tools/shell/comparison_test.go @@ -31,7 +31,6 @@ func TestShellPerformanceComparison(t *testing.T) { t.Logf("Quick command took: %v", duration) } - // Benchmark CPU usage during polling func BenchmarkShellPolling(b *testing.B) { tmpDir, err := os.MkdirTemp("", "shell-bench") diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go index 8adc223d5bbc1edb49fee551d894ffb9716510ed..7f408c440d6db6ab7d5444e86243516c4dad1d94 100644 --- a/internal/tui/components/chat/sidebar/sidebar.go +++ b/internal/tui/components/chat/sidebar/sidebar.go @@ -4,7 +4,9 @@ import ( "context" "fmt" "os" + "sort" "strings" + "sync" tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/crush/internal/config" @@ -32,7 +34,13 @@ const ( logoBreakpoint = 65 ) +type FileHistory struct { + initialVersion history.File + latestVersion history.File +} + type SessionFile struct { + History FileHistory FilePath string Additions int Deletions int @@ -53,7 +61,8 @@ type sidebarCmp struct { cwd string lspClients map[string]*lsp.Client history history.Service - files []SessionFile + // Using a sync map here because we might receive file history events concurrently + files sync.Map } func NewSidebarCmp(history history.Service, lspClients map[string]*lsp.Client) Sidebar { @@ -77,12 +86,17 @@ func (m *sidebarCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) { } return m, m.loadSessionFiles case SessionFilesMsg: - m.files = msg.Files - logging.Info("Loaded session files", "count", len(m.files)) + m.files = sync.Map{} + for _, file := range msg.Files { + m.files.Store(file.FilePath, file) + } return m, nil case chat.SessionClearedMsg: m.session = session.Session{} + case pubsub.Event[history.File]: + logging.Info("sidebar", "Received file history event", "file", msg.Payload.Path, "session", msg.Payload.SessionID) + return m, m.handleFileHistoryEvent(msg) case pubsub.Event[session.Session]: if msg.Type == pubsub.UpdatedEvent { if m.session.ID == msg.Payload.ID { @@ -123,6 +137,50 @@ func (m *sidebarCmp) View() tea.View { ) } +func (m *sidebarCmp) handleFileHistoryEvent(event pubsub.Event[history.File]) tea.Cmd { + return func() tea.Msg { + file := event.Payload + found := false + m.files.Range(func(key, value any) bool { + existing := value.(SessionFile) + if existing.FilePath == file.Path { + if existing.History.latestVersion.Version < file.Version { + existing.History.latestVersion = file + } else if file.Version == 0 { + existing.History.initialVersion = file + } else { + // If the version is not greater than the latest, we ignore it + return true + } + before := existing.History.initialVersion.Content + after := existing.History.latestVersion.Content + path := existing.History.initialVersion.Path + _, additions, deletions := diff.GenerateDiff(before, after, path) + existing.Additions = additions + existing.Deletions = deletions + m.files.Store(file.Path, existing) + found = true + return false + } + return true + }) + if found { + return nil + } + sf := SessionFile{ + History: FileHistory{ + initialVersion: file, + latestVersion: file, + }, + FilePath: file.Path, + Additions: 0, + Deletions: 0, + } + m.files.Store(file.Path, sf) + return nil + } +} + func (m *sidebarCmp) loadSessionFiles() tea.Msg { files, err := m.history.ListBySession(context.Background(), m.session.ID) if err != nil { @@ -132,26 +190,16 @@ func (m *sidebarCmp) loadSessionFiles() tea.Msg { } } - type fileHistory struct { - initialVersion history.File - latestVersion history.File - } - - fileMap := make(map[string]fileHistory) + fileMap := make(map[string]FileHistory) for _, file := range files { if existing, ok := fileMap[file.Path]; ok { // Update the latest version - if existing.latestVersion.CreatedAt < file.CreatedAt { - existing.latestVersion = file - } - if file.Version == history.InitialVersion { - existing.initialVersion = file - } + existing.latestVersion = file fileMap[file.Path] = existing } else { // Add the initial version - fileMap[file.Path] = fileHistory{ + fileMap[file.Path] = FileHistory{ initialVersion: file, latestVersion: file, } @@ -160,14 +208,13 @@ func (m *sidebarCmp) loadSessionFiles() tea.Msg { sessionFiles := make([]SessionFile, 0, len(fileMap)) for path, fh := range fileMap { - if fh.initialVersion.Version == history.InitialVersion { - _, additions, deletions := diff.GenerateDiff(fh.initialVersion.Content, fh.latestVersion.Content, fh.initialVersion.Path) - sessionFiles = append(sessionFiles, SessionFile{ - FilePath: path, - Additions: additions, - Deletions: deletions, - }) - } + _, additions, deletions := diff.GenerateDiff(fh.initialVersion.Content, fh.latestVersion.Content, fh.initialVersion.Path) + sessionFiles = append(sessionFiles, SessionFile{ + History: fh, + FilePath: path, + Additions: additions, + Deletions: deletions, + }) } return SessionFilesMsg{ @@ -210,7 +257,13 @@ func (m *sidebarCmp) filesBlock() string { core.Section("Modified Files", maxWidth), ) - if len(m.files) == 0 { + files := make([]SessionFile, 0) + m.files.Range(func(key, value any) bool { + file := value.(SessionFile) + files = append(files, file) + return true // continue iterating + }) + if len(files) == 0 { return lipgloss.JoinVertical( lipgloss.Left, section, @@ -220,8 +273,12 @@ func (m *sidebarCmp) filesBlock() string { } fileList := []string{section, ""} + // order files by the latest version's created time + sort.Slice(files, func(i, j int) bool { + return files[i].History.latestVersion.CreatedAt > files[j].History.latestVersion.CreatedAt + }) - for _, file := range m.files { + for _, file := range files { // Extract just the filename from the path // Create status indicators for additions/deletions diff --git a/todos.md b/todos.md index 2a9cb74fcdf93302d0eb823c9692cf8b2c22c7ca..65ece5a7880530a1622f1b64aeaef85f3d6702bf 100644 --- a/todos.md +++ b/todos.md @@ -5,7 +5,9 @@ - [x] Make help dependent on the focused pane and page - [x] Implement current model in the sidebar - [x] Implement LSP errors -- [ ] Implement changed files +- [x] Implement changed files + - [x] Implement initial load + - [x] Implement realtime file changes - [ ] Events when tool error - [ ] Support bash commands - [ ] Editor attachments fixes From d8a4fa0b26b73133e2f3211ee0b3bbf0c27260c2 Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Tue, 17 Jun 2025 14:06:08 +0200 Subject: [PATCH 64/64] fix: fix title generation --- internal/llm/agent/agent.go | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go index dbf72fe9dbabbbd4bf455bc84a9bb571080b6c63..2659e2bcad17756986cbc69a203c05ce7a688c9f 100644 --- a/internal/llm/agent/agent.go +++ b/internal/llm/agent/agent.go @@ -163,7 +163,9 @@ func (a *agent) generateTitle(ctx context.Context, sessionID string, content str return err } parts := []message.ContentPart{message.TextContent{Text: content}} - response, err := a.titleProvider.SendMessages( + + // Use streaming approach like summarization + response := a.titleProvider.StreamResponse( ctx, []message.Message{ { @@ -173,11 +175,20 @@ func (a *agent) generateTitle(ctx context.Context, sessionID string, content str }, make([]tools.BaseTool, 0), ) - if err != nil { - return err + + var finalResponse *provider.ProviderResponse + for r := range response { + if r.Error != nil { + return r.Error + } + finalResponse = r.Response + } + + if finalResponse == nil { + return fmt.Errorf("no response received from title provider") } - title := strings.TrimSpace(strings.ReplaceAll(response.Content, "\n", " ")) + title := strings.TrimSpace(strings.ReplaceAll(finalResponse.Content, "\n", " ")) if title == "" { return nil }