Fix math syntax highlighting after end pattern

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

diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index 777ddace57db29e70dde6ce2f9fec97209c72e7b..6265db3a7b5a466dfe6a4813b1e2adb9f4d2835d 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


@@ -93,7 +114,7 @@ else
             return '>1'
         elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 2)
             return '>1'
         elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 2)

-            if g:vim_markdown_folding_level >= 2
+            if s:vim_markdown_folding_level >= 2

                 return '>1'
             else
                 return '>2'
                 return '>1'
             else
                 return '>2'


@@ -103,8 +124,7 @@ else
         let l1 = getline(a:lnum)
         if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
             " fold level according to option
         let l1 = getline(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
+            if s:vim_markdown_folding_level == 1 || matchend(l1, '^#\+') > s:vim_markdown_folding_level

                 return -1
             else
                 " headers are not folded
                 return -1
             else
                 " headers are not folded


@@ -116,7 +136,7 @@ else
             " current line starts with hashes
             return '>'.matchend(l0, '^#\+')
         else
             " current line starts with hashes
             return '>'.matchend(l0, '^#\+')
         else

-            " fold here because of setext headers
+            " keep previous foldlevel

             return '='
         endif
     endfunction
             return '='
         endif
     endfunction


@@ -124,7 +144,8 @@ endif
 
 
 let b:fenced_block = 0
 
 
 let b:fenced_block = 0

-let g:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1)
+let b:front_matter = 0
+let s:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1)

 
 if !get(g:, "vim_markdown_folding_disabled", 0)
     setlocal foldexpr=Foldexpr_markdown(v:lnum)
 
 if !get(g:, "vim_markdown_folding_disabled", 0)
     setlocal foldexpr=Foldexpr_markdown(v:lnum)