Fix block-closing with a newline even when there is another block right above

Author: 0nko

aztec/src/main/kotlin/org/wordpress/aztec/handlers/BlockHandler.kt

@@ -24,10 +24,11 @@ abstract class BlockHandler<SpanType : IAztecBlockSpan>(val clazz: Class<SpanTyp
     var newlineIndex: Int = -1
     var nestingLevel = 0
     var markerIndex: Int = -1
+    var isReplay = false
 
-    override fun handleTextChanged(text: Spannable, inputStart: Int, count: Int, nestingLevel: Int) {
+    override fun handleTextChanged(text: Spannable, inputStart: Int, count: Int, nestingLevel: Int, isReplay: Boolean) {
         this.text = text
-
+        this.isReplay = isReplay
         this.nestingLevel = nestingLevel
 
         // use charsNew to get the spans at the input point. It appears to be more reliable vs the whole Editable.
@@ -92,9 +93,10 @@ abstract class BlockHandler<SpanType : IAztecBlockSpan>(val clazz: Class<SpanTyp
         }
 
         // prev newline needs to be at the same nesting level to account for "double-enter"
+        val prevNewlineNesting = IAztecNestable.getNestingLevelAt(text, newlineIndex - 1, newlineIndex)
+        val currentNewlineNesting = IAztecNestable.getNestingLevelAt(text, newlineIndex, newlineIndex + 1)
         if (text[newlineIndex - 1] == Constants.NEWLINE
-                && IAztecNestable.getNestingLevelAt(text, newlineIndex - 1, newlineIndex) ==
-                    IAztecNestable.getNestingLevelAt(text, newlineIndex, newlineIndex + 1)
+                && (prevNewlineNesting == currentNewlineNesting || prevNewlineNesting > currentNewlineNesting && !isReplay)
                 && atEndOfBlock) {
             return PositionType.EMPTY_LINE_AT_BLOCK_END
         }

aztec/src/main/kotlin/org/wordpress/aztec/watchers/BlockElementWatcher.kt

@@ -17,7 +17,7 @@ open class BlockElementWatcher(aztecText: AztecText) : TextWatcher {
     val handlers = ArrayList<TextChangeHandler>()
 
     interface TextChangeHandler {
-        fun handleTextChanged(text: Spannable, inputStart: Int, count: Int, nestingLevel: Int)
+        fun handleTextChanged(text: Spannable, inputStart: Int, count: Int, nestingLevel: Int, isReplay: Boolean)
     }
 
     private val aztecTextRef: WeakReference<AztecText?> = WeakReference(aztecText)
@@ -64,6 +64,7 @@ open class BlockElementWatcher(aztecText: AztecText) : TextWatcher {
         var startIndex = start
         var charCount = count
 
+        var hasReplay = false
         do {
             val nestingLevelToProcess = IAztecNestable.getNestingLevelAt(s as Spanned, startIndex, startIndex + charCount)
 
@@ -73,11 +74,12 @@ open class BlockElementWatcher(aztecText: AztecText) : TextWatcher {
                         s as Spannable,
                         startIndex,
                         charCount,
-                        nestingLevelToProcess)
+                        nestingLevelToProcess,
+                        hasReplay)
             }
 
             // check for a replay marker and use its bounds
-            val hasReplay = aztecTextRef.get()?.text?.let text@ { text ->
+            hasReplay = aztecTextRef.get()?.text?.let text@ { text ->
                 text.getSpans(0, s.length, MarkForReplay::class.java).firstOrNull { mark ->
                     if (mark != null) {
                         startIndex = text.getSpanStart(mark)