]> 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 YAML frontmatter recognised as level-2 heading
[etc/vim.git] / after / ftplugin / markdown.vim
index 586ff2f5b001ee8490c5a6f7d6f8e1fd74b8d2ab..f16d875f4127f596abf75dc4aa1ddf2a061ca8f8 100644 (file)
@@ -21,18 +21,39 @@ if get(g:, "vim_markdown_folding_style_pythonic", 0)
             elseif b:fenced_block == 1
                 let b:fenced_block = 0
             endif
+        elseif g:vim_markdown_frontmatter == 1
+            if b:front_matter == 1 && a:lnum > 2
+                let l0 = getline(a:lnum-1)
+                if l0 == '---'
+                    let b:front_matter = 0
+                endif
+            elseif a:lnum == 1
+                if l1 == '---'
+                    let b:front_matter = 1
+                endif
+            endif
+        endif
+
+        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*' && b:fenced_block == 0 && !s:is_mkdCode(a:lnum+1)
+        if l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 1)
             return '>0'
-        elseif l2 =~ '^--\+\s*' && b:fenced_block == 0 && !s:is_mkdCode(a:lnum+1)
+        elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 2)
             return '>1'
         endif
 
-        if l1 =~ '^#' && b:fenced_block == 0 && !s:is_mkdCode(a:lnum)
+        if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
             " current line starts with hashes
             return '>'.(matchend(l1, '^#\+') - 1)
         elseif a:lnum == 1
@@ -62,6 +83,7 @@ else
         else
             let l0 = getline(a:lnum-1)
         endif
+
         " keep track of fenced code blocks
         if l0 =~ '````*' || l0 =~ '\~\~\~\~*'
             if b:fenced_block == 0
@@ -69,13 +91,28 @@ else
             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*' && b:fenced_block == 0 && !s:is_mkdCode(a:lnum+1)
+        if  l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 1)
             return '>1'
-        elseif l2 =~ '^--\+\s*' && b:fenced_block == 0 && !s:is_mkdCode(a:lnum+1)
+        elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 2)
             if g:vim_markdown_folding_level >= 2
                 return '>1'
@@ -85,7 +122,7 @@ else
         endif
 
         let l1 = getline(a:lnum)
-        if l1 =~ '^#' && b:fenced_block == 0 && !s:is_mkdCode(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
@@ -96,7 +133,7 @@ else
             endif
         endif
 
-        if l0 =~ '^#' && b:fenced_block == 0 && !s:is_mkdCode(a:lnum-1)
+        if l0 =~ '^#' && !s:is_mkdCode(a:lnum-1)
             " current line starts with hashes
             return '>'.matchend(l0, '^#\+')
         else
@@ -108,6 +145,7 @@ endif
 
 
 let b:fenced_block = 0
+let b:front_matter = 0
 let g:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1)
 
 if !get(g:, "vim_markdown_folding_disabled", 0)