Empty list items can no longer interrupt a paragraph (spec 0.26, #55)

Author: robinst

commonmark/src/main/java/org/commonmark/internal/ListBlockParser.java

@@ -57,12 +57,6 @@ private static ListData parseListMarker(CharSequence line, final int markerIndex
         }
 
         ListBlock listBlock = createListBlock(matcher);
-        if (inParagraph && listBlock instanceof OrderedList) {
-            // Ordered lists can only interrupt paragraphs with a start number of 1.
-            if (((OrderedList) listBlock).getStartNumber() != 1) {
-                return null;
-            }
-        }
 
         int markerLength = matcher.end() - matcher.start();
         int indexAfterMarker = markerIndex + markerLength;
@@ -85,6 +79,17 @@ private static ListData parseListMarker(CharSequence line, final int markerIndex
             }
         }
 
+        if (inParagraph) {
+            // If the list item is ordered, the start number must be 1 to interrupt a paragraph.
+            if (listBlock instanceof OrderedList && ((OrderedList) listBlock).getStartNumber() != 1) {
+                return null;
+            }
+            // Empty list item can not interrupt a paragraph.
+            if (!hasContent) {
+                return null;
+            }
+        }
+
         if (!hasContent || (contentColumn - columnAfterMarker) > Parsing.CODE_BLOCK_INDENT) {
             // If this line is blank or has a code block, default to 1 space after marker
             contentColumn = columnAfterMarker + 1;
@@ -138,8 +143,8 @@ public BlockStart tryStart(ParserState state, MatchedBlockParser matchedBlockPar
             }
             int markerIndex = state.getNextNonSpaceIndex();
             int markerColumn = state.getColumn() + state.getIndent();
-            ListData listData = parseListMarker(state.getLine(), markerIndex, markerColumn,
-                    matchedBlockParser.getParagraphContent() != null);
+            boolean inParagraph = matchedBlockParser.getParagraphContent() != null;
+            ListData listData = parseListMarker(state.getLine(), markerIndex, markerColumn, inParagraph);
             if (listData == null) {
                 return BlockStart.none();
             }