From 1d3255ed591076cd485339a15e3f3e2749f9ea44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Rutkowski?= <lukus178@gmail.com>
Date: Mon, 18 Feb 2019 12:36:53 +0100
Subject: [PATCH] Extend task list parsing (#99)

* Handle task lists that start with * or + symbol
* Handle task lists that start with numbers
* Limit numbers valid for task lists to 9 digits
---
 .../markwon/tasklist/TaskListBlockParser.java |  6 +-
 .../src/test/resources/tests/task-list.yaml   | 57 +++++++++++++++++++
 2 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 markwon/src/test/resources/tests/task-list.yaml

diff --git a/markwon/src/main/java/ru/noties/markwon/tasklist/TaskListBlockParser.java b/markwon/src/main/java/ru/noties/markwon/tasklist/TaskListBlockParser.java
index 4c2ab99a..436de188 100644
--- a/markwon/src/main/java/ru/noties/markwon/tasklist/TaskListBlockParser.java
+++ b/markwon/src/main/java/ru/noties/markwon/tasklist/TaskListBlockParser.java
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("WeakerAccess")
 class TaskListBlockParser extends AbstractBlockParser {
 
-    private static final Pattern PATTERN = Pattern.compile("\\s*-\\s+\\[(x|X|\\s)\\]\\s+(.*)");
+    private static final Pattern PATTERN = Pattern.compile("\\s*([-*+]|\\d{1,9}[.)])\\s+\\[(x|X|\\s)]\\s+(.*)");
 
     private final TaskListBlock block = new TaskListBlock();
 
@@ -88,9 +88,9 @@ class TaskListBlockParser extends AbstractBlockParser {
                 continue;
             }
             listItem = new TaskListItem()
-                    .done(isDone(matcher.group(1)))
+                    .done(isDone(matcher.group(2)))
                     .indent(item.indent / 2);
-            inlineParser.parse(matcher.group(2), listItem);
+            inlineParser.parse(matcher.group(3), listItem);
             block.appendChild(listItem);
         }
     }
diff --git a/markwon/src/test/resources/tests/task-list.yaml b/markwon/src/test/resources/tests/task-list.yaml
new file mode 100644
index 00000000..1663940c
--- /dev/null
+++ b/markwon/src/test/resources/tests/task-list.yaml
@@ -0,0 +1,57 @@
+input: |-
+  - [ ] First
+  - [x] Second
+  - [X] Third
+  * [ ] First star
+  * [x] Second star
+  * [X] Third star
+  + [ ] First plus
+  + [x] Second plus
+  + [X] Third plus
+  1. [x] Number with dot
+  3) [ ] Number
+
+output:
+  - task-list: "First"
+    blockIdent: 1
+    done: false
+  - text: "\n"
+  - task-list: "Second"
+    blockIdent: 1
+    done: true
+  - text: "\n"
+  - task-list: "Third"
+    blockIdent: 1
+    done: true
+  - text: "\n"
+  - task-list: "First star"
+    blockIdent: 1
+    done: false
+  - text: "\n"
+  - task-list: "Second star"
+    blockIdent: 1
+    done: true
+  - text: "\n"
+  - task-list: "Third star"
+    blockIdent: 1
+    done: true
+  - text: "\n"
+  - task-list: "First plus"
+    blockIdent: 1
+    done: false
+  - text: "\n"
+  - task-list: "Second plus"
+    blockIdent: 1
+    done: true
+  - text: "\n"
+  - task-list: "Third plus"
+    blockIdent: 1
+    done: true
+  - text: "\n"
+  - task-list: "Number with dot"
+    blockIdent: 1
+    done: true
+  - text: "\n"
+  - task-list: "Number"
+    blockIdent: 1
+    done: false