Merge pull request #292 from wordpress-mobile/issue/288-quote-gets-removed

Quote gets removed

Author: 0nko

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

@@ -99,23 +99,27 @@ class AztecParser {
     fun addVisualNewlinesToBlockElements(spanned: Editable) {
         // add visual newlines at starts
         spanned.getSpans(0, spanned.length, AztecSurroundedWithNewlines::class.java).forEach {
+            val parent = AztecNestable.getParent(spanned, SpanWrapper(spanned, it))
+
+            // a list item "repels" a child list so the list will appear in the next line
+            val repelling = (parent?.span is AztecListItemSpan) && (it is AztecListSpan)
+
             val spanStart = spanned.getSpanStart(it)
 
-            // no need for newline if at text start
-            if (spanStart < 1) {
+            // no need for newline if at text start, unless repelling needs to happen
+            if (!repelling && spanStart < 1) {
                 return@forEach
             }
 
-            val parentStart = AztecNestable.getParent(spanned, SpanWrapper(spanned, it))?.start ?: 0
+            val parentStart = parent?.start ?: 0
 
-            // no need for newline if we're a childBlock at the start of our parent
-            if (spanStart == parentStart && (it is AztecChildBlockSpan || it is AztecSurroundedWithNewlines)) {
+            // no need for newline if we're at the start of our parent, unless repelling needs to happen
+            if (!repelling && spanStart == parentStart) {
                 return@forEach
             }
 
-            // no need for newline if there's already one, unless we're at the start of our parent
-            // and this is a block span
-            if (spanStart != parentStart && spanned[spanStart - 1] == '\n' && (it is AztecBlockSpan || spanStart == 1)) {
+            // no need for newline if there's already one, unless repelling needs to happen
+            if (!repelling && spanned[spanStart - 1] == '\n') {
                 return@forEach
             }
 
@@ -192,16 +196,21 @@ class AztecParser {
         }
 
         spanned.getSpans(0, spanned.length, AztecSurroundedWithNewlines::class.java).forEach {
+            val parent = AztecNestable.getParent(spanned, SpanWrapper(spanned, it))
+
+            // a list item "repels" a child list so the list will appear in the next line
+            val repelling = (parent?.span is AztecListItemSpan) && (it is AztecListSpan)
+
             val spanStart = spanned.getSpanStart(it)
 
-            if (spanStart < 1) {
-                // no visual newline if at text start so, return
+            if (!repelling && spanStart < 1) {
+                // no visual newline if at text start and not repelling so, return
                 return@forEach
             }
 
-            if (spanStart < 2) {
-                // no visual newline can exist unless there are at least 2 chars before the block (one will be the newline
-                //  and the other will be the leading content) so, return
+            if (!repelling && spanStart < 2) {
+                // if not repelling, no visual newline can exist unless there are at least 2 chars before the block
+                //  (one will be the newline and the other will be the leading content) so, return
                 return@forEach
             }
 
@@ -210,14 +219,14 @@ class AztecParser {
                 return@forEach
             }
 
-            if (spanned.getSpans(spanStart, spanStart, AztecSurroundedWithNewlines::class.java).any {
-                    spanned.getSpanEnd(it) == spanStart }) {
+            if (spanned.getSpans(spanStart, spanStart, AztecSurroundedWithNewlines::class.java).any { before ->
+                        spanned.getSpanEnd(before) == spanStart }) {
                 // the newline before us is the end of a previous block element so, return
                 return@forEach
             }
 
-            if (spanned[spanStart - 2] == '\n' && it is AztecBlockSpan) {
-                // there's another newline before so, the adjacent one is not a visual one so, return
+            if (!repelling && spanned[spanStart - 2] == '\n' && it is AztecBlockSpan) {
+                // there's another newline before and we're not repelling a parent so, the adjacent one is not a visual one so, return
                 return@forEach
             }
 

aztec/src/main/kotlin/org/wordpress/aztec/formatting/BlockFormatter.kt

@@ -338,10 +338,16 @@ class BlockFormatter(editor: AztecText, val listStyle: ListStyle, val quoteStyle
             if (startOfLine != 0) {
                 val spansOnPreviousLine = editableText.getSpans(startOfLine - 1, startOfLine - 1, spanToApply.javaClass)
                         .firstOrNull()
-                // if same span type is found (also check for heading style equality if a heading) extend the start
-                if (spansOnPreviousLine != null
-                        && (spansOnPreviousLine !is AztecHeadingSpan
-                                || spansOnPreviousLine.heading == (spanToApply as AztecHeadingSpan).heading)) {
+
+                if (spansOnPreviousLine == null) {
+                    // no similar blocks before us so, don't expand
+                } else if (spansOnPreviousLine.nestingLevel != nestingLevel) {
+                    // other block is at a different nesting level so, don't expand
+                } else if (spansOnPreviousLine is AztecHeadingSpan
+                        && spansOnPreviousLine.heading != (spanToApply as AztecHeadingSpan).heading) {
+                    // Heading span is of different style so, don't expand
+                } else {
+                    // expand the start
                     startOfBlock = editableText.getSpanStart(spansOnPreviousLine)
                     liftBlock(blockElementType, startOfBlock, endOfBlock)
                 }
@@ -350,10 +356,16 @@ class BlockFormatter(editor: AztecText, val listStyle: ListStyle, val quoteStyle
             if (endOfLine != editableText.length) {
                 val spanOnNextLine = editableText.getSpans(endOfLine + 1, endOfLine + 1, spanToApply.javaClass)
                         .firstOrNull()
-                // if same span type is found (also check for heading style equality if a heading) extend the end
-                if (spanOnNextLine != null
-                        && (spanOnNextLine !is AztecHeadingSpan
-                                || spanOnNextLine.heading == (spanToApply as AztecHeadingSpan).heading)) {
+
+                if (spanOnNextLine == null) {
+                    // no similar blocks after us so, don't expand
+                } else if (spanOnNextLine.nestingLevel != nestingLevel) {
+                    // other block is at a different nesting level so, don't expand
+                } else if (spanOnNextLine is AztecHeadingSpan
+                        && spanOnNextLine.heading != (spanToApply as AztecHeadingSpan).heading) {
+                    // Heading span is of different style so, don't expand
+                } else {
+                    // expand the end
                     endOfBlock = editableText.getSpanEnd(spanOnNextLine)
                     liftBlock(blockElementType, startOfBlock, endOfBlock)
                 }

aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecBlockSpan.kt

@@ -1,3 +1,4 @@
 package org.wordpress.aztec.spans
 
-interface AztecBlockSpan : AztecLineBlockSpan, AztecParagraphStyle, AztecSurroundedWithNewlines, AztecSpan, ParagraphFlagged
+
+interface AztecBlockSpan : AztecParagraphStyle, AztecSurroundedWithNewlines, AztecSpan, ParagraphFlagged

aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecChildBlockSpan.kt

@@ -2,8 +2,7 @@ package org.wordpress.aztec.spans
 
 import android.text.TextUtils
 
-class AztecListItemSpan(override var nestingLevel: Int, override var attributes: String = "") : AztecBlockSpan,
-        AztecChildBlockSpan {
+class AztecListItemSpan(override var nestingLevel: Int, override var attributes: String = "") : AztecBlockSpan {
 
     private val TAG = "li"
 

aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecLineBlockSpan.kt

@@ -766,4 +766,33 @@ class ListTest(listTextFormat: TextFormat, listHtmlTag: String) {
         Assert.assertEquals(EndOfBufferMarkerAdder.ensureEndOfTextMarker(""), editText.text.toString())
         Assert.assertEquals("", editText.toHtml())
     }
+
+    @Test
+    @Throws(Exception::class)
+    fun nestListWithSimilarNeighboringList_issue288() {
+        val preQuote = "<$listTag><li>Unordered1</li><li></li></$listTag><blockquote>"
+        val aftQuote = "</blockquote><$listTag><li>Unordered2</li><li></li></$listTag>"
+        editText.fromHtml(preQuote + "Quote" + aftQuote)
+
+        editText.setSelection(editText.text.indexOf("Quote"))
+
+        editText.toggleFormatting(listType)
+
+        Assert.assertEquals(preQuote + "<$listTag><li>Quote</li></$listTag>" + aftQuote, editText.toHtml())
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun nestedListsHaveVisualNewline() {
+        val html = "outpre<blockquote><$listTag><li><$listTag><li>nested</li></$listTag></li></$listTag></blockquote>outaft"
+        editText.fromHtml(html)
+
+        val nestedPosition = editText.text.indexOf("nested")
+
+        // there should be a (visual) newline between the nested list and the parent list item
+        Assert.assertEquals(editText.text[nestedPosition - 1], '\n')
+
+        // but not in the html
+        Assert.assertEquals(html, editText.toHtml())
+    }
 }