Foldmethod: more performance

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

diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index 94267eedb315b88c1f165763717a383db853136d..497a5a262e719d6dd81abf0ffbc2fa270f32b6cf 100644 (file)
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -11,30 +11,32 @@ func! s:is_mkdCode(lnum)
 endfunc
 
 func! s:effective_line(lnum)
 endfunc
 
 func! s:effective_line(lnum)

-    return s:is_mkdCode(a:lnum) ? '' : getline(a:lnum)
+    let line = getline(a:lnum)
+    return (line !~ '^=\|^#' || s:is_mkdCode(a:lnum)) ? '' : line

 endfunc
 
 func! Foldexpr_markdown(lnum)
 endfunc
 
 func! Foldexpr_markdown(lnum)

-    if (a:lnum == 1)
-        let l0 = ''
-    else
-        let l0 = s:effective_line(a:lnum-1)
-    endif
-
-    let l1 = s:effective_line(a:lnum)
-

     let l2 = s:effective_line(a:lnum+1)
     let l2 = s:effective_line(a:lnum+1)

-

     if  l2 =~ '^==\+\s*'
         " next line is underlined (level 1)
         return '>1'
     elseif l2 =~ '^--\+\s*'
         " next line is underlined (level 2)
         return '>2'
     if  l2 =~ '^==\+\s*'
         " next line is underlined (level 1)
         return '>1'
     elseif l2 =~ '^--\+\s*'
         " next line is underlined (level 2)
         return '>2'

-    elseif l1 =~ '^#'
+    endif
+
+    let l1 = s:effective_line(a:lnum)
+    if l1 =~ '^#'

         " don't include the section title in the fold
         return '-1'
         " don't include the section title in the fold
         return '-1'

-    elseif l0 =~ '^#'
+    endif
+
+    if (a:lnum == 1)
+        let l0 = ''
+    else
+        let l0 = s:effective_line(a:lnum-1)
+    endif
+    if l0 =~ '^#'

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