Merge pull request #1157 from wordpress-mobile/issue/empty_list

Empty list

Author: SergioEstevao

Aztec/Classes/Extensions/String+EndOfLine.swift

@@ -9,7 +9,7 @@ extension String {
     ///
     /// - Returns: `true` if the specified index is in an empty line, `false` otherwise.
     ///
-    func isEmptyLine(at index: String.Index) -> Bool {
+    public func isEmptyLine(at index: String.Index) -> Bool {
         return isStartOfNewLine(at: index) && isEndOfLine(at: index)
     }
 
@@ -20,7 +20,7 @@ extension String {
     ///
     /// - Returns: `true` if the specified offset is in an empty line, `false` otherwise.
     ///
-    func isEmptyLine(at offset: Int) -> Bool {
+    public func isEmptyLine(at offset: Int) -> Bool {
         guard let index = self.indexFromLocation(offset) else {
             return true
         }

Aztec/Classes/Libxml2/DOM/Data/ElementNode.swift

@@ -136,7 +136,7 @@ public class ElementNode: Node {
 
     override func needsClosingParagraphSeparator() -> Bool {
         return (!hasChildren())
-            && (hasAttributes() || !isLastInTree())
+            && (canBeLastInTree() || !isLastInTree())
             && (isBlockLevel() || hasRightBlockLevelSibling() || isLastInAncestorEndingInBlockLevelSeparation())
     }
 
@@ -258,6 +258,14 @@ public class ElementNode: Node {
         return false
     }
 
+    /// Check if the node can be the last one in a tree
+    ///
+    /// - Returns: Returns `true` if it can be the last one, false otherwise.
+    ///
+    func canBeLastInTree() -> Bool {
+        return hasAttributes() || type == .li
+    }
+
     /// Find out if this is a block-level element.
     ///
     /// - Returns: `true` if this is a block-level element.  `false` otherwise.

AztecTests/TextKit/TextViewTests.swift

@@ -1980,4 +1980,13 @@ class TextViewTests: XCTestCase {
 
         XCTAssertEqual(output, expected)
     }
+
+    /// This test makes sure that if an empty list is in the original HTML, it will still get output after our processing.
+    func testEmptyListsPersistsAfterAztec() {
+        let textView = TextViewStub(withHTML: "<ul><li></li></ul>")
+
+        let html = textView.getHTML(prettify: false)
+
+        XCTAssertEqual(html, "<ul><li></li></ul>")
+    }
 }