]> 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:

Syntax highlighting of code blocks
authorMatt Ellis <m.t.ellis@gmail.com>
Mon, 16 Jun 2014 16:02:27 +0000 (17:02 +0100)
committerHiroshi Shirosaki <h.shirosaki@gmail.com>
Wed, 13 Jan 2016 16:11:56 +0000 (01:11 +0900)
Code taken from https://github.com/xolox/vim-notes

Has to be in plugin/mkd.vim, or the initial BufReadPost event doesn’t
get fired. I don’t know why.

plugin/mkd.vim [new file with mode: 0644]
syntax/markdown.vim

diff --git a/plugin/mkd.vim b/plugin/mkd.vim
new file mode 100644 (file)
index 0000000..50bf9a7
--- /dev/null
@@ -0,0 +1,68 @@
+" Completely stolen from vim-notes - http://peterodding.com/code/vim/notes/
+function! s:Markdown_highlight_sources(force)
+    " Syntax highlight source code embedded in notes.
+    " Look for code blocks in the current file
+    let filetypes = {}
+    for line in getline(1, '$')
+        let ft = matchstr(line, '```\zs\w\+\>')
+        if ft !~ '^\d*$' | let filetypes[ft] = 1 | endif
+    endfor
+    " Don't refresh the highlighting if nothing has changed.
+    if !a:force && exists('b:mkd_previous_sources') && b:mkd_previous_sources == filetypes
+        return
+    else
+        let b:mkd_previous_sources = filetypes
+    endif
+    " Now we're ready to actually highlight the code blocks.
+    if !empty(filetypes)
+        let startgroup = 'mkdCodeStart'
+        let endgroup = 'mkdCodeEnd'
+        for ft in keys(filetypes)
+            let group = 'mkdSnippet' . toupper(ft)
+            let include = s:syntax_include(ft)
+            let command = 'syntax region %s matchgroup=%s start="^```%s$" matchgroup=%s end="^```$" keepend contains=%s%s'
+            execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') ? ' concealends' : '')
+            execute printf('syntax cluster mkdNonListItem add=%s', group)
+        endfor
+    endif
+endfunction
+
+function! s:syntax_include(filetype)
+    " Include the syntax highlighting of another {filetype}.
+    let grouplistname = '@' . toupper(a:filetype)
+    " Unset the name of the current syntax while including the other syntax
+    " because some syntax scripts do nothing when "b:current_syntax" is set
+    if exists('b:current_syntax')
+        let syntax_save = b:current_syntax
+        unlet b:current_syntax
+    endif
+    try
+        execute 'syntax include' grouplistname 'syntax/' . a:filetype . '.vim'
+        execute 'syntax include' grouplistname 'after/syntax/' . a:filetype . '.vim'
+    catch /E484/
+        " Ignore missing scripts
+    endtry
+    " Restore the name of the current syntax
+    if exists('syntax_save')
+        let b:current_syntax = syntax_save
+    elseif exists('b:current_syntax')
+        unlet b:current_syntax
+    endif
+    return grouplistname
+endfunction
+
+
+function! s:Markdown_refresh_syntax()
+    if &filetype == 'mkd' && line('$') > 1
+        call s:Markdown_highlight_sources(0)
+    endif
+endfunction
+
+augroup Mkd
+    autocmd!
+    au BufReadPost * call s:Markdown_refresh_syntax()
+    au BufReadPost,BufWritePost * call s:Markdown_refresh_syntax()
+    au InsertEnter,InsertLeave * call s:Markdown_refresh_syntax()
+    au CursorHold,CursorHoldI * call s:Markdown_refresh_syntax()
+augroup END
+
index 035199b078d7ecef824a136f7eaebbfab5c53805..7244cb5afe9948d5e4383856dc51a915c8026f9e 100644 (file)
@@ -75,6 +75,8 @@ 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=/^\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 match  mkdCodeStart    /^```\w*$/
+syn match  mkdCodeEnd      /^```$/
 syn region mkdCode         start="<pre[^>]*>"              end="</pre>"
 syn region mkdCode         start="<code[^>]*>"             end="</code>"
 syn region mkdFootnote     start="\[^"                     end="\]"
 syn region mkdCode         start="<pre[^>]*>"              end="</pre>"
 syn region mkdCode         start="<code[^>]*>"             end="</code>"
 syn region mkdFootnote     start="\[^"                     end="\]"
@@ -110,7 +112,7 @@ if get(g:, 'vim_markdown_math', 0)
   syn region mkdMath matchgroup=mkdDelimiter start="\\\@<!\$\$" end="\$\$" contains=@tex
 endif
 
   syn region mkdMath matchgroup=mkdDelimiter start="\\\@<!\$\$" end="\$\$" contains=@tex
 endif
 
-syn cluster mkdNonListItem contains=@htmlTop,htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdInlineURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdListItem,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,mkdMath
+syn cluster mkdNonListItem contains=@htmlTop,htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdInlineURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdListItem,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,mkdMath,mkdCodeStart,mkdCodeEnd
 
 "highlighting for Markdown groups
 HtmlHiLink mkdString        String
 
 "highlighting for Markdown groups
 HtmlHiLink mkdString        String