X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/6764c57a44362da5ce0bf142f996c45e63b0a581..6df8cb9ec2483fdfc7e57daa083b8cf2be05ffee:/after/ftplugin/markdown.vim diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim index d965a71..89d1c38 100644 --- a/after/ftplugin/markdown.vim +++ b/after/ftplugin/markdown.vim @@ -1,3 +1,4 @@ +" vim: ts=4: " folding for Markdown headers, both styles (atx- and setex-) " http://daringfireball.net/projects/markdown/syntax#header " @@ -7,24 +8,73 @@ " original version from Steve Losh's gist: https://gist.github.com/1038710 function! s:is_mkdCode(lnum) - return synIDattr(synID(a:lnum, 1, 0), 'name') == 'mkdCode' + let name = synIDattr(synID(a:lnum, 1, 0), 'name') + return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)') endfunction if get(g:, "vim_markdown_folding_style_pythonic", 0) function! Foldexpr_markdown(lnum) + let l1 = getline(a:lnum) + "~~~~~ keep track of fenced code blocks ~~~~~ + "If we hit a code block fence + if l1 =~ '````*' || l1 =~ '\~\~\~\~*' + " toggle the variable that says if we're in a code block + if b:fenced_block == 0 + let b:fenced_block = 1 + elseif b:fenced_block == 1 + let b:fenced_block = 0 + endif + " else, if we're caring about front matter + elseif g:vim_markdown_frontmatter == 1 + " if we're in front matter and not on line 1 + if b:front_matter == 1 && a:lnum > 2 + let l0 = getline(a:lnum-1) + " if the previous line fenced front matter + if l0 == '---' + " we must not be in front matter + let b:front_matter = 0 + endif + " else, if we're on line one + elseif a:lnum == 1 + " if we hit a front matter fence + if l1 == '---' + " we're in the front matter + let b:front_matter = 1 + endif + endif + endif + + " if we're in a code block or front matter + if b:fenced_block == 1 || b:front_matter == 1 + if a:lnum == 1 + " fold any 'preamble' + return '>1' + else + " keep previous foldlevel + return '=' + endif + endif + let l2 = getline(a:lnum+1) - if l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1) + " if the next line starts with two or more '=' + " and is not code + if l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1) " next line is underlined (level 1) return '>0' + " else, if the nex line starts with two or more '-' + " and is not code elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1) " next line is underlined (level 2) return '>1' endif - let l1 = getline(a:lnum) + "if we're on a non-code line starting with a pound sign if l1 =~ '^#' && !s:is_mkdCode(a:lnum) - " current line starts with hashes - return '>'.(matchend(l1, '^#\+') - 1) + " set the fold level to the number of hashes -1 + " return '>'.(matchend(l1, '^#\+') - 1) + " set the fold level to the number of hashes + return '>'.(matchend(l1, '^#\+')) + " else, if we're on line 1 elseif a:lnum == 1 " fold any 'preamble' return '>1' @@ -45,30 +95,68 @@ if get(g:, "vim_markdown_folding_style_pythonic", 0) let fillcharcount = windowwidth - len(line) - len(foldedlinecount) + 1 return line . ' ' . repeat("-", fillcharcount) . ' ' . foldedlinecount endfunction -else +else " vim_markdown_folding_style_pythonic == 1 function! Foldexpr_markdown(lnum) + if (a:lnum == 1) + let l0 = '' + else + let l0 = getline(a:lnum-1) + endif + + " keep track of fenced code blocks + if l0 =~ '````*' || l0 =~ '\~\~\~\~*' + if b:fenced_block == 0 + let b:fenced_block = 1 + elseif b:fenced_block == 1 + let b:fenced_block = 0 + endif + elseif g:vim_markdown_frontmatter == 1 + if b:front_matter == 1 + if l0 == '---' + let b:front_matter = 0 + endif + elseif a:lnum == 2 + if l0 == '---' + let b:front_matter = 1 + endif + endif + endif + + if b:fenced_block == 1 || b:front_matter == 1 + " keep previous foldlevel + return '=' + endif + let l2 = getline(a:lnum+1) if l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1) " next line is underlined (level 1) return '>1' elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1) " next line is underlined (level 2) - return '>2' + if s:vim_markdown_folding_level >= 2 + return '>1' + else + return '>2' + endif endif let l1 = getline(a:lnum) if l1 =~ '^#' && !s:is_mkdCode(a:lnum) - " don't include the section title in the fold - return '-1' + " fold level according to option + if s:vim_markdown_folding_level == 1 || matchend(l1, '^#\+') > s:vim_markdown_folding_level + if a:lnum == line('$') + return matchend(l1, '^#\+') - 1 + else + return -1 + endif + else + " headers are not folded + return 0 + endif endif - if (a:lnum == 1) - let l0 = '' - else - let l0 = getline(a:lnum-1) - endif if l0 =~ '^#' && !s:is_mkdCode(a:lnum-1) - " current line starts with hashes + " previous line starts with hashes return '>'.matchend(l0, '^#\+') else " keep previous foldlevel @@ -77,10 +165,25 @@ else endfunction endif -if !get(g:, "vim_markdown_folding_disabled", 0) - setlocal foldexpr=Foldexpr_markdown(v:lnum) - setlocal foldmethod=expr - if get(g:, "vim_markdown_folding_style_pythonic", 0) - setlocal foldtext=Foldtext_markdown() - endif -endif + +let b:fenced_block = 0 +let b:front_matter = 0 +let s:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1) + +function! s:MarkdownSetupFolding() + if !get(g:, "vim_markdown_folding_disabled", 0) + setlocal foldexpr=Foldexpr_markdown(v:lnum) + setlocal foldmethod=expr + if get(g:, "vim_markdown_folding_style_pythonic", 0) && get(g:, "vim_markdown_override_foldtext", 1) + setlocal foldtext=Foldtext_markdown() + endif + endif +endfunction +call s:MarkdownSetupFolding() +augroup Mkd + " These autocmds need to be kept in sync with the autocmds calling + " s:MarkdownRefreshSyntax in ftplugin/markdown.vim. + autocmd BufWinEnter,BufWritePost call s:MarkdownSetupFolding() + autocmd InsertEnter,InsertLeave call s:MarkdownSetupFolding() + autocmd CursorHold,CursorHoldI call s:MarkdownSetupFolding() +augroup END