refactor: port changes up to version 4.15

Author: lppedd

src/commonMain/kotlin/io/github/petertrr/diffutils/patch/Patch.kt

@@ -37,40 +37,62 @@ public class Patch<T>(private var conflictOutput: ConflictOutput<T> = ExceptionP
         }
 
     /**
-     * Apply this patch to the given target.
+     * Apply this patch to the given target list, returning a new list.
      *
      * @return The patched text
      * @throws PatchFailedException If the patch cannot be applied
      */
     public fun applyTo(target: List<T>): List<T> {
         val result = target.toMutableList()
+        applyToExisting(result)
+        return result
+    }
+
+    /**
+     * Apply this patch to the given target list, directly modifying it.
+     *
+     * @return The patched text
+     * @throws PatchFailedException If the patch cannot be applied
+     */
+    @Suppress("MemberVisibilityCanBePrivate")
+    public fun applyToExisting(target: MutableList<T>) {
         val it = deltas.listIterator(deltas.size)
 
         while (it.hasPrevious()) {
             val delta = it.previous()
-            val verifyChunk = delta.verifyAndApplyTo(result)
-            conflictOutput.processConflict(verifyChunk, delta, result)
+            val verifyChunk = delta.verifyAndApplyTo(target)
+            conflictOutput.processConflict(verifyChunk, delta, target)
         }
-
-        return result
     }
 
     /**
-     * Restore the text to its original form. Opposite of the [applyTo] method.
+     * Creates a new list, containing the restored state of the given target list.
+     * Opposite of the [applyTo] method.
      *
      * @param target The given target
      * @return The restored text
      */
     public fun restore(target: List<T>): List<T> {
         val result = target.toMutableList()
+        restoreToExisting(result)
+        return result
+    }
+
+    /**
+     * Restores all changes within the given target list.
+     * Opposite of the [applyToExisting] method.
+     *
+     * @param target The given target
+     * @return The restored text
+     */
+    @Suppress("MemberVisibilityCanBePrivate")
+    public fun restoreToExisting(target: MutableList<T>) {
         val it = deltas.listIterator(deltas.size)
 
         while (it.hasPrevious()) {
             val delta = it.previous()
-            delta.restore(result)
+            delta.restore(target)
         }
-
-        return result
     }
 
     /**
@@ -102,7 +124,7 @@ public class Patch<T>(private var conflictOutput: ConflictOutput<T> = ExceptionP
             var startRevised = 0
 
             val adjustedChanges = if (includeEquals) {
-                changes.sortedBy { it.startOriginal }
+                changes.sortedBy(Change::startOriginal)
             } else {
                 changes
             }

src/commonMain/kotlin/io/github/petertrr/diffutils/text/WordDiffSplitter.kt

@@ -16,7 +16,8 @@
 package io.github.petertrr.diffutils.text
 
 // As a "global" variable to avoid re-compiling the regex each time
-private val defaultPattern = Regex("\\s+|[,.\\[\\](){}/\\\\*+\\-#]")
+@Suppress("RegExpRedundantEscape") // To be PCRE compliant!
+private val defaultPattern = Regex("""\s+|[,.\[\](){}\/\\*+\-#<>;:&']+""")
 
 /**
  * Splitting lines by word to achieve word by word diff checking.