syntax: Further syntax improvements

This commit is contained in:
Tomas Babej 2015-04-09 20:05:44 +02:00
parent 5440d21e83
commit 7f146c55cb
2 changed files with 17 additions and 6 deletions

View file

@ -1,11 +1,12 @@
" Detect if conceal feature is available
let s:conceal = exists("+conceallevel") ? ' conceal': ''
syntax match TaskWikiTask /\s*\* \[.\]\s.*$/
syntax match TaskWikiTask contains=VimwikiListTodo /\s*\* \[.\]\s.*$/
" Conceal the UUID
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
execute 'syn match TaskWikiTaskUuid 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 TaskWikiTaskUuid containedin=TaskWikiTask /\v#([A-Z]:)?[0-9a-fA-F]{8}$/'.s:conceal
highlight link TaskWikiTaskUuid Comment
" Conceal header definitions
for s:i in range(1,6)
@ -14,9 +15,12 @@ endfor
" Define active and deleted task regions
" Will be colored dynamically by Meta().source_tw_colors()
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.*$/
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[^#]*/
syntax match TaskWikiTaskPriorityLow containedin=TaskWikiTask /\(\*\s\[.\]\s\)\@<=[^#]* ! [^#]*/
syntax match TaskWikiTaskPriorityMedum containedin=TaskWikiTask /\(\*\s\[.\]\s\)\@<=[^#]* !! [^#]*/
syntax match TaskWikiTaskPriorityHigh containedin=TaskWikiTask /\(\*\s\[.\]\s\)\@<=[^#]* !!! [^#]*/
" Set concealed parts as really concealed in normal mode, and with cursor over
setlocal conceallevel=3

View file

@ -264,12 +264,19 @@ class Meta(object):
'TaskWikiTaskActive': 'color.active',
'TaskWikiTaskCompleted': 'color.completed',
'TaskWikiTaskDeleted': 'color.deleted',
'TaskWikiTaskPriorityLow': 'color.uda.priority.L',
'TaskWikiTaskPriorityMedium': 'color.uda.priority.M',
'TaskWikiTaskPriorityHigh': 'color.uda.priority.H',
}
links = {
'TaskWikiTaskActive': 'Type',
'TaskWikiTaskCompleted': 'Comment',
'TaskWikiTaskDeleted': 'Error',
'TaskWikiTaskPriorityLow': 'Constant',
'TaskWikiTaskPriorityMedium': 'Statement',
'TaskWikiTaskPriorityHigh': 'PreProc',
}
tw = cache.get_relevant_tw()