commit cde47033540ae8251fd3e65421d7db1c3253d700
parent 0d8fbebcb898f7abed45ab33d5144e89ee20e0a5
Author: Rane Brown <rane.brown@gmail.com>
Date: Wed, 8 May 2019 20:55:56 -0600
Modify regex pattern for markdown links.
Fixes #240. Also fixes a related issue where markdown links where not
correctly highlighted in todo lists. Adds concealment for markdown links
in todo lists.
Diffstat:
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
@@ -786,7 +786,7 @@ function! s:populate_extra_markdown_vars()
\ mkd_syntax.rxWeblink1Separator. '__LinkUrl__'. mkd_syntax.rxWeblink1Ext.
\ '#__LinkAnchor__'. mkd_syntax.rxWeblink1Suffix
- let valid_chars = '[^\\]'
+ let valid_chars = '[^\\\]]'
let mkd_syntax.rxWeblink1Prefix = vimwiki#u#escape(mkd_syntax.rxWeblink1Prefix)
let mkd_syntax.rxWeblink1Suffix = vimwiki#u#escape(mkd_syntax.rxWeblink1Suffix)
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
@@ -3487,6 +3487,8 @@ Removed:~
point.
Fixed:~
+ * Issue #240: Fix regex pattern for markdown '[]()' links
+ * Issue #685: Error message for invalid user options fixed.
* Issue #481: Allow surrounding URLs with '<' '>'
* Issue #237: VimwikiRenameLink now works for Markdown syntax
* Issue #612: GVim menu displayed duplicate names.
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
@@ -234,7 +234,7 @@ execute 'syntax match VimwikiTodo /'. vimwiki#vars#get_global('rxTodo') .'/'
" Tables
-syntax match VimwikiTableRow /^\s*|.\+|\s*$/
+syntax match VimwikiTableRow /^\s*|.\+|\s*$/
\ transparent contains=VimwikiCellSeparator,
\ VimwikiLinkT,
\ VimwikiNoExistsLinkT,
@@ -249,7 +249,7 @@ syntax match VimwikiTableRow /^\s*|.\+|\s*$/
\ VimwikiCodeT,
\ VimwikiEqInT,
\ @Spell
-syntax match VimwikiCellSeparator
+syntax match VimwikiCellSeparator
\ /\%(|\)\|\%(-\@<=+\-\@=\)\|\%([|+]\@<=-\+\)/ contained
@@ -262,11 +262,11 @@ 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]
\ . vimwiki#vars#get_global('listsym_rejected')
- \ . ']\]\s.*$/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
+ \ . ']\]\s.*$/ contains=VimwikiNoExistsLink,VimwikiLink,VimwikiWeblink1,VimwikiWikiLink1,@Spell'
elseif vimwiki#vars#get_global('hl_cb_checked') == 2
execute 'syntax match VimwikiCheckBoxDone /'
\ . vimwiki#vars#get_syntaxlocal('rxListItemAndChildren')
- \ .'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
+ \ .'/ contains=VimwikiNoExistsLink,VimwikiLink,VimwikiWeblink1,VimwikiWikiLink1,@Spell'
endif
@@ -480,7 +480,7 @@ endif
" LaTeX
-call vimwiki#base#nested_syntax('tex',
+call vimwiki#base#nested_syntax('tex',
\ vimwiki#vars#get_syntaxlocal('rxMathStart').'\%(.*[[:blank:][:punct:]]\)\?'.
\ '\%([[:blank:][:punct:]].*\)\?',
\ vimwiki#vars#get_syntaxlocal('rxMathEnd'), 'VimwikiMath')