Merge pull request #702 from JordanMartinez/fixRegression

Use absolute replacements for undo and redo

Author: JordanMartinez

richtextfx/src/integrationTest/java/org/fxmisc/richtext/api/MultiChangeTest.java

@@ -45,6 +45,24 @@ public void committing_relative_change_works() {
         });
     }
 
+    @Test
+    public void committing_relative_change_backToFront_works() {
+        interact(() -> {
+            String text = area.getText();
+            String hello = "hello";
+            String world = "world";
+            area.createMultiChange(2)
+                    .insertText(6, world)
+                    .insertText(0, hello)
+                    .commit();
+
+            assertEquals(hello + text + world, area.getText());
+
+            area.undo();
+            assertEquals(text, area.getText());
+        });
+    }
+
     @Test
     public void committing_absolute_change_works() {
         interact(() -> {

richtextfx/src/main/java/org/fxmisc/richtext/util/UndoUtils.java

@@ -82,8 +82,8 @@ public static <PS, SEG, S> UndoManager<List<RichTextChange<PS, SEG, S>>> richTex
             GenericStyledArea<PS, SEG, S> area, UndoManagerFactory factory, Duration preventMergeDelay) {
         return factory.createMultiChangeUM(area.multiRichChanges(),
                 TextChange::invert,
-                undoMultiRichTextChange(area),
-                redoMultiRichTextChange(area),
+                applyMultiRichTextChange(area),
+                applyMultiRichTextChange(area),
                 TextChange::mergeWith,
                 TextChange::isIdentity,
                 preventMergeDelay);
@@ -128,8 +128,8 @@ public static <PS, SEG, S> UndoManager<List<PlainTextChange>> plainTextUndoManag
             GenericStyledArea<PS, SEG, S> area, UndoManagerFactory factory, Duration preventMergeDelay) {
         return factory.createMultiChangeUM(area.multiPlainChanges(),
                 TextChange::invert,
-                undoMultiPlainTextChange(area),
-                redoMultiPlainTextChange(area),
+                applyMultiPlainTextChange(area),
+                applyMultiPlainTextChange(area),
                 TextChange::mergeWith,
                 TextChange::isIdentity,
                 preventMergeDelay);
@@ -160,48 +160,26 @@ public static <PS, SEG, S> Consumer<RichTextChange<PS, SEG, S>> applyRichTextCha
         return change -> area.replace(change.getPosition(), change.getRemovalEnd(), change.getInserted());
     }
 
-    public static <PS, SEG, S> Consumer<List<PlainTextChange>> undoMultiPlainTextChange(
-            GenericStyledArea<PS, SEG, S> area) {
-        return changeList -> {
-            MultiChangeBuilder<PS, SEG, S> builder = area.createMultiChange(changeList.size());
-            for (PlainTextChange c : changeList) {
-                builder.replaceText(c.getPosition(), c.getRemovalEnd(), c.getInserted());
-            }
-            builder.commit();
-        };
-    }
-
-    public static <PS, SEG, S> Consumer<List<PlainTextChange>> redoMultiPlainTextChange(
-            GenericStyledArea<PS, SEG, S> area) {
-        return changeList -> {
-            MultiChangeBuilder<PS, SEG, S> builder = area.createMultiChange(changeList.size());
-            for (PlainTextChange c : changeList) {
-                builder.replaceTextAbsolutely(c.getPosition(), c.getRemovalEnd(), c.getInserted());
-            }
-            builder.commit();
-        };
-    }
-
     /**
-     * Undoes a list of {@link RichTextChange} to the given area when the {@link UndoManager}'s change stream emits an event
-     * by {@code area.replace(change.getPosition(), change.getRemovalEnd(), change.getInserted()}.
+     * Applies a list of {@link PlainTextChange}s to the given area when the {@link UndoManager}'s change stream emits
+     * an event by {@code area.replaceAbsolutely(change.getPosition(), change.getRemovalEnd(), change.getInserted()}.
      */
-    public static <PS, SEG, S> Consumer<List<RichTextChange<PS, SEG, S>>> undoMultiRichTextChange(
+    public static <PS, SEG, S> Consumer<List<PlainTextChange>> applyMultiPlainTextChange(
             GenericStyledArea<PS, SEG, S> area) {
         return changeList -> {
             MultiChangeBuilder<PS, SEG, S> builder = area.createMultiChange(changeList.size());
-            for (RichTextChange<PS, SEG, S> c : changeList) {
-                builder.replace(c.getPosition(), c.getRemovalEnd(), c.getInserted());
+            for (PlainTextChange c : changeList) {
+                builder.replaceTextAbsolutely(c.getPosition(), c.getRemovalEnd(), c.getInserted());
             }
             builder.commit();
         };
     }
 
     /**
-     * Redoes a list of {@link RichTextChange} to the given area when the {@link UndoManager}'s change stream emits an event
-     * by {@code area.replaceAbsolutely(change.getPosition(), change.getRemovalEnd(), change.getInserted()}.
+     * Applies a list of {@link RichTextChange} to the given area when the {@link UndoManager}'s change stream emits
+     * an event by {@code area.replaceAbsolutely(change.getPosition(), change.getRemovalEnd(), change.getInserted()}.
      */
-    public static <PS, SEG, S> Consumer<List<RichTextChange<PS, SEG, S>>> redoMultiRichTextChange(
+    public static <PS, SEG, S> Consumer<List<RichTextChange<PS, SEG, S>>> applyMultiRichTextChange(
             GenericStyledArea<PS, SEG, S> area) {
         return changeList -> {
             MultiChangeBuilder<PS, SEG, S> builder = area.createMultiChange(changeList.size());