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

Add support for "make test", automatically installing deps
[etc/vim.git] / after / ftplugin / markdown.vim
index adac473a0568016191757fd08c98bc254ba75133..a140c25a2c2ae9ac128506085a149641d6f0d187 100644 (file)
@@ -6,27 +6,37 @@
 "
 " 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
-
-    let l1 = getline(a:lnum)
+func! s:is_mkdCode(lnum)
+    return synIDattr(synID(a:lnum, 1, 0), 'name') == 'mkdCode'
+endfunc
 
-    let l2 = getline(a:lnum+1)
+func! s:effective_line(lnum)
+    let line = getline(a:lnum)
+    return (line !~ '^[=-#]' || s:is_mkdCode(a:lnum)) ? '' : line
+endfunc
 
+func! 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'
-    elseif l1 =~ '^#'
+    endif
+
+    let l1 = s:effective_line(a:lnum)
+    if l1 =~ '^#'
         " don't include the section title in the fold
         return '-1'
-    elseif l0 =~ '^#'
+    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