]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix math syntax highlighting after end pattern
authorHiroshi Shirosaki <h.shirosaki@gmail.com>
Wed, 16 Mar 2016 00:24:18 +0000 (09:24 +0900)
committerHiroshi Shirosaki <h.shirosaki@gmail.com>
Wed, 16 Mar 2016 00:24:18 +0000 (09:24 +0900)
Add keepend to match end of the region.
Fix #271

syntax/markdown.vim
test/syntax.vader

index 0dbf49a228f57284815fefee34984f550b9158dd..1614d7bd1ac21be991b9796e93f165a385894d61 100644 (file)
@@ -140,8 +140,8 @@ endif
 
 if get(g:, 'vim_markdown_math', 0)
   syn include @tex syntax/tex.vim
 
 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
 endif
 
 syn cluster mkdNonListItem contains=@htmlTop,htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdInlineURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,mkdMath
index af80fcd2d87545fc6e5fc47af0dbe749719d2011..481b8a1f21473a42da4219ff6e234b4461e09a4e 100644 (file)
@@ -1,6 +1,7 @@
 Before:
   unlet! b:mkd_known_filetypes
   unlet! b:mkd_included_filetypes
 Before:
   unlet! b:mkd_known_filetypes
   unlet! b:mkd_included_filetypes
+  unlet! g:vim_markdown_math
 
 Given markdown;
 a **b** c
 
 Given markdown;
 a **b** c
@@ -620,6 +621,26 @@ Execute (math tex highlighting):
   AssertEqual SyntaxOf('sqrt'), 'texStatement'
   AssertEqual SyntaxOf('frac'), 'texStatement'
 
   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;
 # YAML frontmatter
 
 Given markdown;