Skip to content

Fix UnifiedDiffReader to use correct DeltaType #228

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

Open
andrewparmet wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −18
Open

Fix UnifiedDiffReader to use correct DeltaType #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 39 additions & 17 deletions java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@
*/
package com.github.difflib.unifieddiff;

import com.github.difflib.patch.AbstractDelta;
import com.github.difflib.patch.ChangeDelta;
import com.github.difflib.patch.Chunk;
import com.github.difflib.patch.DeleteDelta;
import com.github.difflib.patch.EqualDelta;
import com.github.difflib.patch.InsertDelta;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -298,23 +302,41 @@ private void processSimilarityIndex(MatchResult match, String line) {
private int delLineIdx = 0;
private int addLineIdx = 0;

private void finalizeChunk() {
if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) {
actualFile
.getPatch()
.addDelta(new ChangeDelta<>(
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList)));
old_ln = 0;
new_ln = 0;
originalTxt.clear();
revisedTxt.clear();
addLineIdxList.clear();
delLineIdxList.clear();
delLineIdx = 0;
addLineIdx = 0;
}
}
private void finalizeChunk() {
if (!originalTxt.isEmpty() || !revisedTxt.isEmpty()) {
boolean hasDeletes = !delLineIdxList.isEmpty();
boolean hasInserts = !addLineIdxList.isEmpty();
boolean hasContext = originalTxt.size() != delLineIdxList.size()
|| revisedTxt.size() != addLineIdxList.size();
AbstractDelta<String> delta;
if (hasContext || (hasDeletes && hasInserts)) {
delta = new ChangeDelta<>(
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
} else if (hasDeletes) {
delta = new DeleteDelta<>(
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
} else if (hasInserts) {
delta = new InsertDelta<>(
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
} else {
delta = new EqualDelta<>(
new Chunk<>(old_ln - 1, originalTxt, delLineIdxList),
new Chunk<>(new_ln - 1, revisedTxt, addLineIdxList));
}
actualFile.getPatch().addDelta(delta);
old_ln = 0;
new_ln = 0;
originalTxt.clear();
revisedTxt.clear();
addLineIdxList.clear();
delLineIdxList.clear();
delLineIdx = 0;
addLineIdx = 0;
}
}

private void processNormalLine(MatchResult match, String line) {
String cline = line.substring(1);
Expand Down
2 changes: 1 addition & 1 deletion java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public void testParseIssue104() throws IOException {
assertThat(file.getToFile()).isEqualTo("doc/samba_data_tool_path.xml.in");

assertThat(file.getPatch().toString())
.isEqualTo("Patch{deltas=[[ChangeDelta, position: 0, lines: [] to [@SAMBA_DATA_TOOL@]]]}");
.isEqualTo("Patch{deltas=[[InsertDelta, position: 0, lines: [@SAMBA_DATA_TOOL@]]]}");

assertThat(diff.getTail()).isEqualTo("2.14.4");
}
Expand Down