X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/3d76a59bd0faf62ad280b9ea82117e4a0425c61f..662822d81ab5320985be59e8368e60ad55d42137:/ftplugin/mkd.vim

diff --git a/ftplugin/mkd.vim b/ftplugin/mkd.vim
index 2129203..916e47f 100644
--- a/ftplugin/mkd.vim
+++ b/ftplugin/mkd.vim
@@ -47,12 +47,12 @@
 
 " For each level, contains the regexp that matches at that level only.
 let s:levelRegexpDict = {
-    \ 1: '\v^(#[^#]|.+\n\=+$)',
-    \ 2: '\v^(##[^#]|.+\n-+$)',
-    \ 3: '\v^###[^#]',
-    \ 4: '\v^####[^#]',
-    \ 5: '\v^#####[^#]',
-    \ 6: '\v^######[^#]'
+    \ 1: '\v^(#[^#]@=|.+\n\=+$)',
+    \ 2: '\v^(##[^#]@=|.+\n-+$)',
+    \ 3: '\v^###[^#]@=',
+    \ 4: '\v^####[^#]@=',
+    \ 5: '\v^#####[^#]@=',
+    \ 6: '\v^######[^#]@='
 \ }
 
 " Maches any header level of any type.
@@ -302,27 +302,26 @@ function! s:Markdown_Toc(...)
     endif
 
     try
-        silent vimgrep /\(^\S.*\(\n[=-]\+\)\@=\|^#\+\)/ %
+        silent lvimgrep /\(^\S.*\(\n[=-]\+\n\)\@=\|^#\+\)/ %
     catch /E480/
         echom "Toc: No headers."
         return
     endtry
 
     if l:window_type ==# 'horizontal'
-        copen
+        lopen
     elseif l:window_type ==# 'vertical'
-        vertical copen
+        vertical lopen
         let &winwidth=(&columns/2)
     elseif l:window_type ==# 'tab'
-        tab copen
+        tab lopen
     else
-        copen
+        lopen
     endif
     set modifiable
-    %s/\v^([^|]*\|){2,2} #//
     for i in range(1, line('$'))
-        " this is the quickfix data for the current item
-        let d = getqflist()[i-1]
+        " this is the location-list data for the current item
+        let d = getloclist(0)[i-1]
         " atx headers
         if match(d.text, "^#") > -1
             let l:level = len(matchstr(d.text, '#*', 'g'))-1
@@ -392,10 +391,26 @@ function! s:HeaderDecrease(line1, line2, ...)
     endfor
     let l:numSubstitutions = s:SetexToAtx(a:line1, a:line2)
     for l:level in range(replaceLevels[0], replaceLevels[1], -l:levelDelta)
-        execute 'silent! ' . a:line1 . ',' . (a:line2 - l:numSubstitutions) . 'substitute/' . s:levelRegexpDict[l:level] . '/' . repeat('#', l:level + l:levelDelta) . '\1/g'
+        execute 'silent! ' . a:line1 . ',' . (a:line2 - l:numSubstitutions) . 'substitute/' . s:levelRegexpDict[l:level] . '/' . repeat('#', l:level + l:levelDelta) . '/g'
     endfor
 endfunction
 
+" Format table under cursor.
+" Depends on Tabularize.
+function! s:TableFormat()
+  let l:pos = getpos('.')
+  normal! {
+  " Search instead of `normal! j` because of the table at beginning of file edge case.
+  call search('|')
+  normal! j
+  " Remove everything that is not a pipe othewise well formated tables would grow
+  " because of addition of 2 spaces on the separator line by Tabularize /|.
+  s/[^|]//g
+  Tabularize /|
+  s/ /-/g
+  call setpos('.', l:pos)
+endfunction
+
 call <sid>MapNormVis('<Plug>(Markdown_MoveToNextHeader)', '<sid>Markdown_MoveToNextHeader')
 call <sid>MapNormVis('<Plug>(Markdown_MoveToPreviousHeader)', '<sid>Markdown_MoveToPreviousHeader')
 call <sid>MapNormVis('<Plug>(Markdown_MoveToNextSiblingHeader)', '<sid>Markdown_MoveToNextSiblingHeader')
@@ -406,25 +421,26 @@ call <sid>MapNormVis('<Plug>(Markdown_MoveToParentHeader)', '<sid>Markdown_MoveT
 call <sid>MapNormVis('<Plug>(Markdown_MoveToCurHeader)', '<sid>Markdown_MoveToCurHeader')
 
 if !get(g:, 'vim_markdown_no_default_key_mappings', 0)
-    nmap <buffer> ]] <Plug>(Markdown_MoveToNextHeader)
-    nmap <buffer> [[ <Plug>(Markdown_MoveToPreviousHeader)
-    nmap <buffer> ][ <Plug>(Markdown_MoveToNextSiblingHeader)
-    nmap <buffer> [] <Plug>(Markdown_MoveToPreviousSiblingHeader)
-    nmap <buffer> ]u <Plug>(Markdown_MoveToParentHeader)
-    nmap <buffer> ]c <Plug>(Markdown_MoveToCurHeader)
+    nnoremap <buffer> ]] <Plug>(Markdown_MoveToNextHeader)
+    nnoremap <buffer> [[ <Plug>(Markdown_MoveToPreviousHeader)
+    nnoremap <buffer> ][ <Plug>(Markdown_MoveToNextSiblingHeader)
+    nnoremap <buffer> [] <Plug>(Markdown_MoveToPreviousSiblingHeader)
+    nnoremap <buffer> ]u <Plug>(Markdown_MoveToParentHeader)
+    nnoremap <buffer> ]c <Plug>(Markdown_MoveToCurHeader)
 
-    vmap <buffer> ]] <Plug>(Markdown_MoveToNextHeader)
-    vmap <buffer> [[ <Plug>(Markdown_MoveToPreviousHeader)
-    vmap <buffer> ][ <Plug>(Markdown_MoveToNextSiblingHeader)
-    vmap <buffer> [] <Plug>(Markdown_MoveToPreviousSiblingHeader)
-    vmap <buffer> ]u <Plug>(Markdown_MoveToParentHeader)
-    vmap <buffer> ]c <Plug>(Markdown_MoveToCurHeader)
+    vnoremap <buffer> ]] <Plug>(Markdown_MoveToNextHeader)
+    vnoremap <buffer> [[ <Plug>(Markdown_MoveToPreviousHeader)
+    vnoremap <buffer> ][ <Plug>(Markdown_MoveToNextSiblingHeader)
+    vnoremap <buffer> [] <Plug>(Markdown_MoveToPreviousSiblingHeader)
+    vnoremap <buffer> ]u <Plug>(Markdown_MoveToParentHeader)
+    vnoremap <buffer> ]c <Plug>(Markdown_MoveToCurHeader)
 endif
 
+command! -buffer -range=% HeaderDecrease call s:HeaderDecrease(<line1>, <line2>)
+command! -buffer -range=% HeaderIncrease call s:HeaderDecrease(<line1>, <line2>, 1)
+command! -buffer -range=% SetexToAtx call s:SetexToAtx(<line1>, <line2>)
+command! -buffer TableFormat call s:TableFormat()
 command! -buffer Toc call s:Markdown_Toc()
 command! -buffer Toch call s:Markdown_Toc('horizontal')
 command! -buffer Tocv call s:Markdown_Toc('vertical')
 command! -buffer Toct call s:Markdown_Toc('tab')
-command! -buffer -range=% SetexToAtx call s:SetexToAtx(<line1>, <line2>)
-command! -buffer -range=% HeaderDecrease call s:HeaderDecrease(<line1>, <line2>)
-command! -buffer -range=% HeaderIncrease call s:HeaderDecrease(<line1>, <line2>, 1)