Merge pull request #7 from gmateo/adding-InProgress-state

Add InProgress state
samsonw · Jun 24, 2015 · 42b7eda · 42b7eda
2 parents c6626a9 + 0293220
commit 42b7eda
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/SublimeTask.py b/SublimeTask.py
@@ -4,7 +4,6 @@
 import re
 import sublime_plugin
 
-
 class TaskCommand(sublime_plugin.TextCommand):
     def run(self, edit):
         for region in self.view.sel():
@@ -20,10 +19,15 @@ def process(self, line):
         # p = re.compile('^(\s*)([-✓])(.*)')
         # http://docs.python.org/howto/unicode
         line = line.encode(self.current_encoding())
-        p = re.compile(ur'^(\s*)(-|\xe2\x9c\x93)(.*)', re.UNICODE)
+        p = re.compile(ur'^(\s*)(-|~|\xe2\x9c\x93)(.*)', re.UNICODE)
         m = p.match(line)
         if m:
-            symbol = '✓' if m.group(2) == '-' else '-'
+            symbol = '-' 
+            if m.group(2) == '-': 
+               symbol = '~' 
+            elif m.group(2) == '~': 
+               symbol = '✓'
+
             result = '%(leading_whitespace)s%(symbol)s%(content)s' % {'leading_whitespace': m.group(1), 'symbol': symbol, 'content': m.group(3)}
             return result.decode(self.current_encoding())
         else:

diff --git a/Task.JSON-tmLanguage b/Task.JSON-tmLanguage
@@ -11,15 +11,19 @@
         "match": "[\\[\\]]",
         "comment": "[ and ]"
       },
-      {  "name": "variable",
-         "match": "^[^-✓]*:\\s+",
+      {  "name": "support.function",
+         "match": "^[^-~✓]*:\\s+",
          "comment": "Task Title"
       },
-      {  "name": "string",
+      {  "name": "variable.parameter",
+         "match": "^\\s*~[^\\[\\]]*",
+         "comment": "Started Tasks"
+      },
+      {  "name": "entity.other.attribute-name",
          "match": "^\\s*✓[^\\[\\]]*",
          "comment": "Completed Tasks"
       },
-      {  "name": "constant",
+      {  "name": "keyword",
          "match": "^\\s*-[^\\[\\]]*",
          "comment": "Action Items"
       },

diff --git a/Task.tmLanguage b/Task.tmLanguage
@@ -34,25 +34,33 @@
 			<key>comment</key>
 			<string>Task Title</string>
 			<key>match</key>
-			<string>^[^-✓]*:\s+</string>
+			<string>^[^-~✓]*:\s+</string>
 			<key>name</key>
-			<string>variable</string>
+			<string>support.function</string>
+		</dict>
+		<dict>
+			<key>comment</key>
+			<string>Started Tasks</string>
+			<key>match</key>
+			<string>^\s*~[^\[\]]*</string>
+			<key>name</key>
+			<string>variable.parameter</string>
 		</dict>
 		<dict>
 			<key>comment</key>
 			<string>Completed Tasks</string>
 			<key>match</key>
 			<string>^\s*✓[^\[\]]*</string>
 			<key>name</key>
-			<string>string</string>
+			<string>entity.other.attribute-name</string>
 		</dict>
 		<dict>
 			<key>comment</key>
 			<string>Action Items</string>
 			<key>match</key>
 			<string>^\s*-[^\[\]]*</string>
 			<key>name</key>
-			<string>constant</string>
+			<string>keyword</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -68,4 +76,4 @@
 	<key>uuid</key>
 	<string>47fcd6b9-58c4-4518-855b-a7e16298177c</string>
 </dict>
-</plist>
+</plist>