Fix :Toc for setext headers

diff --git a/README.md b/README.md
index da77a07bb19a247da30f426c4fc81d44bba2a929..6fd8a383f1b2832d4d822fbca06e3e07e20481cd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -79,6 +79,21 @@ the following to your `.vimrc`:
 let g:vim_markdown_folding_style_pythonic=1
 ```
 
 let g:vim_markdown_folding_style_pythonic=1
 ```
 

+### Set header folding level
+
+Folding level is a number between 1 and 6. By default, if not specified, it is set to 1.
+
+```vim
+let g:vim_markdown_folding_level = 6
+```
+
+Tip: it can be changed on the fly with:
+
+```vim
+:let g:vim_markdown_folding_level = 1
+:edit
+```
+

 ### Disable Default Key Mappings
 
 Add the following line to your `.vimrc` to disable default key mappings:
 ### Disable Default Key Mappings
 
 Add the following line to your `.vimrc` to disable default key mappings:


@@ -109,21 +124,6 @@ Highlight YAML frontmatter as used by Jekyll:
 let g:vim_markdown_frontmatter=1
 ```
 
 let g:vim_markdown_frontmatter=1
 ```
 

-#### Folding level
-
-Folding level is a number between 1 and 6. By default, if not specified, it is set to 1.
-
-```vim
-let g:vim_markdown_folding_level = 6
-```
-
-Tip: it can be changed on the fly with:
-
-```vim
-:let g:vim_markdown_folding_level = 1
-:edit
-```
-

 
 ## Mappings
 
 
 ## Mappings
 

diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index f6bfe47c5b5bf41b994b4515f46ddfd263a17faa..1916a730cfe901e6fdca2204d807a7d9f699ad91 100644 (file)
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -64,16 +64,19 @@ else
         let l2 = getline(a:lnum+1)
         if  l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 1)
         let l2 = getline(a:lnum+1)
         if  l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 1)

-            return '>1'
+            return 0

         elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 2)
         elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 2)

-            return '>2'
+            if g:vim_markdown_folding_level == 2
+                return 0
+            else
+                return 1
+            endif

         endif
 
         let l1 = getline(a:lnum)
         if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
             " fold level according to option
         endif
 
         let l1 = getline(a:lnum)
         if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
             " fold level according to option

-            " (in vim -1 is visible, >= 0 is folded)

             let l:level = matchend(l1, '^#\+')
             if g:vim_markdown_folding_level == 1 || l:level > g:vim_markdown_folding_level
                 return -1
             let l:level = matchend(l1, '^#\+')
             if g:vim_markdown_folding_level == 1 || l:level > g:vim_markdown_folding_level
                 return -1


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

-            " keep previous foldlevel
-            return '='
+            " fold here because of setext headers
+            return 1

         endif
     endfunction
 endif
         endif
     endfunction
 endif

diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index bc916eff7b57700c58ee36d4bd6f17c8b4cc0c55..61fdab4ea92cb99483be1ab7bb65a56c6b90acda 100644 (file)
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -309,6 +309,7 @@ function! s:Toc(...)
     let l:header_max_len = 0
     for i in range(1, line('$'))
         let l:lineraw = getline(i)
     let l:header_max_len = 0
     for i in range(1, line('$'))
         let l:lineraw = getline(i)

+        let l:l1 = getline(i+1)

         let l:line = substitute(l:lineraw, "#", "\\\#", "g")
         if l:line =~ '````*' || l:line =~ '\~\~\~\~*'
             if b:fenced_block == 0
         let l:line = substitute(l:lineraw, "#", "\\\#", "g")
         if l:line =~ '````*' || l:line =~ '\~\~\~\~*'
             if b:fenced_block == 0


@@ -317,7 +318,12 @@ function! s:Toc(...)
                 let b:fenced_block = 0
             endif
         endif
                 let b:fenced_block = 0
             endif
         endif

-        if l:line =~ '^#\+' && b:fenced_block == 0
+        if l:line =~ '^#\+' || l:l1 =~ '^==\+\s*' || l:l1 =~ '^--\+\s*'
+            let b:is_header = 1
+        else
+            let b:is_header = 0
+        endif
+        if b:is_header == 1 && b:fenced_block == 0

             " append line to location list
             let b:item = {'lnum': i, 'text': l:line, 'valid': 1, 'bufnr': b:bufnr, 'col': 1}
             let b:header_list = b:header_list + [b:item]
             " append line to location list
             let b:item = {'lnum': i, 'text': l:line, 'valid': 1, 'bufnr': b:bufnr, 'col': 1}
             let b:header_list = b:header_list + [b:item]