From 13271541a64629942f13704ae98dd4d580fe0e33 Mon Sep 17 00:00:00 2001 From: EinfachToll Date: Tue, 3 Apr 2018 19:45:19 +0200 Subject: [PATCH] Highlight done and rejected list item the same way --- autoload/vimwiki/vars.vim | 10 ++++++---- syntax/vimwiki.vim | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim index 1a9968f..b1836a2 100644 --- a/autoload/vimwiki/vars.vim +++ b/autoload/vimwiki/vars.vim @@ -399,14 +399,16 @@ function! vimwiki#vars#populate_syntax_vars(syntax) \ . vimwiki#vars#get_global('listsym_rejected').']\)\]\s\)\?' if g:vimwiki_syntax_variables[a:syntax].recurring_bullets let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren = - \ '^\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\s\+\[' - \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[-1].'\]\s.*\%(\n\%(\1\%(' + \ '^\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\s\+\[[' + \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[-1] + \ . vimwiki#vars#get_global('listsym_rejected') . ']\]\s.*\%(\n\%(\1\%(' \ .g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\).*\|^$\|\s.*\)\)*' else let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren = \ '^\(\s*\)\%('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\|' - \ . g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\s\+\[' - \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[-1].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*' + \ . g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\s\+\[[' + \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[-1] + \ . vimwiki#vars#get_global('listsym_rejected') . ']\]\s.*\%(\n\%(\1\s.*\|^$\)\)*' endif " 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L)) diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim index 9d8ba16..69b83c5 100644 --- a/syntax/vimwiki.vim +++ b/syntax/vimwiki.vim @@ -236,10 +236,13 @@ execute 'syntax match VimwikiListTodo /'.vimwiki#vars#get_syntaxlocal('rxListIte if vimwiki#vars#get_global('hl_cb_checked') == 1 execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB') - \ .'\s*\['.vimwiki#vars#get_syntaxlocal('listsyms_list')[-1] - \ .'\]\s.*$/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell' + \ . '\s*\[['.vimwiki#vars#get_syntaxlocal('listsyms_list')[-1] + \ . vimwiki#vars#get_global('listsym_rejected') + \ . ']\]\s.*$/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell' elseif vimwiki#vars#get_global('hl_cb_checked') == 2 - execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemAndChildren').'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell' + execute 'syntax match VimwikiCheckBoxDone /' + \ . vimwiki#vars#get_syntaxlocal('rxListItemAndChildren') + \ .'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell' endif