Merge pull request #807 from wordpress-mobile/fix/cleanup-zwj-continue

Don't bail when ZWJ cleanup found end-of-text marker
wordpress-mobile · Apr 15, 2019 · 1400adb · 1400adb
2 parents 7e968c3 + 3a6ab4f
commit 1400adb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecParser.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecParser.kt
@@ -335,8 +335,9 @@ class AztecParser @JvmOverloads constructor(val plugins: List<IAztecPlugin> = li
         do {
             lastIndex = text.lastIndexOf(Constants.ZWJ_CHAR, lastIndex)
             if (lastIndex == text.length - 1) {
-                // ZWJ at the end of text will serve as end-of-text marker so, let it be and finish.
-                return
+                // ZWJ at the end of text will serve as end-of-text marker so, let it be and continue cleaning up ZWJs
+                lastIndex--
+                continue
             }
 
             if (lastIndex > -1) {