Preserve correct cursor position after pasting

Author: 0nko

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

@@ -1041,8 +1041,8 @@ class AztecText : AppCompatAutoCompleteTextView, TextWatcher, UnknownHtmlSpan.On
             if (clip.itemCount > 0) {
                 val textToPaste = clip.getItemAt(0).coerceToHtmlText(context, AztecParser(plugins))
 
-                val oldHtml = toPlainHtml()
-                val newHtml = oldHtml.replace(Constants.REPLACEMENT_MARKER_STRING, textToPaste)
+                val oldHtml = toPlainHtml().replace("<aztec_cursor>", "")
+                val newHtml = oldHtml.replace(Constants.REPLACEMENT_MARKER_STRING, textToPaste + "<" + AztecCursorSpan.AZTEC_CURSOR_TAG + ">")
 
                 history.beforeTextChanged(toFormattedHtml())
                 fromHtml(newHtml)