Fix line endings in tight list items

Author: wooorm

lib/handlers/list-item.js

@@ -3,52 +3,29 @@
 module.exports = listItem
 
 var u = require('unist-builder')
-var wrap = require('../wrap')
 var all = require('../all')
 
 function listItem(h, node, parent) {
-  var children = node.children
-  var head = children[0]
-  var raw = all(h, node)
+  var result = all(h, node)
+  var head = result[0]
   var loose = parent ? listLoose(parent) : listItemLoose(node)
   var props = {}
-  var result
-  var container
-  var index
+  var wrapped = []
   var length
+  var index
   var child
 
-  // Tight lists should not render `paragraph` nodes as `p` elements.
-  if (loose) {
-    result = raw
-  } else {
-    result = []
-    length = raw.length
-    index = -1
-
-    while (++index < length) {
-      child = raw[index]
-
-      if (child.tagName === 'p') {
-        result = result.concat(child.children)
-      } else {
-        result.push(child)
-      }
-    }
-  }
-
   if (typeof node.checked === 'boolean') {
-    if (loose && (!head || head.type !== 'paragraph')) {
-      result.unshift(h(null, 'p', []))
+    if (!head || head.tagName !== 'p') {
+      head = h(null, 'p', [])
+      result.unshift(head)
     }
 
-    container = loose ? result[0].children : result
-
-    if (container.length !== 0) {
-      container.unshift(u('text', ' '))
+    if (head.children.length !== 0) {
+      head.children.unshift(u('text', ' '))
     }
 
-    container.unshift(
+    head.children.unshift(
       h(null, 'input', {
         type: 'checkbox',
         checked: node.checked,
@@ -61,11 +38,30 @@ function listItem(h, node, parent) {
     props.className = ['task-list-item']
   }
 
-  if (loose && result.length !== 0) {
-    result = wrap(result, true)
+  length = result.length
+  index = -1
+
+  while (++index < length) {
+    child = result[index]
+
+    // Add eols before nodes, except if this is a loose, first paragraph.
+    if (loose || index !== 0 || child.tagName !== 'p') {
+      wrapped.push(u('text', '\n'))
+    }
+
+    if (child.tagName === 'p' && !loose) {
+      wrapped = wrapped.concat(child.children)
+    } else {
+      wrapped.push(child)
+    }
+  }
+
+  // Add a final eol.
+  if (length && (loose || child.tagName !== 'p')) {
+    wrapped.push(u('text', '\n'))
   }
 
-  return h(node, 'li', props, result)
+  return h(node, 'li', props, wrapped)
 }
 
 function listLoose(node) {

test/list-item.js

@@ -162,11 +162,13 @@ test('ListItem', function (t) {
       ])
     ),
     u('element', {tagName: 'li', properties: {}}, [
+      u('text', '\n'),
       u('element', {tagName: 'ul', properties: {}}, [
         u('text', '\n'),
         u('element', {tagName: 'li', properties: {}}, [u('text', 'Alpha')]),
         u('text', '\n')
-      ])
+      ]),
+      u('text', '\n')
     ]),
     'should support lists in `listItem`s'
   )