Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commita018e9c

Browse files
committed
1 parentd30d9ca commita018e9c

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

‎src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,22 @@ public static void write(UnifiedDiff diff, Function<String, List<String>> origin
4747
writer.accept(diff.getHeader());
4848

4949
for (UnifiedDiffFilefile :diff.getFiles()) {
50-
writeOrNothing(writer,file.getDiffCommand());
51-
if (file.getIndex() !=null) {
52-
writer.accept("index " +file.getIndex());
53-
}
54-
if (file.getFromFile() !=null) {
55-
writer.accept("--- " +file.getFromFile());
56-
}
57-
if (file.getToFile() !=null) {
58-
writer.accept("+++ " +file.getToFile());
59-
}
60-
61-
List<String>originalLines =originalLinesProvider.apply(file.getFromFile());
62-
6350
List<AbstractDelta<String>>patchDeltas =newArrayList<>(
6451
file.getPatch().getDeltas());
65-
6652
if (!patchDeltas.isEmpty()) {
53+
writeOrNothing(writer,file.getDiffCommand());
54+
if (file.getIndex() !=null) {
55+
writer.accept("index " +file.getIndex());
56+
}
57+
if (file.getFromFile() !=null) {
58+
writer.accept("--- " +file.getFromFile());
59+
}
60+
if (file.getToFile() !=null) {
61+
writer.accept("+++ " +file.getToFile());
62+
}
63+
64+
List<String>originalLines =originalLinesProvider.apply(file.getFromFile());
65+
6766
List<AbstractDelta<String>>deltas =newArrayList<>();
6867

6968
AbstractDelta<String>delta =patchDeltas.get(0);

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp