Not allow space in link

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

diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index 84b6a4f57179bc93b1479ecc147fbd20b4997106..5c51126339a4da40c964fae9400759630e3ecc8f 100644 (file)
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -13,8 +13,39 @@ endfunction
 
 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
+        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*' && !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*' && !s:is_mkdCode(a:lnum+1)
@@ -22,7 +53,6 @@ if get(g:, "vim_markdown_folding_style_pythonic", 0)
             return '>1'
         endif
 
-        let l1 = getline(a:lnum)
         if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
             " current line starts with hashes
             return '>'.(matchend(l1, '^#\+') - 1)
@@ -53,13 +83,29 @@ else
         else
             let l0 = getline(a:lnum-1)
         endif
+
         " keep track of fenced code blocks
-        if l0 =~ '````*' || l0 =~ '~~~~*'
+        if l0 =~ '````*' || l0 =~ '\~\~\~\~*'
             if b:fenced_block == 0
                 let b:fenced_block = 1
             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)
@@ -68,7 +114,7 @@ else
             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'
@@ -79,23 +125,19 @@ else
         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 || l:level > s:vim_markdown_folding_level
                 return -1
             else
-                " code blocks are always folded
-                return b:fenced_block
+                " headers are not folded
+                return 0
             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
             " current line starts with hashes
             return '>'.matchend(l0, '^#\+')
         else
-            " fold here because of setext headers
+            " keep previous foldlevel
             return '='
         endif
     endfunction
@@ -103,7 +145,8 @@ endif
 
 
 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)