Fix diff edge case for trailing diffs

mrobinet · Feb 21, 2017 · 792bf52 · 792bf52
1 parent 58a8e94
commit 792bf52
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/pkg/diff/diff.go b/pkg/diff/diff.go
@@ -158,11 +158,13 @@ func buildDiffLines(lString, rString string) []lineRecord {
 		}
 	}
 
-	if l != "" && r != "" {
-		if l == r {
-			results = append(results, lineRecord{Type: diffmatchpatch.DiffEqual, Line: l})
-		} else {
+	if l != "" && l == r {
+		results = append(results, lineRecord{Type: diffmatchpatch.DiffEqual, Line: l})
+	} else {
+		if l != "" {
 			results = append(results, lineRecord{Type: diffmatchpatch.DiffDelete, Line: l})
+		}
+		if r != "" {
 			results = append(results, lineRecord{Type: diffmatchpatch.DiffInsert, Line: r})
 		}
 	}

diff --git a/pkg/diff/diff_test.go b/pkg/diff/diff_test.go
@@ -135,3 +135,39 @@ Line3`
 		t.Fatalf("unexpected diff.  expected=%v, actual=%v", expectedDiff, actual)
 	}
 }
+
+func Test_Diff_4(t *testing.T) {
+	l := `A
+B
+C
+D
+E
+F
+`
+	r := `A
+B
+C
+D
+E
+F`
+	expectedDiff := `...
+  D
+  E
+- F
++ F
+`
+	{
+		dmp := diffmatchpatch.New()
+		diffs := dmp.DiffMain(l, r, false)
+
+		// We do need to cleanup, as otherwise we get some spurious changes on complex diffs
+		diffs = dmp.DiffCleanupSemantic(diffs)
+
+		t.Logf("diffs %v", diffs)
+	}
+
+	actual := FormatDiff(l, r)
+	if actual != expectedDiff {
+		t.Fatalf("unexpected diff.  expected=%s, actual=%s", expectedDiff, actual)
+	}
+}