From: Hiroshi Shirosaki <h.shirosaki@gmail.com>
Date: Thu, 17 Mar 2016 04:15:53 +0000 (+0900)
Subject: Fix tex.vim syntax conceal
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/7c0578d6e84384c280a714b99d7ec08c3d45cda9?ds=sidebyside

Fix tex.vim syntax conceal

tex.vim syntax matches start and end delimiters so that syntax
conceal works properly.
Fix #272
---

diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index 3d8fc6f..114b92b 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 keepend
-  syn region mkdMath matchgroup=mkdDelimiter start="\\\@<!\$\$" end="\$\$" contains=@tex keepend
+  syn region mkdMath start="\\\@<!\$" end="\$" contains=@tex keepend
+  syn region mkdMath 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 481b8a1..c089741 100644
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -574,22 +574,22 @@ c $$y$$ d
 \$\$f\$\$
 
 Execute (math):
-  AssertNotEqual SyntaxOf('x'), 'mkdMath'
-  AssertNotEqual SyntaxOf('y'), 'mkdMath'
+  AssertNotEqual SyntaxOf('x')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('y')[0:2], 'tex'
   let g:vim_markdown_math=1
   syn off | syn on
-  AssertNotEqual SyntaxOf('a'), 'mkdMath'
-  AssertNotEqual SyntaxOf('b'), 'mkdMath'
-  AssertNotEqual SyntaxOf('c'), 'mkdMath'
-  AssertNotEqual SyntaxOf('d'), 'mkdMath'
-  AssertNotEqual SyntaxOf('e'), 'mkdMath'
-  AssertNotEqual SyntaxOf('f'), 'mkdMath'
-  AssertEqual SyntaxOf('x'), 'mkdMath'
-  AssertEqual SyntaxOf('y'), 'mkdMath'
+  AssertNotEqual SyntaxOf('a')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('b')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('d')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('e')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('f')[0:2], 'tex'
+  AssertEqual SyntaxOf('x')[0:2], 'tex'
+  AssertEqual SyntaxOf('y')[0:2], 'tex'
   let g:vim_markdown_math=0
   syn off | syn on
-  AssertNotEqual SyntaxOf('x'), 'mkdMath'
-  AssertNotEqual SyntaxOf('y'), 'mkdMath'
+  AssertNotEqual SyntaxOf('x')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('y')[0:2], 'tex'
 
 Given markdown;
 a
@@ -603,9 +603,9 @@ c
 Execute (multiline math):
   let g:vim_markdown_math=1
   syn off | syn on
-  AssertNotEqual SyntaxOf('a'), 'mkdMath'
-  AssertEqual SyntaxOf('b'), 'mkdMath'
-  AssertNotEqual SyntaxOf('c'), 'mkdMath'
+  AssertNotEqual SyntaxOf('a')[0:2], 'tex'
+  AssertEqual SyntaxOf('b')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
 
 Given markdown;
 $ \sqrt{a}{b} $
@@ -627,8 +627,8 @@ $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'
+  AssertEqual SyntaxOf('a')[0:2], 'tex'
+  AssertEqual SyntaxOf('b')[0:2], 'tex'
   AssertNotEqual SyntaxOf('c')[0:2], 'tex'
 
 Given markdown;
@@ -637,10 +637,52 @@ $$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'
+  AssertEqual SyntaxOf('a')[0:2], 'tex'
+  AssertEqual SyntaxOf('b')[0:2], 'tex'
   AssertNotEqual SyntaxOf('c')[0:2], 'tex'
 
+Given markdown;
+$(0 \le 1)$
+
+Execute (math conceal in $):
+  if has('conceal')
+    setlocal conceallevel=2
+    let g:vim_markdown_math=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1, '$'
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1, '\le'
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+    AssertEqual synconcealed(1, 8)[0], 0
+    AssertEqual synconcealed(1, 9)[0], 0
+    AssertEqual synconcealed(1, 10)[0], 0
+    AssertEqual synconcealed(1, 11)[0], 1, '$'
+    setlocal conceallevel=0
+  endif
+
+Given markdown;
+$$
+\omega
+0 \le 1
+$$
+
+Execute (math conceal in $$):
+  if has('conceal')
+    setlocal conceallevel=2
+    let g:vim_markdown_math=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1, '$$'
+    AssertEqual synconcealed(2, 1)[0], 1, '\omega'
+    AssertEqual synconcealed(3, 1)[0], 0, '0'
+    AssertEqual synconcealed(3, 3)[0], 1, '\le'
+    AssertEqual synconcealed(3, 7)[0], 0, '1'
+    AssertEqual synconcealed(4, 1)[0], 1, '$$'
+    setlocal conceallevel=0
+  endif
+
 # YAML frontmatter
 
 Given markdown;