fix bugs in conversion to get all tests passing

Author: nbransby

src/commonMain/kotlin/com/github/difflib/DiffUtils.kt

@@ -60,9 +60,7 @@ object DiffUtils {
 //    @Throws(DiffException::class)
     fun diff(sourceText: String, targetText: String,
              progress: DiffAlgorithmListener): Patch<String> {
-        return DiffUtils.diff(
-                sourceText.split("\n".toRegex()).dropLastWhile { it.isEmpty() },
-                targetText.split("\n".toRegex()).dropLastWhile { it.isEmpty() }, progress)
+        return DiffUtils.diff(sourceText.lines(), targetText.lines(), progress)
     }
 
     /**
@@ -132,7 +130,7 @@ object DiffUtils {
             revList.add(character.toString())
         }
         val patch = DiffUtils.diff(origList, revList)
-        for (delta in patch.deltas) {
+        for (delta in patch.getDeltas()) {
             delta.source.lines = compressLines(delta.source.lines!!, "")
             delta.target.lines = compressLines(delta.target.lines!!, "")
         }

src/commonMain/kotlin/com/github/difflib/UnifiedDiffUtils.kt

@@ -137,13 +137,13 @@ object UnifiedDiffUtils {
     fun generateUnifiedDiff(originalFileName: String?,
                             revisedFileName: String?, originalLines: List<String>, patch: Patch<String>,
                             contextSize: Int): List<String> {
-        if (!patch.deltas.isEmpty()) {
+        if (patch.getDeltas().isNotEmpty()) {
             val ret = ArrayList<String>()
             ret.add("--- $originalFileName")
             ret.add("+++ $revisedFileName")
 
             val patchDeltas = ArrayList(
-                    patch.deltas)
+                    patch.getDeltas())
 
             // code outside the if block also works for single-delta issues.
             val deltas = ArrayList<AbstractDelta<String>>() // current

src/commonMain/kotlin/com/github/difflib/patch/Patch.kt

@@ -82,7 +82,7 @@ class Patch<T> constructor(estimatedPatchSize: Int = 10) {
      *
      * @return the deltas
      */
-    fun getDeltas(): List<AbstractDelta<T>> {
+    fun getDeltas(): MutableList<AbstractDelta<T>> {
         deltas.sortBy { d -> d.source.position }
         return deltas
     }

src/commonMain/kotlin/com/github/difflib/text/DiffRowGenerator.kt

@@ -91,7 +91,7 @@ class DiffRowGenerator private constructor(builder: Builder) {
     fun generateDiffRows(original: List<String>, patch: Patch<String>): List<DiffRow> {
         val diffRows = ArrayList<DiffRow>()
         var endPos = 0
-        val deltaList = patch.deltas
+        val deltaList = patch.getDeltas()
         for (delta in deltaList) {
             val orig = delta.source
             val rev = delta.target
@@ -165,7 +165,7 @@ class DiffRowGenerator private constructor(builder: Builder) {
                 StringUtils.wrapText(newline, columnWidth))
     }
 
-    internal fun normalizeLines(list: List<String>): List<String> {
+    fun normalizeLines(list: List<String>): List<String> {
         return list.map { lineNormalizer(it) }.toList()
     }
 
@@ -186,7 +186,7 @@ class DiffRowGenerator private constructor(builder: Builder) {
         origList = inlineDiffSplitter(joinedOrig)
         revList = inlineDiffSplitter(joinedRev)
 
-        val inlineDeltas = DiffUtils.diff(origList, revList).deltas
+        val inlineDeltas = DiffUtils.diff(origList, revList).getDeltas()
 
         inlineDeltas.reverse()
         for (inlineDelta in inlineDeltas) {
@@ -225,8 +225,8 @@ class DiffRowGenerator private constructor(builder: Builder) {
             revResult.append(character)
         }
 
-        val original = origResult.toString().split("\n".toRegex()).dropLastWhile { it.isEmpty() }
-        val revised = revResult.toString().split("\n".toRegex()).dropLastWhile { it.isEmpty() }
+        val original = origResult.toString().lines()
+        val revised = revResult.toString().lines()
         val diffRows = ArrayList<DiffRow>()
         for (j in 0 until max(original.size, revised.size)) {
             diffRows.add(buildDiffRowWithoutNormalizing(Tag.CHANGE,
@@ -432,11 +432,11 @@ class DiffRowGenerator private constructor(builder: Builder) {
                 val results = SPLIT_PATTERN.findAll(str)
                 var pos = 0
                 for (result in results) {
-                    if (pos < result.range.start) {
-                        list.add(str.substring(pos, result.range.start))
+                    if (pos < result.range.first) {
+                        list.add(str.substring(pos, result.range.first))
                     }
-                    list.add(result.groupValues.single())
-                    pos = result.range.endInclusive
+                    list.add(result.value)
+                    pos = result.range.last + 1
                 }
                 if (pos < str.length) {
                     list.add(str.substring(pos))

src/commonMain/kotlin/com/github/difflib/text/StringUtils.kt

@@ -16,7 +16,7 @@
 package com.github.difflib.text
 
 
-internal object StringUtils {
+object StringUtils {
 
     /**
      * Replaces all opening an closing tags with `<` or `>`.
@@ -51,18 +51,16 @@ internal object StringUtils {
             return line
         }
         val length = line.length
-        val delimiter = "<br/>".length
-        var widthIndex = columnWidth
-
-        val b = StringBuilder(line)
+        val b = StringBuilder()
 
         var count = 0
-        while (length > widthIndex) {
-            b.append(widthIndex + delimiter * count, "<br/>")
-            widthIndex += columnWidth
-            count++
+        while (count * columnWidth + columnWidth < length) {
+            b.append(line.subSequence(columnWidth * count, columnWidth * ++count))
+            b.append("<br/>")
         }
 
+        b.append(line.subSequence(columnWidth * count, length))
+
         return b.toString()
     }
 }

src/commonMain/kotlin/com/github/difflib/unifieddiff/UnifiedDiff.kt

@@ -29,15 +29,15 @@ class UnifiedDiff {
         private set
     internal val files = ArrayList<UnifiedDiffFile>()
 
-    internal fun addFile(file: UnifiedDiffFile) {
+    fun addFile(file: UnifiedDiffFile) {
         files.add(file)
     }
 
     fun getFiles(): List<UnifiedDiffFile> {
         return files
     }
 
-    internal fun setTailTxt(tailTxt: String) {
+    fun setTailTxt(tailTxt: String) {
         this.tail = tailTxt
     }