From a5786589c3c49199828d63ea403238ca95531d0b Mon Sep 17 00:00:00 2001 From: Hiroshi Shirosaki Date: Wed, 6 Jan 2016 16:55:07 +0900 Subject: [PATCH] Move code to ftplugin from plugin. BufWinEnter fires in ftplugin on startup. --- ftplugin/markdown.vim | 72 +++++++++++++++++++++++++++++++++++++++++++ plugin/mkd.vim | 71 ------------------------------------------ 2 files changed, 72 insertions(+), 71 deletions(-) delete mode 100644 plugin/mkd.vim diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim index 7eb5784..74bbc54 100644 --- a/ftplugin/markdown.vim +++ b/ftplugin/markdown.vim @@ -553,3 +553,75 @@ command! -buffer Toc call s:Toc() command! -buffer Toch call s:Toc('horizontal') command! -buffer Tocv call s:Toc('vertical') command! -buffer Toct call s:Toc('tab') + +" Heavily based on 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 !empty(ft) && ft !~ '^\d*$' | let filetypes[ft] = 1 | endif + endfor + if !exists('b:mkd_known_filetypes') + let b:mkd_known_filetypes = {} + endif + if !a:force && (b:mkd_known_filetypes == filetypes || empty(filetypes)) + return + endif + + " Now we're ready to actually highlight the code blocks. + let startgroup = 'mkdCodeStart' + let endgroup = 'mkdCodeEnd' + for ft in keys(filetypes) + if a:force || !has_key(b:mkd_known_filetypes, ft) + + let group = 'mkdSnippet' . toupper(ft) + let include = s:syntax_include(ft) + let command = 'syntax region %s matchgroup=%s start="^\s*```%s$" matchgroup=%s end="\s*```$" keepend contains=%s%s' + execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') ? ' concealends' : '') + execute printf('syntax cluster mkdNonListItem add=%s', group) + + let b:mkd_known_filetypes[ft] = 1 + endif + endfor +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(force) + if &filetype == 'markdown' && line('$') > 1 + call s:Markdown_highlight_sources(a:force) + endif +endfunction + +augroup Mkd + autocmd! + au BufWinEnter * call s:Markdown_refresh_syntax(1) + au BufWritePost * call s:Markdown_refresh_syntax(0) + au InsertEnter,InsertLeave * call s:Markdown_refresh_syntax(0) + au CursorHold,CursorHoldI * call s:Markdown_refresh_syntax(0) +augroup END diff --git a/plugin/mkd.vim b/plugin/mkd.vim deleted file mode 100644 index 368485e..0000000 --- a/plugin/mkd.vim +++ /dev/null @@ -1,71 +0,0 @@ -" Heavily based on 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 !empty(ft) && ft !~ '^\d*$' | let filetypes[ft] = 1 | endif - endfor - if !exists('b:mkd_known_filetypes') - let b:mkd_known_filetypes = {} - endif - if !a:force && (b:mkd_known_filetypes == filetypes || empty(filetypes)) - return - endif - - " Now we're ready to actually highlight the code blocks. - let startgroup = 'mkdCodeStart' - let endgroup = 'mkdCodeEnd' - for ft in keys(filetypes) - if a:force || !has_key(b:mkd_known_filetypes, ft) - - let group = 'mkdSnippet' . toupper(ft) - let include = s:syntax_include(ft) - let command = 'syntax region %s matchgroup=%s start="^\s*```%s$" matchgroup=%s end="\s*```$" keepend contains=%s%s' - execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') ? ' concealends' : '') - execute printf('syntax cluster mkdNonListItem add=%s', group) - - let b:mkd_known_filetypes[ft] = 1 - endif - endfor -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(force) - if &filetype == 'markdown' && line('$') > 1 - call s:Markdown_highlight_sources(a:force) - endif -endfunction - -augroup Mkd - autocmd! - au BufReadPost * call s:Markdown_refresh_syntax(1) - au BufWritePost * call s:Markdown_refresh_syntax(0) - au InsertEnter,InsertLeave * call s:Markdown_refresh_syntax(0) - au CursorHold,CursorHoldI * call s:Markdown_refresh_syntax(0) -augroup END -- 2.39.5