Skip to content

Fixed bug in overlap elimination #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 29, 2016
Merged

Fixed bug in overlap elimination #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
618f718
Fixed bug in overlap elimination.
shatrugna Sep 1, 2016
6fd41a6
Test case for #31 in addition to #32
zimmski Oct 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion diffmatchpatch/dmp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ func (dmp *DiffMatchPatch) DiffCleanupSemantic(diffs []Diff) []Diff {
float64(overlapLength2) >= float64(len(insertion))/2 {
// Reverse overlap found.
// Insert an equality and swap and trim the surrounding edits.
overlap := Diff{DiffEqual, insertion[overlapLength2:]}
overlap := Diff{DiffEqual, insertion[len(insertion)-overlapLength2:]}
diffs = append(
diffs[:pointer],
append([]Diff{overlap}, diffs[pointer:]...)...)
Expand Down
26 changes: 26 additions & 0 deletions diffmatchpatch/dmp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,29 @@ func Test_diffCleanupSemantic(t *testing.T) {
Diff{DiffEqual, "1234"},
Diff{DiffDelete, "wxyz"}}, diffs)

// No elimination #3.
diffs = []Diff{
Diff{DiffEqual, "2016-09-01T03:07:1"},
Diff{DiffInsert, "5.15"},
Diff{DiffEqual, "4"},
Diff{DiffDelete, "."},
Diff{DiffEqual, "80"},
Diff{DiffInsert, "0"},
Diff{DiffEqual, "78"},
Diff{DiffDelete, "3074"},
Diff{DiffEqual, "1Z"}}
diffs = dmp.DiffCleanupSemantic(diffs)
assertDiffEqual(t, []Diff{
Diff{DiffEqual, "2016-09-01T03:07:1"},
Diff{DiffInsert, "5.15"},
Diff{DiffEqual, "4"},
Diff{DiffDelete, "."},
Diff{DiffEqual, "80"},
Diff{DiffInsert, "0"},
Diff{DiffEqual, "78"},
Diff{DiffDelete, "3074"},
Diff{DiffEqual, "1Z"}}, diffs)

// Simple elimination.
diffs = []Diff{
Diff{DiffDelete, "a"},
Expand Down Expand Up @@ -1245,6 +1268,9 @@ func Test_patch_make(t *testing.T) {
expectedPatch = "@@ -573,28 +573,31 @@\n cdefabcdefabcdefabcdefabcdef\n+123\n"
patches = dmp.PatchMake(text1, text2)
assert.Equal(t, expectedPatch, dmp.PatchToText(patches), "patch_make: Long string with repeats.")

patches = dmp.PatchMake("2016-09-01T03:07:14.807830741Z", "2016-09-01T03:07:15.154800781Z")
assert.Equal(t, "@@ -15,16 +15,16 @@\n 07:1\n+5.15\n 4\n-.\n 80\n+0\n 78\n-3074\n 1Z\n", dmp.PatchToText(patches), "patch_make: Corner case of #31 fixed by #32")
}

func Test_PatchSplitMax(t *testing.T) {
Expand Down