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

Commit5781cc5

Browse files
committed
1 parent37310e1 commit5781cc5

File tree

2 files changed

+55
-10
lines changed

2 files changed

+55
-10
lines changed

‎java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
importstaticjava.util.Comparator.comparing;
2323
importcom.github.difflib.algorithm.Change;
2424
importjava.util.ArrayList;
25+
importjava.util.Collections;
2526
importjava.util.List;
2627
importjava.util.ListIterator;
2728

@@ -107,10 +108,18 @@ private static <T> Chunk<T> buildChunk(int start, int end, List<T> data) {
107108
returnnewChunk<>(start,newArrayList<>(data.subList(start,end)));
108109
}
109110

110-
publicstatic <T>Patch<T>generate(List<T>original,List<T>revised,List<Change>changes,booleanincludeEquals) {
111-
Patch<T>patch =newPatch<>(changes.size());
111+
publicstatic <T>Patch<T>generate(List<T>original,List<T>revised,List<Change>_changes,booleanincludeEquals) {
112+
Patch<T>patch =newPatch<>(_changes.size());
112113
intstartOriginal =0;
113114
intstartRevised =0;
115+
116+
List<Change>changes =_changes;
117+
118+
if (includeEquals) {
119+
changes =newArrayList<Change>(_changes);
120+
Collections.sort(changes,comparing(d ->d.startOriginal));
121+
}
122+
114123
for (Changechange :changes) {
115124

116125
if (includeEquals &&startOriginal <change.startOriginal) {
@@ -133,8 +142,8 @@ public static <T> Patch<T> generate(List<T> original, List<T> revised, List<Chan
133142
break;
134143
}
135144

136-
startOriginal =change.endOriginal +1;
137-
startRevised =change.endRevised +1;
145+
startOriginal =change.endOriginal;
146+
startRevised =change.endRevised;
138147
}
139148

140149
if (includeEquals &&startOriginal <original.size()) {

‎java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
importjava.util.List;
2020
importstaticjava.util.stream.Collectors.toList;
2121
importjava.util.zip.ZipFile;
22+
importstaticorg.assertj.core.api.Assertions.assertThat;
2223
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
2324
importstaticorg.junit.jupiter.api.Assertions.assertNotNull;
2425
importstaticorg.junit.jupiter.api.Assertions.assertTrue;
@@ -160,11 +161,11 @@ public void testDiffMyersExample1() {
160161
assertEquals(4,patch.getDeltas().size());
161162
assertEquals("Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [InsertDelta, position: 3, lines: [B]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]}",patch.toString());
162163
}
163-
164+
164165
@Test
165166
publicvoidtestDiff_Equal() {
166167
finalPatch<String>patch =DiffUtils.diff(
167-
Arrays.asList("hhh","jjj","kkk"),
168+
Arrays.asList("hhh","jjj","kkk"),
168169
Arrays.asList("hhh","jjj","kkk"),true);
169170
assertNotNull(patch);
170171
assertEquals(1,patch.getDeltas().size());
@@ -173,22 +174,57 @@ public void testDiff_Equal() {
173174
assertEquals(newChunk<>(0,Arrays.asList("hhh","jjj","kkk")),delta.getSource());
174175
assertEquals(newChunk<>(0,Arrays.asList("hhh","jjj","kkk")),delta.getTarget());
175176
}
176-
177-
@Test
177+
178+
@Test
178179
publicvoidtestDiff_InsertWithEqual() {
179180
finalPatch<String>patch =DiffUtils.diff(Arrays.asList("hhh"),Arrays.
180181
asList("hhh","jjj","kkk"),true);
181182
assertNotNull(patch);
182183
assertEquals(2,patch.getDeltas().size());
183-
184+
184185
AbstractDelta<String>delta =patch.getDeltas().get(0);
185186
assertTrue(deltainstanceofEqualDelta);
186187
assertEquals(newChunk<>(0,Arrays.asList("hhh")),delta.getSource());
187188
assertEquals(newChunk<>(0,Arrays.asList("hhh")),delta.getTarget());
188-
189+
189190
delta =patch.getDeltas().get(1);
190191
assertTrue(deltainstanceofInsertDelta);
191192
assertEquals(newChunk<>(1,Collections.<String>emptyList()),delta.getSource());
192193
assertEquals(newChunk<>(1,Arrays.asList("jjj","kkk")),delta.getTarget());
193194
}
195+
196+
@Test
197+
publicvoidtestDiff_ProblemIssue42() {
198+
finalPatch<String>patch =DiffUtils.diff(
199+
Arrays.asList("The","dog","is","brown"),
200+
Arrays.asList("The","fox","is","down"),true);
201+
202+
System.out.println(patch);
203+
assertNotNull(patch);
204+
assertEquals(4,patch.getDeltas().size());
205+
206+
207+
assertThat(patch.getDeltas()).extracting(d ->d.getType().name())
208+
.containsExactly("EQUAL","CHANGE","EQUAL","CHANGE");
209+
210+
AbstractDelta<String>delta =patch.getDeltas().get(0);
211+
assertTrue(deltainstanceofEqualDelta);
212+
assertEquals(newChunk<>(0,Arrays.asList("The")),delta.getSource());
213+
assertEquals(newChunk<>(0,Arrays.asList("The")),delta.getTarget());
214+
215+
delta =patch.getDeltas().get(1);
216+
assertTrue(deltainstanceofChangeDelta);
217+
assertEquals(newChunk<>(1,Arrays.asList("dog")),delta.getSource());
218+
assertEquals(newChunk<>(1,Arrays.asList("fox")),delta.getTarget());
219+
220+
delta =patch.getDeltas().get(2);
221+
assertTrue(deltainstanceofEqualDelta);
222+
assertEquals(newChunk<>(2,Arrays.asList("is")),delta.getSource());
223+
assertEquals(newChunk<>(2,Arrays.asList("is")),delta.getTarget());
224+
225+
delta =patch.getDeltas().get(3);
226+
assertTrue(deltainstanceofChangeDelta);
227+
assertEquals(newChunk<>(3,Arrays.asList("brown")),delta.getSource());
228+
assertEquals(newChunk<>(3,Arrays.asList("down")),delta.getTarget());
229+
}
194230
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp