Skip to content

Commit ae23408

Browse files
committed
fixes #47
1 parent 923918a commit ae23408

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.github.difflib.patch.Patch;
2222
import java.util.ArrayList;
2323
import java.util.List;
24+
import java.util.Optional;
2425
import java.util.regex.Matcher;
2526
import java.util.regex.Pattern;
2627

@@ -130,8 +131,8 @@ public static List<String> generateUnifiedDiff(String originalFileName,
130131
int contextSize) {
131132
if (!patch.getDeltas().isEmpty()) {
132133
List<String> ret = new ArrayList<>();
133-
ret.add("--- " + originalFileName);
134-
ret.add("+++ " + revisedFileName);
134+
ret.add("--- " + Optional.ofNullable(originalFileName).orElse(""));
135+
ret.add("+++ " + Optional.ofNullable(revisedFileName).orElse(""));
135136

136137
List<AbstractDelta<String>> patchDeltas = new ArrayList<>(
137138
patch.getDeltas());

java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void testNewFileCreation() throws DiffException {
120120
List<String> udiff = UnifiedDiffUtils.generateUnifiedDiff(null, "revised",
121121
original, patch, 10);
122122

123-
assertEquals("--- null", udiff.get(0));
123+
assertEquals("--- ", udiff.get(0));
124124
assertEquals("+++ revised", udiff.get(1));
125125
assertEquals("@@ -0,0 +1,2 @@", udiff.get(2));
126126

0 commit comments

Comments
 (0)