From: Hiroshi Shirosaki <h.shirosaki@gmail.com>
Date: Fri, 12 Apr 2019 01:53:44 +0000 (+0900)
Subject: Merge pull request #428 from yous/code-quotes
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/f71f25b87df3bd2a5315fdf432f0de3c35434345?hp=a15334cac67237835e62c9dd1470f6162769779f

Merge pull request #428 from yous/code-quotes

Fix double code quotes with backslashes
---

diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index 7134f38..d8d34ea 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -99,7 +99,7 @@ syn match  htmlH2       /^.\+\n-\+$/ contains=mkdLink,mkdInlineURL,@Spell
 syn match  mkdLineBreak    /  \+$/
 syn region mkdBlockquote   start=/^\s*>/                   end=/$/ contains=mkdLink,mkdInlineURL,mkdLineBreak,@Spell
 execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!`/                     end=/`/'  . s:concealcode
-execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!``/ skip=/[^`]`[^`]/   end=/\(\([^\\]\|^\)\\\)\@<!``/' . s:concealcode
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!``/ skip=/[^`]`[^`]/   end=/``/' . s:concealcode
 execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/^\s*\z(`\{3,}\)[^`]*$/                       end=/^\s*\z1`*\s*$/'            . s:concealcode
 execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!\~\~/  end=/\(\([^\\]\|^\)\\\)\@<!\~\~/'               . s:concealcode
 execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/^\s*\z(\~\{3,}\)\s*[0-9A-Za-z_+-]*\s*$/      end=/^\s*\z1\~*\s*$/'           . s:concealcode
diff --git a/test/syntax.vader b/test/syntax.vader
index 3baa41f..5ce94fc 100644
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -899,6 +899,15 @@ Execute (code quotes not escaped ending with backslash):
   AssertEqual SyntaxOf('c\'), 'mkdCode'
   AssertNotEqual SyntaxOf('d'), 'mkdCode'
 
+Given markdown;
+``a\`` b ``c`\`1`` d
+
+Execute (double code quotes not escaped ending with backslash):
+  AssertEqual SyntaxOf('a\'), 'mkdCode'
+  AssertNotEqual SyntaxOf('b'), 'mkdCode'
+  AssertEqual SyntaxOf('c`\\`1'), 'mkdCode'
+  AssertNotEqual SyntaxOf('d'), 'mkdCode'
+
 # Math
 
 Given markdown;