]> git.madduck.net Git - etc/vim.git/blobdiff - after/ftplugin/markdown.vim

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:

projects / etc / vim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
:Toc should accept single `=` and `-` as setex header
[etc/vim.git] / after / ftplugin / markdown.vim
diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index e635f6d1967b06b09248035204f535b896a63165..84b6a4f57179bc93b1479ecc147fbd20b4997106 100644 (file)
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -6,28 +6,24 @@
 "
 " original version from Steve Losh's gist: https://gist.github.com/1038710
 
 "
 " original version from Steve Losh's gist: https://gist.github.com/1038710
 
-func! s:is_mkdCode(lnum)
-    return synIDattr(synID(a:lnum, 1, 0), 'name') == 'mkdCode'
-endfunc
-
-func! s:effective_line(lnum)
-    let line = getline(a:lnum)
-    return (line !~ '^[=-#]' || s:is_mkdCode(a:lnum)) ? '' : line
-endfunc
+function! s:is_mkdCode(lnum)
+    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)
 
 if get(g:, "vim_markdown_folding_style_pythonic", 0)
-    func! Foldexpr_markdown(lnum)
-        let l2 = s:effective_line(a:lnum+1)
-        if  l2 =~ '^==\+\s*'
+    function! Foldexpr_markdown(lnum)
+        let l2 = getline(a:lnum+1)
+        if  l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 1)
             return '>0'
             " next line is underlined (level 1)
             return '>0'
-        elseif l2 =~ '^--\+\s*'
+        elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 2)
             return '>1'
         endif
 
             " next line is underlined (level 2)
             return '>1'
         endif
 
-        let l1 = s:effective_line(a:lnum)
-        if l1 =~ '^#'
+        let l1 = getline(a:lnum)
+        if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
             " current line starts with hashes
             return '>'.(matchend(l1, '^#\+') - 1)
         elseif a:lnum == 1
             " current line starts with hashes
             return '>'.(matchend(l1, '^#\+') - 1)
         elseif a:lnum == 1
@@ -37,9 +33,9 @@ if get(g:, "vim_markdown_folding_style_pythonic", 0)
             " keep previous foldlevel
             return '='
         endif
             " keep previous foldlevel
             return '='
         endif
-    endfunc
+    endfunction
 
 
-    fun! Foldtext_markdown()
+    function! Foldtext_markdown()
         let line = getline(v:foldstart)
         let has_numbers = &number || &relativenumber
         let nucolwidth = &fdc + has_numbers * &numberwidth
         let line = getline(v:foldstart)
         let has_numbers = &number || &relativenumber
         let nucolwidth = &fdc + has_numbers * &numberwidth
@@ -49,39 +45,66 @@ if get(g:, "vim_markdown_folding_style_pythonic", 0)
         let line = substitute(line, '\%("""\|''''''\)', '', '')
         let fillcharcount = windowwidth - len(line) - len(foldedlinecount) + 1
         return line . ' ' . repeat("-", fillcharcount) . ' ' . foldedlinecount
         let line = substitute(line, '\%("""\|''''''\)', '', '')
         let fillcharcount = windowwidth - len(line) - len(foldedlinecount) + 1
         return line . ' ' . repeat("-", fillcharcount) . ' ' . foldedlinecount
-    endfunc
+    endfunction
 else
 else
-    func! Foldexpr_markdown(lnum)
-        let l2 = s:effective_line(a:lnum+1)
-        if  l2 =~ '^==\+\s*'
+    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
+        endif
+
+        let l2 = getline(a:lnum+1)
+        if  l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 1)
             return '>1'
             " next line is underlined (level 1)
             return '>1'
-        elseif l2 =~ '^--\+\s*'
+        elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 2)
             " next line is underlined (level 2)
-            return '>2'
+            if g:vim_markdown_folding_level == 2
+                return '>1'
+            else
+                return '>2'
+            endif
         endif
 
         endif
 
-        let l1 = s:effective_line(a:lnum)
-        if l1 =~ '^#'
-            " don't include the section title in the fold
-            return '-1'
+        let l1 = getline(a:lnum)
+        if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
+            " fold level according to option
+            let l:level = matchend(l1, '^#\+')
+            if g:vim_markdown_folding_level == 1 || l:level > g:vim_markdown_folding_level
+                return -1
+            else
+                " code blocks are always folded
+                return b:fenced_block
+            endif
         endif
 
         endif
 
-        if (a:lnum == 1)
-            let l0 = ''
-        else
-            let l0 = s:effective_line(a:lnum-1)
-        endif
-        if l0 =~ '^#'
+        if l0 =~ '^#' && !s:is_mkdCode(a:lnum-1)
+            " collapse comments in fenced code blocks into a single fold
+            if b:fenced_block == 1
+                return 1
+            endif
             " current line starts with hashes
             return '>'.matchend(l0, '^#\+')
         else
             " current line starts with hashes
             return '>'.matchend(l0, '^#\+')
         else
-            " keep previous foldlevel
+            " fold here because of setext headers
             return '='
         endif
             return '='
         endif
-    endfunc
+    endfunction
 endif
 
 endif
 
+
+let b:fenced_block = 0
+let g:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1)
+
 if !get(g:, "vim_markdown_folding_disabled", 0)
     setlocal foldexpr=Foldexpr_markdown(v:lnum)
     setlocal foldmethod=expr
 if !get(g:, "vim_markdown_folding_disabled", 0)
     setlocal foldexpr=Foldexpr_markdown(v:lnum)
     setlocal foldmethod=expr
vim configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.