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

Fix code block syntax of longer backticks, tildes
[etc/vim.git] / after / ftplugin / markdown.vim
index 06a1583835a7468ddff46145005c1275c01a662e..586ff2f5b001ee8490c5a6f7d6f8e1fd74b8d2ab 100644 (file)
@@ -13,17 +13,26 @@ endfunction
 
 if get(g:, "vim_markdown_folding_style_pythonic", 0)
     function! Foldexpr_markdown(lnum)
 
 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 l1 =~ '````*' || l1 =~ '\~\~\~\~*'
+            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)
         let l2 = getline(a:lnum+1)
-        if  l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
+        if l2 =~ '^==\+\s*' && b:fenced_block == 0 && !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*' && !s:is_mkdCode(a:lnum+1)
+        elseif l2 =~ '^--\+\s*' && b:fenced_block == 0 && !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 = getline(a:lnum)
-        if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
+        if l1 =~ '^#' && b:fenced_block == 0 && !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
@@ -63,12 +72,12 @@ else
         endif
 
         let l2 = getline(a:lnum+1)
         endif
 
         let l2 = getline(a:lnum+1)
-        if  l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
+        if  l2 =~ '^==\+\s*' && b:fenced_block == 0 && !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*' && !s:is_mkdCode(a:lnum+1)
+        elseif l2 =~ '^--\+\s*' && b:fenced_block == 0 && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 2)
             " next line is underlined (level 2)
-            if g:vim_markdown_folding_level == 2
+            if g:vim_markdown_folding_level >= 2
                 return '>1'
             else
                 return '>2'
                 return '>1'
             else
                 return '>2'
@@ -76,22 +85,18 @@ else
         endif
 
         let l1 = getline(a:lnum)
         endif
 
         let l1 = getline(a:lnum)
-        if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
+        if l1 =~ '^#' && b:fenced_block == 0 && !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
             " 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
+                " headers are not folded
+                return 0
             endif
         endif
 
             endif
         endif
 
-        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
+        if l0 =~ '^#' && b:fenced_block == 0 && !s:is_mkdCode(a:lnum-1)
             " current line starts with hashes
             return '>'.matchend(l0, '^#\+')
         else
             " current line starts with hashes
             return '>'.matchend(l0, '^#\+')
         else