vimwiki

commit fd8832cfa1624267a8156b055de24c47ec966612
parent 61d93fde7ffc4298e606871b09d72077863afe87
Author: Rane Brown <rane.brown@gmail.com>
Date:   Fri,  3 May 2019 21:19:05 -0600

Fixes #237 VimwikiRenameLink now works for markdown syntax.

Diffstat:
M
autoload/vimwiki/vars.vim
 | 
29
+++++++++++++++++------------
M
doc/vimwiki.txt
 | 
1
+

2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
@@ -713,18 +713,6 @@ function! s:populate_extra_markdown_vars()
   " [DESCRIPTION][URL]
   let mkd_syntax.WikiLink1Template2 = wikilink_md_prefix. '__LinkDescription__'.
         \ wikilink_md_separator. '__LinkUrl__'. wikilink_md_suffix
-  let mkd_syntax.WikiLinkMatchUrlTemplate .=
-        \ '\|' .
-        \ mkd_syntax.rx_wikilink_md_prefix .
-        \ '.*' .
-        \ rx_wikilink_md_separator .
-        \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
-        \ mkd_syntax.rx_wikilink_md_suffix .
-        \ '\|' .
-        \ mkd_syntax.rx_wikilink_md_prefix .
-        \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
-        \ rx_wikilink_md_separator .
-        \ mkd_syntax.rx_wikilink_md_suffix
 
   let valid_chars = '[^\\\[\]]'
   let mkd_syntax.rxWikiLink1Url = valid_chars.'\{-}'
@@ -801,6 +789,23 @@ function! s:populate_extra_markdown_vars()
   let mkd_syntax.rxWeblink1Separator = vimwiki#u#escape(mkd_syntax.rxWeblink1Separator)
   let mkd_syntax.rxWeblink1Url = valid_chars.'\{-}'
   let mkd_syntax.rxWeblink1Descr = valid_chars.'\{-}'
+  let mkd_syntax.WikiLinkMatchUrlTemplate =
+        \ mkd_syntax.rx_wikilink_md_prefix .
+        \ '.*' .
+        \ rx_wikilink_md_separator .
+        \ '\zs__LinkUrl__\ze\%(#.*\)\?\%('.vimwiki#vars#get_wikilocal('ext').'\)\?'.
+        \ mkd_syntax.rx_wikilink_md_suffix .
+        \ '\|' .
+        \ mkd_syntax.rx_wikilink_md_prefix .
+        \ '\zs__LinkUrl__\ze\%(#.*\)\?\%('.vimwiki#vars#get_wikilocal('ext').'\)\?'.
+        \ rx_wikilink_md_separator .
+        \ mkd_syntax.rx_wikilink_md_suffix .
+        \ '\|' .
+        \ mkd_syntax.rxWeblink1Prefix.
+        \ '.*' .
+        \ mkd_syntax.rxWeblink1Separator.
+        \ '\zs__LinkUrl__\ze\%(#.*\)\?\%('.vimwiki#vars#get_wikilocal('ext').'\)\?'.
+        \ mkd_syntax.rxWeblink1Suffix
 
   " 1. [DESCRIPTION](URL)
   " 1a) match [DESCRIPTION](URL)
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
@@ -3487,6 +3487,7 @@ Removed:~
       point.
 
 Fixed:~
+    * Issue #237: VimwikiRenameLink for Markdown syntax
     * Issue #612: GVim menu displayed duplicate names.
     * Issue #456: Omnicompletion of wikilinks under Windows. Note: this should
       be considered a temporary fix until #478 is closed.