git.iko.soy/crush
on main help sign in
fix(diffview): use `udiff.Lines` and not `udiff.Strings`
e7a4146Andrey Nering
internal/ui/diffview/diffview.go+1−1
compare with main
unifiedsplit
@@ -248,7 +248,7 @@ func (dv *DiffView) computeDiff() error {
248 return dv.err
248 return dv.err
249 }
249 }
250 dv.isComputed = true
250 dv.isComputed = true
251− dv.edits = udiff.Strings(
251+ dv.edits = udiff.Lines(
252 dv.before.content,
252 dv.before.content,
253 dv.after.content,
253 dv.after.content,
254 )
254 )
internal/ui/diffview/udiff_test.go+1−1
@@ -38,7 +38,7 @@ func TestUdiff(t *testing.T) {
38
38
39 t.Run("ToUnifiedDiff", func(t *testing.T) {
39 t.Run("ToUnifiedDiff", func(t *testing.T) {
40 toUnifiedDiff := func(t *testing.T, before, after string, contextLines int) udiff.UnifiedDiff {
40 toUnifiedDiff := func(t *testing.T, before, after string, contextLines int) udiff.UnifiedDiff {
41− edits := udiff.Strings(before, after)
41+ edits := udiff.Lines(before, after)
42 unifiedDiff, err := udiff.ToUnifiedDiff("main.go", "main.go", before, edits, contextLines)
42 unifiedDiff, err := udiff.ToUnifiedDiff("main.go", "main.go", before, edits, contextLines)
43 if err != nil {
43 if err != nil {
44 t.Fatalf("ToUnifiedDiff failed: %v", err)
44 t.Fatalf("ToUnifiedDiff failed: %v", err)