From: Hiroshi Shirosaki <h.shirosaki@gmail.com>
Date: Wed, 16 Mar 2016 00:24:18 +0000 (+0900)
Subject: Fix math syntax highlighting after end pattern
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/46cd31363f3dc0001374f736dcc1b5bbd735599f

Fix math syntax highlighting after end pattern

Add keepend to match end of the region.
Fix #271
---

diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index 0dbf49a..1614d7b 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -140,8 +140,8 @@ endif
 
 if get(g:, 'vim_markdown_math', 0)
   syn include @tex syntax/tex.vim
-  syn region mkdMath matchgroup=mkdDelimiter start="\\\@<!\$" end="\$" contains=@tex
-  syn region mkdMath matchgroup=mkdDelimiter start="\\\@<!\$\$" end="\$\$" contains=@tex
+  syn region mkdMath matchgroup=mkdDelimiter start="\\\@<!\$" end="\$" contains=@tex keepend
+  syn region mkdMath matchgroup=mkdDelimiter start="\\\@<!\$\$" end="\$\$" contains=@tex keepend
 endif
 
 syn cluster mkdNonListItem contains=@htmlTop,htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdInlineURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,mkdMath
diff --git a/test/syntax.vader b/test/syntax.vader
index af80fcd..481b8a1 100644
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -1,6 +1,7 @@
 Before:
   unlet! b:mkd_known_filetypes
   unlet! b:mkd_included_filetypes
+  unlet! g:vim_markdown_math
 
 Given markdown;
 a **b** c
@@ -620,6 +621,26 @@ Execute (math tex highlighting):
   AssertEqual SyntaxOf('sqrt'), 'texStatement'
   AssertEqual SyntaxOf('frac'), 'texStatement'
 
+Given markdown;
+$a b[$ c
+
+Execute (math ends with $):
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertEqual SyntaxOf('a'), 'mkdMath'
+  AssertEqual SyntaxOf('b'), 'mkdMath'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+
+Given markdown;
+$$a b[$$ c
+
+Execute (math ends with $$):
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertEqual SyntaxOf('a'), 'mkdMath'
+  AssertEqual SyntaxOf('b'), 'mkdMath'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+
 # YAML frontmatter
 
 Given markdown;