From c8da42b123592ee2278334a1d6ce6e79f1998f27 Mon Sep 17 00:00:00 2001
From: Jimmy Lv <jimmy.jinglv@gmail.com>
Date: Tue, 10 Jul 2018 23:38:17 +0800
Subject: [PATCH 1/4] close #370: add * [ ] as task bullet to make todo list
 compatible with Markdown syntax

---
 PlainTasks.py             | 14 +++++++-------
 PlainTasks.sublime-syntax |  8 ++++----
 PlainTasks.tmLanguage     |  8 ++++----
 Readme.md                 |  6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/PlainTasks.py b/PlainTasks.py
index 71cbdf0..03b20cb 100644
--- a/PlainTasks.py
+++ b/PlainTasks.py
@@ -154,9 +154,9 @@ def runCommand(self, edit):
         original = [r for r in self.view.sel()]
         done_line_end, now = self.format_line_end(self.done_tag, tznow())
         offset = len(done_line_end)
-        rom = r'^(\s*)(\[\s\]|.)(\s*.*)$'
+        rom = r'^(\s*)(\*?\s?\[\s\]|.)(\s*.*)$'
         rdm = r'''
-            (?x)^(\s*)(\[x\]|.)                           # 0,1 indent & bullet
+            (?x)^(\s*)(\*?\s?\[x\]|.)                           # 0,1 indent & bullet
             (\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*) #   2 very task
             (?=
               ((?:\s@done|@project|@[wl]asted|$).*)   # 3 ending either w/ done or w/o it & no date
@@ -164,7 +164,7 @@ def runCommand(self, edit):
               (?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$ # 4 date & possible project tag after
             )
             '''  # rcm is the same, except bullet & ending
-        rcm = r'^(\s*)(\[\-\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@cancelled|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
+        rcm = r'^(\s*)(\*?\s?\[\-\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@cancelled|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
         started = r'^\s*[^\b]*?\s*@started(\([\d\w,\.:\-\/ @]*\)).*$'
         toggle = r'@toggle(\([\d\w,\.:\-\/ @]*\))'
 
@@ -244,9 +244,9 @@ def runCommand(self, edit):
         original = [r for r in self.view.sel()]
         canc_line_end, now = self.format_line_end(self.canc_tag, tznow())
         offset = len(canc_line_end)
-        rom = r'^(\s*)(\[\s\]|.)(\s*.*)$'
-        rdm = r'^(\s*)(\[x\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@done|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
-        rcm = r'^(\s*)(\[\-\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@cancelled|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
+        rom = r'^(\s*)(\*?\s?\[\s\]|.)(\s*.*)$'
+        rdm = r'^(\s*)(\*?\s?\[x\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@done|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
+        rcm = r'^(\s*)(\*?\s?\[\-\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@cancelled|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
         started = r'^\s*[^\b]*?\s*@started(\([\d\w,\.:\-\/ @]*\)).*$'
         toggle = r'@toggle(\([\d\w,\.:\-\/ @]*\))'
         regions = itertools.chain(*(reversed(self.view.lines(region)) for region in reversed(list(self.view.sel()))))
@@ -343,7 +343,7 @@ def runCommand(self, edit, partial=False):
             # adding tasks to archive section
             for task in all_tasks:
                 line_content = self.view.substr(task)
-                match_task = re.match(r'^\s*(\[[x-]\]|.)(\s+.*$)', line_content, re.U)
+                match_task = re.match(r'^\s*(\*?\s?\[[x-]\]|.)(\s+.*$)', line_content, re.U)
                 current_scope = self.view.scope_name(task.a)
                 if rds in current_scope or rcs in current_scope:
                     pr = self.get_task_project(task, projects)
diff --git a/PlainTasks.sublime-syntax b/PlainTasks.sublime-syntax
index 7424c23..8fc077d 100644
--- a/PlainTasks.sublime-syntax
+++ b/PlainTasks.sublime-syntax
@@ -10,7 +10,7 @@ contexts:
   main:
     - match: '^\s*(\w+.*?:\s*?(\@[^\s]+(\(.*?\))?\s*?)*$\n?)'
       scope: keyword.control.header.todo
-    - match: '^\s*(?:(\+|✓|✔|☑|√|\[x\])(\s+(?:[^\@\n]|(?<!\s)\@|\@(?=\s))*)([^\n]*))|^\s*(?:(-)(\s+(?:[^\@]|(?<!\s)\@|\@(?=\s))*)(.*\@done(?=\s|\(|$)[^\n]*))'
+    - match: '^\s*(?:(\+|✓|✔|☑|√|\*?\s?\[x\])(\s+(?:[^\@\n]|(?<!\s)\@|\@(?=\s))*)([^\n]*))|^\s*(?:(-)(\s+(?:[^\@]|(?<!\s)\@|\@(?=\s))*)(.*\@done(?=\s|\(|$)[^\n]*))'
       scope: meta.item.todo.completed
       captures:
         1: punctuation.definition.bullet.completed.todo
@@ -19,7 +19,7 @@ contexts:
         4: punctuation.definition.bullet.completed.todo
         5: comment.line.completed.todo
         6: meta.tag.todo.completed
-    - match: '^\s*(?:(✘|x|\[-\])(\s+(?:[^\@\n]|(?<!\s)\@|\@(?=\s))*)(.*))|^\s*(?:(-)(\s+(?:[^\@]|(?<!\s)\@|\@(?=\s))*)(.*\@cancelled(?=\s|\(|$)[^\n]*))'
+    - match: '^\s*(?:(✘|x|\*?\s?\[-\])(\s+(?:[^\@\n]|(?<!\s)\@|\@(?=\s))*)(.*))|^\s*(?:(-)(\s+(?:[^\@]|(?<!\s)\@|\@(?=\s))*)(.*\@cancelled(?=\s|\(|$)[^\n]*))'
       scope: meta.item.todo.cancelled
       captures:
         1: punctuation.definition.bullet.cancelled.todo
@@ -28,7 +28,7 @@ contexts:
         4: punctuation.definition.bullet.cancelled.todo
         5: text.cancelled.todo
         6: meta.tag.todo.cancelled
-    - match: '^\s*(?!-|\+|✓|✔|√|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\[[\sx-]\]|＿|✘|(x\s+))(?=\S)'
+    - match: '^\s*(?!-|\+|✓|✔|√|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\*?\s?\[[\sx-]\]|＿|✘|(x\s+))(?=\S)'
       push:
         - meta_scope: notes.todo
         - match: $\n?
@@ -36,7 +36,7 @@ contexts:
         - include: italic
         - include: bold
         - include: url
-    - match: '^\s*(-|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\[\s\])(?=(\s+(?:[^\@\n]|(?<![ \t])\@)*)(?!([^\n]*)?(\@done|\@cancelled)[\s\(]))'
+    - match: '^\s*(-|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\*?\s?\[\s\])(?=(\s+(?:[^\@\n]|(?<![ \t])\@)*)(?!([^\n]*)?(\@done|\@cancelled)[\s\(]))'
       captures:
         1: punctuation.definition.bullet.pending.todo
       push:
diff --git a/PlainTasks.tmLanguage b/PlainTasks.tmLanguage
index c4c9db8..b931250 100644
--- a/PlainTasks.tmLanguage
+++ b/PlainTasks.tmLanguage
@@ -56,7 +56,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>^\s*(?:(\+|✓|✔|☑|√|\[x\])(\s+(?:[^\@\n]|(?&lt;!\s)\@|\@(?=\s))*)([^\n]*))|^\s*(?:(-)(\s+(?:[^\@]|(?&lt;!\s)\@|\@(?=\s))*)(.*\@done(?=\s|\(|$)[^\n]*))</string>
+			<string>^\s*(?:(\+|✓|✔|☑|√|\*?\s?\[x\])(\s+(?:[^\@\n]|(?&lt;!\s)\@|\@(?=\s))*)([^\n]*))|^\s*(?:(-)(\s+(?:[^\@]|(?&lt;!\s)\@|\@(?=\s))*)(.*\@done(?=\s|\(|$)[^\n]*))</string>
 			<key>name</key>
 			<string>meta.item.todo.completed</string>
 		</dict>
@@ -96,14 +96,14 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>^\s*(?:(✘|x|\[-\])(\s+(?:[^\@\n]|(?&lt;!\s)\@|\@(?=\s))*)(.*))|^\s*(?:(-)(\s+(?:[^\@]|(?&lt;!\s)\@|\@(?=\s))*)(.*\@cancelled(?=\s|\(|$)[^\n]*))</string>
+			<string>^\s*(?:(✘|x|\*?\s?\[-\])(\s+(?:[^\@\n]|(?&lt;!\s)\@|\@(?=\s))*)(.*))|^\s*(?:(-)(\s+(?:[^\@]|(?&lt;!\s)\@|\@(?=\s))*)(.*\@cancelled(?=\s|\(|$)[^\n]*))</string>
 			<key>name</key>
 			<string>meta.item.todo.cancelled</string>
 		</dict>
 
 		<dict>
 		  <key>begin</key>
-		  <string>^\s*(?!-|\+|✓|✔|√|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\[[\sx-]\]|＿|✘|(x\s+))(?=\S)</string>
+		  <string>^\s*(?!-|\+|✓|✔|√|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\*?\s?\[[\sx-]\]|＿|✘|(x\s+))(?=\S)</string>
 		  <key>end</key>
 		  <string>$\n?</string>
 		  <key>name</key>
@@ -135,7 +135,7 @@
 				</dict>
 			</dict>
 			<key>begin</key>
-			<string>^\s*(-|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\[\s\])(?=(\s+(?:[^\@\n]|(?&lt;![ \t])\@)*)(?!([^\n]*)?(\@done|\@cancelled)[\s\(]))</string>
+			<string>^\s*(-|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\*?\s?\[\s\])(?=(\s+(?:[^\@\n]|(?&lt;![ \t])\@)*)(?!([^\n]*)?(\@done|\@cancelled)[\s\(]))</string>
 			<key>end</key>
 			<string>$</string>
 			<key>name</key>
diff --git a/Readme.md b/Readme.md
index 9e31799..6bcc94d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -173,9 +173,9 @@ Here is a list of PlainTasks’ specific settings:
 
 |            Setting             |     Default      |                                 Options/Description                                 |
 | ------------------------------ | ---------------- | ----------------------------------------------------------------------- |
-| **open_tasks_bullet**          | `☐`              | `-` `❍` `❑` `■` `□` `☐` `▪` `▫` `–` `—` `≡` `→` `›` `[ ]`             |
-| **done_tasks_bullet**          | `✔`              | `✓` `☑` `+` `[x]`                                                      |
-| **cancelled_tasks_bullet**     | `✘`              | `x` `[-]`                                                               |
+| **open_tasks_bullet**          | `☐`              | `-` `❍` `❑` `■` `□` `☐` `▪` `▫` `–` `—` `≡` `→` `›` `[ ]` `* [ ]`            |
+| **done_tasks_bullet**          | `✔`              | `✓` `☑` `+` `[x]` `* [x]`                                                      |
+| **cancelled_tasks_bullet**     | `✘`              | `x` `[-]` `* [-]`                                                               |
 | **date_format**                | `(%y-%m-%d %H:%M)` | See [strfti.me](http://www.strfti.me/) for quick reference; detailed documentation: [ST2](https://docs.python.org/2.6/library/datetime.html#strftime-and-strptime-behavior), [ST3](https://docs.python.org/3.3/library/datetime.html#strftime-and-strptime-behavior) |
 | **done_tag**                   | true             | Determines whether done tasks should gain a `@done` tag or not          |
 | **done_date**                  | true             | Determines whether done tasks should gain a date or not                 |

From 49c8e9688443165801e27fafdbed08dbea4502e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E7=AB=8B=E9=9D=92?= <jimmy.jinglv@gmail.com>
Date: Tue, 3 Sep 2019 17:44:50 +0800
Subject: [PATCH 2/4] Update PlainTasks.py

---
 PlainTasks.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/PlainTasks.py b/PlainTasks.py
index 03b20cb..698f572 100644
--- a/PlainTasks.py
+++ b/PlainTasks.py
@@ -154,9 +154,9 @@ def runCommand(self, edit):
         original = [r for r in self.view.sel()]
         done_line_end, now = self.format_line_end(self.done_tag, tznow())
         offset = len(done_line_end)
-        rom = r'^(\s*)(\*?\s?\[\s\]|.)(\s*.*)$'
+        rom = r'^(\s*)((?:\*\s)?\[\s\]|.)(\s*.*)$'
         rdm = r'''
-            (?x)^(\s*)(\*?\s?\[x\]|.)                           # 0,1 indent & bullet
+            (?x)^(\s*)((?:\*\s)?\[x\]|.)                           # 0,1 indent & bullet
             (\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*) #   2 very task
             (?=
               ((?:\s@done|@project|@[wl]asted|$).*)   # 3 ending either w/ done or w/o it & no date
@@ -164,7 +164,7 @@ def runCommand(self, edit):
               (?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$ # 4 date & possible project tag after
             )
             '''  # rcm is the same, except bullet & ending
-        rcm = r'^(\s*)(\*?\s?\[\-\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@cancelled|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
+        rcm = r'^(\s*)((?:\*\s)?\[\-\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@cancelled|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
         started = r'^\s*[^\b]*?\s*@started(\([\d\w,\.:\-\/ @]*\)).*$'
         toggle = r'@toggle(\([\d\w,\.:\-\/ @]*\))'
 
@@ -244,9 +244,9 @@ def runCommand(self, edit):
         original = [r for r in self.view.sel()]
         canc_line_end, now = self.format_line_end(self.canc_tag, tznow())
         offset = len(canc_line_end)
-        rom = r'^(\s*)(\*?\s?\[\s\]|.)(\s*.*)$'
-        rdm = r'^(\s*)(\*?\s?\[x\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@done|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
-        rcm = r'^(\s*)(\*?\s?\[\-\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@cancelled|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
+        rom = r'^(\s*)((?:\*\s)?\[\s\]|.)(\s*.*)$'
+        rdm = r'^(\s*)((?:\*\s)?\[x\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@done|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
+        rcm = r'^(\s*)((?:\*\s)?\[\-\]|.)(\s*[^\b]*?(?:[^\@]|(?<!\s)\@|\@(?=\s))*?\s*)(?=((?:\s@cancelled|@project|@[wl]asted|$).*)|(?:[ \t](\([^()]*\))\s*([^@]*|(?:@project|@[wl]asted).*))?$)'
         started = r'^\s*[^\b]*?\s*@started(\([\d\w,\.:\-\/ @]*\)).*$'
         toggle = r'@toggle(\([\d\w,\.:\-\/ @]*\))'
         regions = itertools.chain(*(reversed(self.view.lines(region)) for region in reversed(list(self.view.sel()))))
@@ -343,7 +343,7 @@ def runCommand(self, edit, partial=False):
             # adding tasks to archive section
             for task in all_tasks:
                 line_content = self.view.substr(task)
-                match_task = re.match(r'^\s*(\*?\s?\[[x-]\]|.)(\s+.*$)', line_content, re.U)
+                match_task = re.match(r'^\s*((?:\*\s)?\[[x-]\]|.)(\s+.*$)', line_content, re.U)
                 current_scope = self.view.scope_name(task.a)
                 if rds in current_scope or rcs in current_scope:
                     pr = self.get_task_project(task, projects)

From 9f09b19b3b56989c32efd2d537470e861de03d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E7=AB=8B=E9=9D=92?= <jimmy.jinglv@gmail.com>
Date: Tue, 3 Sep 2019 17:46:03 +0800
Subject: [PATCH 3/4] Update PlainTasks.tmLanguage

---
 PlainTasks.tmLanguage | 548 +++++++++++++++++++++---------------------
 1 file changed, 274 insertions(+), 274 deletions(-)

diff --git a/PlainTasks.tmLanguage b/PlainTasks.tmLanguage
index b931250..9b5fbe8 100644
--- a/PlainTasks.tmLanguage
+++ b/PlainTasks.tmLanguage
@@ -2,297 +2,297 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>fileTypes</key>
-	<array>
-		<string>todo</string>
-		<string>tasks</string>
-		<string>todolist.txt</string>
-	</array>
-	<key>keyEquivalent</key>
-	<string>^~T</string>
-	<key>name</key>
-	<string>Tasks</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>match</key>
-			<string>^\s*(\w+.*?:\s*?(\@[^\s]+(\(.*?\))?\s*?)*$\n?)</string>
-			<key>name</key>
-			<string>keyword.control.header.todo</string>
-		</dict>
+    <key>fileTypes</key>
+    <array>
+        <string>todo</string>
+        <string>tasks</string>
+        <string>todolist.txt</string>
+    </array>
+    <key>keyEquivalent</key>
+    <string>^~T</string>
+    <key>name</key>
+    <string>Tasks</string>
+    <key>patterns</key>
+    <array>
+        <dict>
+            <key>match</key>
+            <string>^\s*(\w+.*?:\s*?(\@[^\s]+(\(.*?\))?\s*?)*$\n?)</string>
+            <key>name</key>
+            <string>keyword.control.header.todo</string>
+        </dict>
 
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.bullet.completed.todo</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>comment.line.completed.todo</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>meta.tag.todo.completed</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.bullet.completed.todo</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>comment.line.completed.todo</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>meta.tag.todo.completed</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(?:(\+|✓|✔|☑|√|\*?\s?\[x\])(\s+(?:[^\@\n]|(?&lt;!\s)\@|\@(?=\s))*)([^\n]*))|^\s*(?:(-)(\s+(?:[^\@]|(?&lt;!\s)\@|\@(?=\s))*)(.*\@done(?=\s|\(|$)[^\n]*))</string>
-			<key>name</key>
-			<string>meta.item.todo.completed</string>
-		</dict>
+        <dict>
+            <key>captures</key>
+            <dict>
+                <key>1</key>
+                <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.bullet.completed.todo</string>
+                </dict>
+                <key>2</key>
+                <dict>
+                    <key>name</key>
+                    <string>comment.line.completed.todo</string>
+                </dict>
+                <key>3</key>
+                <dict>
+                    <key>name</key>
+                    <string>meta.tag.todo.completed</string>
+                </dict>
+                <key>4</key>
+                <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.bullet.completed.todo</string>
+                </dict>
+                <key>5</key>
+                <dict>
+                    <key>name</key>
+                    <string>comment.line.completed.todo</string>
+                </dict>
+                <key>6</key>
+                <dict>
+                    <key>name</key>
+                    <string>meta.tag.todo.completed</string>
+                </dict>
+            </dict>
+            <key>match</key>
+            <string>^\s*(?:(\+|✓|✔|☑|√|(?:\*\s)?\[x\])(\s+(?:[^\@\n]|(?&lt;!\s)\@|\@(?=\s))*)([^\n]*))|^\s*(?:(-)(\s+(?:[^\@]|(?&lt;!\s)\@|\@(?=\s))*)(.*\@done(?=\s|\(|$)[^\n]*))</string>
+            <key>name</key>
+            <string>meta.item.todo.completed</string>
+        </dict>
 
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.bullet.cancelled.todo</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>text.cancelled.todo</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>meta.tag.todo.cancelled</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.bullet.cancelled.todo</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>text.cancelled.todo</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>meta.tag.todo.cancelled</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(?:(✘|x|\*?\s?\[-\])(\s+(?:[^\@\n]|(?&lt;!\s)\@|\@(?=\s))*)(.*))|^\s*(?:(-)(\s+(?:[^\@]|(?&lt;!\s)\@|\@(?=\s))*)(.*\@cancelled(?=\s|\(|$)[^\n]*))</string>
-			<key>name</key>
-			<string>meta.item.todo.cancelled</string>
-		</dict>
+        <dict>
+            <key>captures</key>
+            <dict>
+                <key>1</key>
+                <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.bullet.cancelled.todo</string>
+                </dict>
+                <key>2</key>
+                <dict>
+                    <key>name</key>
+                    <string>text.cancelled.todo</string>
+                </dict>
+                <key>3</key>
+                <dict>
+                    <key>name</key>
+                    <string>meta.tag.todo.cancelled</string>
+                </dict>
+                <key>4</key>
+                <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.bullet.cancelled.todo</string>
+                </dict>
+                <key>5</key>
+                <dict>
+                    <key>name</key>
+                    <string>text.cancelled.todo</string>
+                </dict>
+                <key>6</key>
+                <dict>
+                    <key>name</key>
+                    <string>meta.tag.todo.cancelled</string>
+                </dict>
+            </dict>
+            <key>match</key>
+            <string>^\s*(?:(✘|x|(?:\*\s)?\[-\])(\s+(?:[^\@\n]|(?&lt;!\s)\@|\@(?=\s))*)(.*))|^\s*(?:(-)(\s+(?:[^\@]|(?&lt;!\s)\@|\@(?=\s))*)(.*\@cancelled(?=\s|\(|$)[^\n]*))</string>
+            <key>name</key>
+            <string>meta.item.todo.cancelled</string>
+        </dict>
 
-		<dict>
-		  <key>begin</key>
-		  <string>^\s*(?!-|\+|✓|✔|√|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\*?\s?\[[\sx-]\]|＿|✘|(x\s+))(?=\S)</string>
-		  <key>end</key>
-		  <string>$\n?</string>
-		  <key>name</key>
-		  <string>notes.todo</string>
-		  <key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#italic</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#bold</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#url</string>
-				</dict>
-			</array>
-		</dict>
+        <dict>
+          <key>begin</key>
+          <string>^\s*(?!-|\+|✓|✔|√|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|(?:\*\s)?\[[\sx-]\]|＿|✘|(x\s+))(?=\S)</string>
+          <key>end</key>
+          <string>$\n?</string>
+          <key>name</key>
+          <string>notes.todo</string>
+          <key>patterns</key>
+            <array>
+                <dict>
+                    <key>include</key>
+                    <string>#italic</string>
+                </dict>
+                <dict>
+                    <key>include</key>
+                    <string>#bold</string>
+                </dict>
+                <dict>
+                    <key>include</key>
+                    <string>#url</string>
+                </dict>
+            </array>
+        </dict>
 
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.bullet.pending.todo</string>
-				</dict>
-			</dict>
-			<key>begin</key>
-			<string>^\s*(-|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\*?\s?\[\s\])(?=(\s+(?:[^\@\n]|(?&lt;![ \t])\@)*)(?!([^\n]*)?(\@done|\@cancelled)[\s\(]))</string>
-			<key>end</key>
-			<string>$</string>
-			<key>name</key>
-			<string>meta.item.todo.pending</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>include</key>
-					<string>#italic</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#bold</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#url</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#tag</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#today</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#low</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#high</string>
-				</dict>
-				<dict>
-					<key>include</key>
-					<string>#critical</string>
-				</dict>
-			</array>
-		</dict>
+        <dict>
+            <key>captures</key>
+            <dict>
+                <key>1</key>
+                <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.bullet.pending.todo</string>
+                </dict>
+            </dict>
+            <key>begin</key>
+            <string>^\s*(-|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|(?:\*\s)?\[\s\])(?=(\s+(?:[^\@\n]|(?&lt;![ \t])\@)*)(?!([^\n]*)?(\@done|\@cancelled)[\s\(]))</string>
+            <key>end</key>
+            <string>$</string>
+            <key>name</key>
+            <string>meta.item.todo.pending</string>
+            <key>patterns</key>
+            <array>
+                <dict>
+                    <key>include</key>
+                    <string>#italic</string>
+                </dict>
+                <dict>
+                    <key>include</key>
+                    <string>#bold</string>
+                </dict>
+                <dict>
+                    <key>include</key>
+                    <string>#url</string>
+                </dict>
+                <dict>
+                    <key>include</key>
+                    <string>#tag</string>
+                </dict>
+                <dict>
+                    <key>include</key>
+                    <string>#today</string>
+                </dict>
+                <dict>
+                    <key>include</key>
+                    <string>#low</string>
+                </dict>
+                <dict>
+                    <key>include</key>
+                    <string>#high</string>
+                </dict>
+                <dict>
+                    <key>include</key>
+                    <string>#critical</string>
+                </dict>
+            </array>
+        </dict>
 
-		<dict>
-			<key>match</key>
-			<string>^＿+$</string>
-			<key>name</key>
-			<string>meta.punctuation.archive.todo</string>
-		</dict>
+        <dict>
+            <key>match</key>
+            <string>^＿+$</string>
+            <key>name</key>
+            <string>meta.punctuation.archive.todo</string>
+        </dict>
 
-		<dict>
-			<key>match</key>
-			<string>^\s*---.{3,5}---+$</string>
-			<key>name</key>
-			<string>meta.punctuation.separator.todo</string>
-		</dict>
+        <dict>
+            <key>match</key>
+            <string>^\s*---.{3,5}---+$</string>
+            <key>name</key>
+            <string>meta.punctuation.separator.todo</string>
+        </dict>
 
-	</array>
+    </array>
 
 
-	<key>repository</key>
-	<dict>
+    <key>repository</key>
+    <dict>
 
-		<key>bold</key>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.bold</string>
-				</dict>
-			</dict>
-			<key>begin</key>
-			<string>(?&lt;=\s|^)(\*\*|__)(?=\S)(?=(?!(?&lt;=\S)\1)[^\n]+(?&lt;=\S)\1)(?=[^\n]+(?&lt;=\S)(\1)((?![\w\d\n])|(?=\s|$)))</string>
-			<key>end</key>
-			<string>(?&lt;=\S)(\1)((?![\w\d\n])|(?=\s|$))</string>
-			<key>name</key>
-			<string>todo.bold</string>
-		</dict>
+        <key>bold</key>
+        <dict>
+            <key>captures</key>
+            <dict>
+                <key>1</key>
+                <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.bold</string>
+                </dict>
+            </dict>
+            <key>begin</key>
+            <string>(?&lt;=\s|^)(\*\*|__)(?=\S)(?=(?!(?&lt;=\S)\1)[^\n]+(?&lt;=\S)\1)(?=[^\n]+(?&lt;=\S)(\1)((?![\w\d\n])|(?=\s|$)))</string>
+            <key>end</key>
+            <string>(?&lt;=\S)(\1)((?![\w\d\n])|(?=\s|$))</string>
+            <key>name</key>
+            <string>todo.bold</string>
+        </dict>
 
-		<key>italic</key>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.italic</string>
-				</dict>
-			</dict>
-			<key>begin</key>
-			<string>(?&lt;=\s|^)(\*|_)(?=\S)(?=(\1\1|(?!(?&lt;=\S)\1).)++(?&lt;=\S)\1)(?=[^\n]+(?&lt;=\S)(\1)(?!\1|[\w\d]))</string>
-			<key>end</key>
-			<string>(?&lt;=\S)(\1)(?!\1|[\w\d])</string>
-			<key>name</key>
-			<string>todo.italic</string>
-		</dict>
+        <key>italic</key>
+        <dict>
+            <key>captures</key>
+            <dict>
+                <key>1</key>
+                <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.italic</string>
+                </dict>
+            </dict>
+            <key>begin</key>
+            <string>(?&lt;=\s|^)(\*|_)(?=\S)(?=(\1\1|(?!(?&lt;=\S)\1).)++(?&lt;=\S)\1)(?=[^\n]+(?&lt;=\S)(\1)(?!\1|[\w\d]))</string>
+            <key>end</key>
+            <string>(?&lt;=\S)(\1)(?!\1|[\w\d])</string>
+            <key>name</key>
+            <string>todo.italic</string>
+        </dict>
 
-		<key>url</key>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.url</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(?&lt;!\S)(&lt;)\w+?(?!\s)(\.|:)(?!\s)[^\n]+?(&gt;)</string>
-			<key>name</key>
-			<string>todo.url</string>
-		</dict>
+        <key>url</key>
+        <dict>
+            <key>captures</key>
+            <dict>
+                <key>1</key>
+                <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.url</string>
+                </dict>
+            </dict>
+            <key>match</key>
+            <string>(?&lt;!\S)(&lt;)\w+?(?!\s)(\.|:)(?!\s)[^\n]+?(&gt;)</string>
+            <key>name</key>
+            <string>todo.url</string>
+        </dict>
 
-		<key>tag</key>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=\s)\@(?!(high|today|critical|low|completed|done)[\s\(])[\w\d\.\(\)\-!? :\+]+[ \t]*</string>
-			<key>name</key>
-			<string>meta.tag.todo</string>
-		</dict>
+        <key>tag</key>
+        <dict>
+            <key>match</key>
+            <string>(?&lt;=\s)\@(?!(high|today|critical|low|completed|done)[\s\(])[\w\d\.\(\)\-!? :\+]+[ \t]*</string>
+            <key>name</key>
+            <string>meta.tag.todo</string>
+        </dict>
 
-		<key>today</key>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=\s)\@today|✭ᴛᴏᴅᴀʏ</string>
-			<key>name</key>
-			<string>string.other.tag.todo.today</string>
-		</dict>
+        <key>today</key>
+        <dict>
+            <key>match</key>
+            <string>(?&lt;=\s)\@today|✭ᴛᴏᴅᴀʏ</string>
+            <key>name</key>
+            <string>string.other.tag.todo.today</string>
+        </dict>
 
-		<key>low</key>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=\s)\@low|✭low</string>
-			<key>name</key>
-			<string>string.other.tag.todo.low</string>
-		</dict>
+        <key>low</key>
+        <dict>
+            <key>match</key>
+            <string>(?&lt;=\s)\@low|✭low</string>
+            <key>name</key>
+            <string>string.other.tag.todo.low</string>
+        </dict>
 
-		<key>high</key>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=\s)\@high|✭high</string>
-			<key>name</key>
-			<string>string.other.tag.todo.high</string>
-		</dict>
+        <key>high</key>
+        <dict>
+            <key>match</key>
+            <string>(?&lt;=\s)\@high|✭high</string>
+            <key>name</key>
+            <string>string.other.tag.todo.high</string>
+        </dict>
 
-		<key>critical</key>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=\s)\@critical|✭critical</string>
-			<key>name</key>
-			<string>string.other.tag.todo.critical</string>
-		</dict>
+        <key>critical</key>
+        <dict>
+            <key>match</key>
+            <string>(?&lt;=\s)\@critical|✭critical</string>
+            <key>name</key>
+            <string>string.other.tag.todo.critical</string>
+        </dict>
 
-	</dict>
-	<key>scopeName</key>
-	<string>text.todo</string>
-	<key>uuid</key>
-	<string>8fj2g29c-04ef-4330-9a6b-9b99aae1c418</string>
+    </dict>
+    <key>scopeName</key>
+    <string>text.todo</string>
+    <key>uuid</key>
+    <string>8fj2g29c-04ef-4330-9a6b-9b99aae1c418</string>
 </dict>
 </plist>

From 425f1ee2c01cc6f8a4b61b54984a7f432242193c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E7=AB=8B=E9=9D=92?= <jimmy.jinglv@gmail.com>
Date: Tue, 3 Sep 2019 17:46:27 +0800
Subject: [PATCH 4/4] Update PlainTasks.sublime-syntax

---
 PlainTasks.sublime-syntax | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/PlainTasks.sublime-syntax b/PlainTasks.sublime-syntax
index 8fc077d..9aeabd3 100644
--- a/PlainTasks.sublime-syntax
+++ b/PlainTasks.sublime-syntax
@@ -10,7 +10,7 @@ contexts:
   main:
     - match: '^\s*(\w+.*?:\s*?(\@[^\s]+(\(.*?\))?\s*?)*$\n?)'
       scope: keyword.control.header.todo
-    - match: '^\s*(?:(\+|✓|✔|☑|√|\*?\s?\[x\])(\s+(?:[^\@\n]|(?<!\s)\@|\@(?=\s))*)([^\n]*))|^\s*(?:(-)(\s+(?:[^\@]|(?<!\s)\@|\@(?=\s))*)(.*\@done(?=\s|\(|$)[^\n]*))'
+    - match: '^\s*(?:(\+|✓|✔|☑|√|(?:\*\s)?\[x\])(\s+(?:[^\@\n]|(?<!\s)\@|\@(?=\s))*)([^\n]*))|^\s*(?:(-)(\s+(?:[^\@]|(?<!\s)\@|\@(?=\s))*)(.*\@done(?=\s|\(|$)[^\n]*))'
       scope: meta.item.todo.completed
       captures:
         1: punctuation.definition.bullet.completed.todo
@@ -19,7 +19,7 @@ contexts:
         4: punctuation.definition.bullet.completed.todo
         5: comment.line.completed.todo
         6: meta.tag.todo.completed
-    - match: '^\s*(?:(✘|x|\*?\s?\[-\])(\s+(?:[^\@\n]|(?<!\s)\@|\@(?=\s))*)(.*))|^\s*(?:(-)(\s+(?:[^\@]|(?<!\s)\@|\@(?=\s))*)(.*\@cancelled(?=\s|\(|$)[^\n]*))'
+    - match: '^\s*(?:(✘|x|(?:\*\s)?\[-\])(\s+(?:[^\@\n]|(?<!\s)\@|\@(?=\s))*)(.*))|^\s*(?:(-)(\s+(?:[^\@]|(?<!\s)\@|\@(?=\s))*)(.*\@cancelled(?=\s|\(|$)[^\n]*))'
       scope: meta.item.todo.cancelled
       captures:
         1: punctuation.definition.bullet.cancelled.todo
@@ -28,7 +28,7 @@ contexts:
         4: punctuation.definition.bullet.cancelled.todo
         5: text.cancelled.todo
         6: meta.tag.todo.cancelled
-    - match: '^\s*(?!-|\+|✓|✔|√|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\*?\s?\[[\sx-]\]|＿|✘|(x\s+))(?=\S)'
+    - match: '^\s*(?!-|\+|✓|✔|√|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|(?:\*\s)?\[[\sx-]\]|＿|✘|(x\s+))(?=\S)'
       push:
         - meta_scope: notes.todo
         - match: $\n?
@@ -36,7 +36,7 @@ contexts:
         - include: italic
         - include: bold
         - include: url
-    - match: '^\s*(-|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|\*?\s?\[\s\])(?=(\s+(?:[^\@\n]|(?<![ \t])\@)*)(?!([^\n]*)?(\@done|\@cancelled)[\s\(]))'
+    - match: '^\s*(-|❍|❑|■|□|☐|▪|▫|–|—|≡|→|›|(?:\*\s)?\[\s\])(?=(\s+(?:[^\@\n]|(?<![ \t])\@)*)(?!([^\n]*)?(\@done|\@cancelled)[\s\(]))'
       captures:
         1: punctuation.definition.bullet.pending.todo
       push: