Fix ugly diff showing insertion of new method

When adding a new method near the end of the sequence we want to
show the full method inserted, and not tear the prior method due
to the common trailing curly brace being consumed as part of the
common end region of the sequences.

Bug: 328895
Change-Id: I233bc40445fb5452863f5fb082bc3097433a8da6
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

1 files changed, 7 insertions, 0 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/AbstractDiffTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/AbstractDiffTestCase.java
index a46a4bd700..bee333b163 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/AbstractDiffTestCase.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/AbstractDiffTestCase.java
@@ -166,6 +166,13 @@ public abstract class AbstractDiffTestCase extends TestCase {
 		assertEquals(new Edit(4, 5, 3, 4), r.get(1));
 	}
 
+	public void testEdit_InsertNearCommonTail() {
+		EditList r = diff(t("aq}nb"), t("aCq}nD}nb"));
+		assertEquals(new Edit(1, 1, 1, 2), r.get(0));
+		assertEquals(new Edit(3, 3, 4, 7), r.get(1));
+		assertEquals(2, r.size());
+	}
+
 	public EditList diff(RawText a, RawText b) {
 		return algorithm().diff(RawTextComparator.DEFAULT, a, b);
 	}