Use function! as with the other code

[etc/vim.git] / after / ftplugin / markdown.vim

diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index adac473a0568016191757fd08c98bc254ba75133..1d0572c969cc3629560840dbb3979c53e83f069c 100644 (file)
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -6,37 +6,86 @@
 "
 " original version from Steve Losh's gist: https://gist.github.com/1038710
 
-func! Foldexpr_markdown(lnum)
-    if (a:lnum == 1)
-        let l0 = ''
-    else
-        let l0 = getline(a:lnum-1)
-    endif
+function! s:is_mkdCode(lnum)
+    return synIDattr(synID(a:lnum, 1, 0), 'name') == 'mkdCode'
+endfunction
 
-    let l1 = getline(a:lnum)
-
-    let l2 = getline(a:lnum+1)
-
-    if  l2 =~ '^==\+\s*'
-        " next line is underlined (level 1)
-        return '>1'
-    elseif l2 =~ '^--\+\s*'
-        " next line is underlined (level 2)
-        return '>2'
-    elseif l1 =~ '^#'
-        " don't include the section title in the fold
-        return '-1'
-    elseif l0 =~ '^#'
-        " current line starts with hashes
-        return '>'.matchend(l0, '^#\+')
-    else
-        " keep previous foldlevel
-        return '='
-    endif
-endfunc
+function! s:effective_line(lnum)
+    let line = getline(a:lnum)
+    return (line !~ '^[=-#]' || s:is_mkdCode(a:lnum)) ? '' : line
+endfunction
+
+if get(g:, "vim_markdown_folding_style_pythonic", 0)
+    function! Foldexpr_markdown(lnum)
+        let l2 = s:effective_line(a:lnum+1)
+        if  l2 =~ '^==\+\s*'
+            " next line is underlined (level 1)
+            return '>0'
+        elseif l2 =~ '^--\+\s*'
+            " next line is underlined (level 2)
+            return '>1'
+        endif
+
+        let l1 = s:effective_line(a:lnum)
+        if l1 =~ '^#'
+            " current line starts with hashes
+            return '>'.(matchend(l1, '^#\+') - 1)
+        elseif a:lnum == 1
+            " fold any 'preamble'
+            return '>1'
+        else
+            " keep previous foldlevel
+            return '='
+        endif
+    endfunction
 
+    function! Foldtext_markdown()
+        let line = getline(v:foldstart)
+        let has_numbers = &number || &relativenumber
+        let nucolwidth = &fdc + has_numbers * &numberwidth
+        let windowwidth = winwidth(0) - nucolwidth - 6
+        let foldedlinecount = v:foldend - v:foldstart
+        let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount))
+        let line = substitute(line, '\%("""\|''''''\)', '', '')
+        let fillcharcount = windowwidth - len(line) - len(foldedlinecount) + 1
+        return line . ' ' . repeat("-", fillcharcount) . ' ' . foldedlinecount
+    endfunction
+else
+    function! Foldexpr_markdown(lnum)
+        let l2 = s:effective_line(a:lnum+1)
+        if  l2 =~ '^==\+\s*'
+            " next line is underlined (level 1)
+            return '>1'
+        elseif l2 =~ '^--\+\s*'
+            " next line is underlined (level 2)
+            return '>2'
+        endif
+
+        let l1 = s:effective_line(a:lnum)
+        if l1 =~ '^#'
+            " don't include the section title in the fold
+            return '-1'
+        endif
+
+        if (a:lnum == 1)
+            let l0 = ''
+        else
+            let l0 = s:effective_line(a:lnum-1)
+        endif
+        if l0 =~ '^#'
+            " current line starts with hashes
+            return '>'.matchend(l0, '^#\+')
+        else
+            " keep previous foldlevel
+            return '='
+        endif
+    endfunction
+endif
 
 if !get(g:, "vim_markdown_folding_disabled", 0)
-  setlocal foldexpr=Foldexpr_markdown(v:lnum)
-  setlocal foldmethod=expr
+    setlocal foldexpr=Foldexpr_markdown(v:lnum)
+    setlocal foldmethod=expr
+    if get(g:, "vim_markdown_folding_style_pythonic", 0)
+        setlocal foldtext=Foldtext_markdown()
+    endif
 endif