Skip to content

Commit 9da4012

Browse files
committed
fix issues about (#164),detail:
When deleting the first line of comparison text and adding several lines of text, the first diff of the result returned by the generateOriginalAndDiff method is inserted incorrectly
1 parent 58ef1b1 commit 9da4012

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,11 +420,11 @@ private static void insertOrig(List<List<String>> diffList, List<String> result,
420420
int end = nexMap.get("revRow") - 2;
421421
insert(result, getOrigList(original, start, end));
422422
}
423+
int start = map.get("orgRow") + map.get("orgDel") - 1;
424+
start = start == -1 ? 0 : start;
423425
if (simb.contains("@@ -1,") && null == nexSimb && map.get("orgDel") != original.size()) {
424-
insert(result, getOrigList(original, 0, original.size() - 1));
426+
insert(result, getOrigList(original, start, original.size() - 1));
425427
} else if (null == nexSimb && (map.get("orgRow") + map.get("orgDel") - 1) < original.size()) {
426-
int start = map.get("orgRow") + map.get("orgDel") - 1;
427-
start = start == -1 ? 0 : start;
428428
insert(result, getOrigList(original, start, original.size() - 1));
429429
}
430430
}

0 commit comments

Comments
 (0)