Fix YAML frontmatter recognised as level-2 heading

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

diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index 777ddace57db29e70dde6ce2f9fec97209c72e7b..f16d875f4127f596abf75dc4aa1ddf2a061ca8f8 100644 (file)
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -21,9 +21,20 @@ if get(g:, "vim_markdown_folding_style_pythonic", 0)
             elseif b:fenced_block == 1
                 let b:fenced_block = 0
             endif
             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
 
         endif
 

-        if b:fenced_block == 1
+        if b:fenced_block == 1 || b:front_matter == 1

             if a:lnum == 1
                 " fold any 'preamble'
                 return '>1'
             if a:lnum == 1
                 " fold any 'preamble'
                 return '>1'


@@ -80,9 +91,19 @@ else
             elseif b:fenced_block == 1
                 let b:fenced_block = 0
             endif
             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
 
         endif
 

-        if b:fenced_block == 1
+        if b:fenced_block == 1 || b:front_matter == 1

             " keep previous foldlevel
             return '='
         endif
             " keep previous foldlevel
             return '='
         endif


@@ -124,6 +145,7 @@ endif
 
 
 let b:fenced_block = 0
 
 
 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)
 let g:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1)
 
 if !get(g:, "vim_markdown_folding_disabled", 0)