by word inline diff changes

wumpz · wumpz · commit dcc151e78b72 · 2017-04-05T09:22:04.000+02:00
diff --git a/src/main/java/difflib/text/DiffRowGenerator.java b/src/main/java/difflib/text/DiffRowGenerator.java
@@ -173,17 +173,18 @@ public DiffRowGenerator build() {
         /**
          * 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 @@ private List<DiffRow> generateInlineDiffs(Delta<String> delta) throws DiffExcept
         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 @@ private List<DiffRow> generateInlineDiffs(Delta<String> delta) throws DiffExcept
                 revList.add(character.toString());
             }
         }
-        
+
         List<Delta<String>> inlineDeltas = DiffUtils.diff(origList, revList).getDeltas();
 
         Collections.reverse(inlineDeltas);
@@ -411,20 +412,24 @@ private static String createCloseTag(String tag) {
     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;
     }
diff --git a/src/test/java/difflib/text/DiffRowGeneratorTest.java b/src/test/java/difflib/text/DiffRowGeneratorTest.java
@@ -166,4 +166,27 @@ public void testGeneratorWithMergeByWord5() throws DiffException {
         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());
+    }
 }
