Skip to content

Commit 6dbc008

Browse files
committed
1 parent 61deff7 commit 6dbc008

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -302,41 +302,41 @@ private void processSimilarityIndex(MatchResult match, String line) {
302302
private int delLineIdx = 0;
303303
private int addLineIdx = 0;
304304

305-
private void finalizeChunk() {
306-
if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) {
307-
boolean hasDeletes = !delLineIdxList.isEmpty();
308-
boolean hasInserts = !addLineIdxList.isEmpty();
309-
boolean hasContext = originalTxt.size() != delLineIdxList.size()
310-
|| revisedTxt.size() != addLineIdxList.size();
311-
AbstractDelta<String> delta;
312-
if (hasContext || (hasDeletes && hasInserts)) {
313-
delta = new ChangeDelta<>(
314-
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
315-
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
316-
} else if (hasDeletes) {
317-
delta = new DeleteDelta<>(
318-
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
319-
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
320-
} else if (hasInserts) {
321-
delta = new InsertDelta<>(
322-
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
323-
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
324-
} else {
325-
delta = new EqualDelta<>(
326-
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
327-
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
328-
}
329-
actualFile.getPatch().addDelta(delta);
330-
old_ln = 0;
331-
new_ln = 0;
332-
originalTxt.clear();
333-
revisedTxt.clear();
334-
addLineIdxList.clear();
335-
delLineIdxList.clear();
336-
delLineIdx = 0;
337-
addLineIdx = 0;
338-
}
339-
}
305+
private void finalizeChunk() {
306+
if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) {
307+
boolean hasDeletes = !delLineIdxList.isEmpty();
308+
boolean hasInserts = !addLineIdxList.isEmpty();
309+
boolean hasContext =
310+
originalTxt.size() != delLineIdxList.size() || revisedTxt.size() != addLineIdxList.size();
311+
AbstractDelta<String> delta;
312+
if (hasContext || (hasDeletes && hasInserts)) {
313+
delta = new ChangeDelta<>(
314+
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
315+
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
316+
} else if (hasDeletes) {
317+
delta = new DeleteDelta<>(
318+
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
319+
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
320+
} else if (hasInserts) {
321+
delta = new InsertDelta<>(
322+
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
323+
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
324+
} else {
325+
delta = new EqualDelta<>(
326+
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
327+
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
328+
}
329+
actualFile.getPatch().addDelta(delta);
330+
old_ln = 0;
331+
new_ln = 0;
332+
originalTxt.clear();
333+
revisedTxt.clear();
334+
addLineIdxList.clear();
335+
delLineIdxList.clear();
336+
delLineIdx = 0;
337+
addLineIdx = 0;
338+
}
339+
}
340340

341341
private void processNormalLine(MatchResult match, String line) {
342342
String cline = line.substring(1);

0 commit comments

Comments
 (0)