java/java-diff-utils
1
0
Fork 0
mirror of https://github.com/java-diff-utils/java-diff-utils.git synced 2026-03-13 10:11:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

by word inline diff changes

Browse Source
This commit is contained in:
wumpz
2017-04-05 09:22:04 +02:00
parent ef97a99da4
commit dcc151e78b
2 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/difflib/text/DiffRowGenerator.java
View File

@@ -173,17 +173,18 @@ public class DiffRowGenerator {
/**
* Merge the complete result within the original text. This makes sense for one line
* display.
*
* @param mergeOriginalRevised
* @return
* @return
*/
public Builder mergeOriginalRevised(boolean mergeOriginalRevised) {
this.mergeOriginalRevised = mergeOriginalRevised;
return this;
}
/**
* Per default each character is separatly processed. This variant introduces processing
* by word, which should deliver no in word changes.
* Per default each character is separatly processed. This variant introduces processing by
* word, which should deliver no in word changes.
*/
public Builder inlineDiffByWord(boolean inlineDiffByWord) {
this.inlineDiffByWord = inlineDiffByWord;
@@ -316,7 +317,7 @@ public class DiffRowGenerator {
List<String> rev = StringUtils.normalize(delta.getRevised().getLines());
List<String> origList;
List<String> revList;
if (inlineDiffByWord) {
origList = splitStringPreserveDelimiter(String.join("\n", orig));
revList = splitStringPreserveDelimiter(String.join("\n", rev));
@@ -330,7 +331,7 @@ public class DiffRowGenerator {
revList.add(character.toString());
}
}
List<Delta<String>> inlineDeltas = DiffUtils.diff(origList, revList).getDeltas();
Collections.reverse(inlineDeltas);
@@ -411,20 +412,24 @@ public class DiffRowGenerator {
private static String createOpenTag(String tag, String cssClass) {
return "<" + tag + (cssClass != null ? " class=\"" + cssClass + "\"" : "") + ">";
}
private static final Pattern SPLIT_PATTERN = Pattern.compile("\\s+");
private List<String> splitStringPreserveDelimiter(String str) {
private static final Pattern SPLIT_PATTERN = Pattern.compile("\\s+|[,.\\[\\](){}/\\\\*+\\-#]");
static List<String> splitStringPreserveDelimiter(String str) {
List<String> list = new ArrayList<>();
if (str != null) {
Matcher matcher = SPLIT_PATTERN.matcher(str);
int pos = 0;
while (matcher.find()) {
list.add(str.substring(pos, matcher.start()));
if (pos < matcher.start()) {
list.add(str.substring(pos, matcher.start()));
}
list.add(matcher.group());
pos = matcher.end();
}
list.add(str.substring(pos));
if (pos < str.length()) {
list.add(str.substring(pos));
}
}
return list;
}

23
src/test/java/difflib/text/DiffRowGeneratorTest.java
View File

@@ -166,4 +166,27 @@ public class DiffRowGeneratorTest {
assertEquals(1, rows.size());
assertEquals("[CHANGE,<span class=\"editOldInline\">Test</span><span class=\"editNewInline\">ester</span> <br/>feature<span class=\"editNewInline\"> best</span>,ester feature best]", rows.get(0).toString());
}
@Test
public void testSplitString() {
List<String> list = DiffRowGenerator.splitStringPreserveDelimiter("test,test2");
assertEquals(3, list.size());
assertEquals("[test, ,, test2]", list.toString());
}
@Test
public void testSplitString2() {
List<String> list = DiffRowGenerator.splitStringPreserveDelimiter("test , test2");
System.out.println(list);
assertEquals(5, list.size());
assertEquals("[test, , ,, , test2]", list.toString());
}
@Test
public void testSplitString3() {
List<String> list = DiffRowGenerator.splitStringPreserveDelimiter("test,test2,");
System.out.println(list);
assertEquals(4, list.size());
assertEquals("[test, ,, test2, ,]", list.toString());
}
}