From 5440d21e83fd2880043e25ddd52a90e0e8b0dd18 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomasbabej@gmail.com>
Date: Wed, 8 Apr 2015 22:14:41 +0200
Subject: [PATCH] syntax: Improve color handling

---
 after/syntax/vimwiki.vim | 11 +++++++----
 taskwiki/taskwiki.py     | 12 ++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/after/syntax/vimwiki.vim b/after/syntax/vimwiki.vim
index 86ce524..8021cf2 100644
--- a/after/syntax/vimwiki.vim
+++ b/after/syntax/vimwiki.vim
@@ -1,9 +1,11 @@
 " Detect if conceal feature is available
 let s:conceal = exists("+conceallevel") ? ' conceal': ''
 
+syntax match TaskWikiTask /\s*\* \[.\]\s.*$/
+
 " Conceal the UUID
-execute 'syn match VimwikiTaskUuid containedin=VimwikiCheckBoxDone,VimwikiCheckBoxActive,VimwikiCheckBoxDeleted /\v#([A-Z]:)?[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/'.s:conceal
-execute 'syn match VimwikiTaskUuid containedin=VimwikiCheckBoxDone,VimwikiCheckBoxActive,VimwikiCheckBoxDeleted /\v#([A-Z]:)?[0-9a-fA-F]{8}$/'.s:conceal
+execute 'syn match VimwikiTaskUuid containedin=TaskWikiTask /\v#([A-Z]:)?[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/'.s:conceal
+execute 'syn match VimwikiTaskUuid containedin=TaskWikiTask /\v#([A-Z]:)?[0-9a-fA-F]{8}$/'.s:conceal
 
 " Conceal header definitions
 for s:i in range(1,6)
@@ -12,8 +14,9 @@ endfor
 
 " Define active and deleted task regions
 " Will be colored dynamically by Meta().source_tw_colors()
-syntax match VimwikiCheckBoxActive /\s*\*\s*\[S\]\s.*$/
-syntax match VimwikiCheckBoxDeleted /\s*\*\s*\[D\]\s.*$/
+syntax match TaskWikiTaskActive containedin=TaskWikiTask /\s*\*\s\[S\]\s.*$/
+syntax match TaskWikiTaskCompleted containedin=TaskWikiTask /\s*\*\s\[X\]\s.*$/
+syntax match TaskWikiTaskDeleted containedin=TaskWikiTask /\s*\*\s*\[D\]\s.*$/
 
 " Set concealed parts as really concealed in normal mode, and with cursor over
 setlocal conceallevel=3
diff --git a/taskwiki/taskwiki.py b/taskwiki/taskwiki.py
index 0b5e798..c95cf07 100644
--- a/taskwiki/taskwiki.py
+++ b/taskwiki/taskwiki.py
@@ -261,15 +261,15 @@ class Meta(object):
 
     def source_tw_colors(self):
         colors = {
-            'VimwikiCheckBoxActive': 'color.active',
-            'VimwikiCheckBoxDone': 'color.completed',
-            'VimwikiCheckBoxDeleted': 'color.active',
+            'TaskWikiTaskActive': 'color.active',
+            'TaskWikiTaskCompleted': 'color.completed',
+            'TaskWikiTaskDeleted': 'color.deleted',
         }
 
         links = {
-            'VimwikiCheckBoxActive': 'Type',
-            'VimwikiCheckBoxDone': 'Comment',
-            'VimwikiCheckBoxDeleted': 'Error',
+            'TaskWikiTaskActive': 'Type',
+            'TaskWikiTaskCompleted': 'Comment',
+            'TaskWikiTaskDeleted': 'Error',
         }
 
         tw = cache.get_relevant_tw()