Merge pull request #158 from nybblr/nybblr/add-tilde-code-blocks

Add tilde-fenced code blocks.

diff --git a/syntax/mkd.vim b/syntax/mkd.vim
index 011f95ed5ac71cdc838cdd2e0853dfbbdfdf0743..60a675ddad0b6a542d2b8c3d604991eea6ea411e 100644 (file)
--- a/syntax/mkd.vim
+++ b/syntax/mkd.vim
@@ -70,6 +70,8 @@ syn region mkdBlockquote   start=/^\s*>/                   end=/$/ contains=mkdL
 syn region mkdCode         start=/\(\([^\\]\|^\)\\\)\@<!`/ end=/\(\([^\\]\|^\)\\\)\@<!`/
 syn region mkdCode         start=/\s*``[^`]*/              end=/[^`]*``\s*/
 syn region mkdCode         start=/^\s*```\s*[0-9A-Za-z_-]*\s*$/          end=/^\s*```\s*$/
+syn region mkdCode         start=/\s*\~\~[^\~]*/              end=/[^\~]*\~\~\s*/
+syn region mkdCode         start=/^\s*\~\~\~\s*[0-9A-Za-z_-]*\s*$/          end=/^\s*\~\~\~\s*$/
 syn region mkdCode         start="<pre[^>]*>"              end="</pre>"
 syn region mkdCode         start="<code[^>]*>"             end="</code>"
 syn region mkdFootnote     start="\[^"                     end="\]"

diff --git a/test/syntax.vader b/test/syntax.vader
index b06ddf0e674f1005fe406f7e9377850dd49aa017..c3dc02d0a74e37fd41b92af1606478fc5cabf2c1 100644 (file)
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -87,6 +87,24 @@ Given mkd;
 Execute (autolinks can be backslash escaped):
   AssertNotEqual SyntaxOf('<'), 'mkdDelimiter'
 
+# Code Blocks
+
+Given mkd;
+~~~
+code
+~~~
+
+Execute (code blocks can be fenced with tildes):
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given mkd;
+~~~ruby
+code
+~~~
+
+Execute (code blocks can have a language specifier):
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
 # Math
 
 Given mkd;