From: Hiroshi Shirosaki <h.shirosaki@gmail.com>
Date: Thu, 9 Mar 2017 05:14:38 +0000 (+0900)
Subject: Merge pull request #318 from 'memeplex/linkbracket'
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/2a39beda7de618cd5043f9defbfcd74de0fbc9eb?hp=3df7bff7c4d9310d6a588de22660b88f82ffa3bf

Merge pull request #318 from 'memeplex/linkbracket'

Fix mkdLink highlighting region
---

diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index 4602d66..13f856d 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -61,7 +61,7 @@ execute 'syn region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|\s\)\zs
 syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^"    end="\]"
 execute 'syn region mkdID matchgroup=mkdDelimiter    start="\["    end="\]" contained oneline' . s:conceal
 execute 'syn region mkdURL matchgroup=mkdDelimiter   start="("     end=")"  contained oneline' . s:conceal
-execute 'syn region mkdLink matchgroup=mkdDelimiter  start="\\\@<!!\?\[" end="\n\{-,1}[^]]\{-}\zs\]\ze[[(]" contains=@mkdNonListItem,@Spell nextgroup=mkdURL,mkdID skipwhite oneline' . s:concealends
+execute 'syn region mkdLink matchgroup=mkdDelimiter  start="\\\@<!!\?\[\ze[^]\n]*\n\?[^]\n]*\][[(]" end="\]" contains=@mkdNonListItem,@Spell nextgroup=mkdURL,mkdID skipwhite' . s:concealends
 
 " Autolink without angle brackets.
 " mkd  inline links:      protocol     optional  user:pass@  sub/domain                    .com, .co.uk, etc         optional port   path/querystring/hash fragment
diff --git a/test/syntax.vader b/test/syntax.vader
index b08a9a0..284e60f 100644
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -413,6 +413,15 @@ Execute (link text with newline):
   AssertEqual SyntaxOf('b'), 'mkdLink'
   AssertEqual SyntaxOf('c'), 'mkdURL'
 
+Given markdown;
+[a] b [c](d)
+
+Execute (link text with newline):
+  AssertNotEqual SyntaxOf('a'), 'mkdLink'
+  AssertNotEqual SyntaxOf('b'), 'mkdLink'
+  AssertEqual SyntaxOf('c'), 'mkdLink'
+  AssertEqual SyntaxOf('d'), 'mkdURL'
+
 Given markdown;
 (a)