Switched to using || mapping for table border generation, more intuitive & create a minimal border on a new line without a table

autoload/tablemode.vim

@@ -4,7 +4,7 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       http://github.com/dhruvasagar/vim-table-mode
-" Version:       3.2
+" Version:       3.3
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope and
 "                uses a small amount of code from it.
@@ -124,7 +124,11 @@ function! s:EndExpr() "{{{2
 endfunction
 
 function! s:HeaderBorderExpr() "{{{2
-  return s:StartExpr() . g:table_mode_corner . '[' . g:table_mode_fillchar . g:table_mode_corner . ']*' . g:table_mode_corner . s:EndExpr()
+  return s:StartExpr() .
+        \ '[' . g:table_mode_corner . g:table_mode_separator . ']' .
+        \ '[' . g:table_mode_fillchar . g:table_mode_corner . ']*' .
+        \ '[' . g:table_mode_corner . g:table_mode_separator . ']' .
+        \ s:EndExpr()
 endfunction
 
 function! s:StartCommentExpr() "{{{2
@@ -165,13 +169,8 @@ function! s:ToggleMapping() "{{{2
 
     execute "inoremap <silent> <buffer> " . b:table_mode_separator_map . ' ' .
           \ b:table_mode_separator_map . "<Esc>:call tablemode#TableizeInsertMode()<CR>a"
-
-    execute "inoreabbrev <silent> <buffer> " . g:table_mode_corner .
-          \ g:table_mode_fillchar . " <Esc>:call tablemode#AddHeaderBorder('.')<CR>A"
   else
     execute "iunmap <silent> <buffer> " . b:table_mode_separator_map
-
-    execute "iunabbrev <silent> <buffer> " . g:table_mode_corner . g:table_mode_fillchar
   endif
 endfunction
 
@@ -180,12 +179,28 @@ function! s:SetActive(bool) "{{{2
   call s:ToggleMapping()
 endfunction
 
+function! s:DefaultHeaderBorder() "{{{2
+  if s:IsTableModeActive()
+    return g:table_mode_separator . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_fillchar . g:table_mode_separator
+  else
+    return ''
+  endif
+endfunction
+
 function! s:GenerateHeaderBorder(line) "{{{2
   let line = s:Line(a:line)
-  if tablemode#IsATableRow(line - s:RowGap())
+  if tablemode#IsATableRow(line - s:RowGap()) || tablemode#IsATableRow(line + s:RowGap())
-    let line_val = getline(line - s:RowGap())
+    let line_val = ''
+    if tablemode#IsATableRow(line + s:RowGap())
+      let line_val = getline(line + s:RowGap())
+    endif
+    if tablemode#IsATableRow(line - s:RowGap()) && s:Strlen(line_val) < s:Strlen(getline(line - s:RowGap()))
+      let line_val = getline(line - s:RowGap())
+    endif
+    if s:Strlen(line_val) <= 1 | return s:DefaultHeaderBorder() | endif
     let border = substitute(line_val[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator, g:table_mode_corner, 'g')
     let border = substitute(border, '[^' . g:table_mode_corner . ']', g:table_mode_fillchar, 'g')
+    let border = substitute(border, '^' . g:table_mode_corner . '\(.*\)' . g:table_mode_corner . '$', g:table_mode_separator . '\1' . g:table_mode_separator , '')
 
     let cstartexpr = s:StartCommentExpr()
     if s:Strlen(cstartexpr) > 0 && getline(line) =~# cstartexpr
@@ -198,6 +213,8 @@ function! s:GenerateHeaderBorder(line) "{{{2
     else
       return border
     endif
+  else
+    return s:DefaultHeaderBorder()
   endif
 endfunction
 
@@ -644,31 +661,26 @@ function! tablemode#TableRealign(line) "{{{2
   let line = s:Line(a:line)
 
   let [lnums, lines] = [[], []]
-  let [bline, tline] = [0, line]
+  let [tline, blines] = [line, []]
-  while tablemode#IsATableRow(tline)
+  while tablemode#IsATableRow(tline) || getline(tline) =~# s:HeaderBorderExpr()
+    if getline(tline) =~# s:HeaderBorderExpr()
+      call insert(blines, tline)
+      let tline = tline - s:RowGap()
+      continue
+    endif
     call insert(lnums, tline)
     call insert(lines, getline(tline))
     let tline = tline - s:RowGap()
   endwhile
 
-  " If we reached header walking upwards
-  if getline(tline) =~# s:HeaderBorderExpr() && tablemode#IsATableRow(tline - s:RowGap())
-    let bline = tline
-    let tline = tline - s:RowGap()
-    " Insert the header line
-    call insert(lnums, tline)
-    call insert(lines, getline(tline))
-  endif
-
   let tline = line + s:RowGap()
 
-  " If we start at header
+  while tablemode#IsATableRow(tline) || getline(tline) =~# s:HeaderBorderExpr()
-  if !bline && getline(tline) =~# s:HeaderBorderExpr()
+    if getline(tline) =~# s:HeaderBorderExpr()
-    let bline = tline
+      call insert(blines, tline)
-    let tline = tline + s:RowGap()
+      let tline = tline + s:RowGap()
-  endif
+      continue
-
+    endif
-  while tablemode#IsATableRow(tline)
     call add(lnums, tline)
     call add(lines, getline(tline))
     let tline = tline + s:RowGap()
@@ -681,15 +693,19 @@ function! tablemode#TableRealign(line) "{{{2
     call setline(lnum, lines[index])
   endfor
 
-  if bline
+  for bline in blines
     call tablemode#AddHeaderBorder(bline)
-  endif
+  endfor
 endfunction
 
 function! tablemode#IsATableRow(line) "{{{2
-  return getline(a:line) =~# (s:StartExpr() . g:table_mode_separator)
+  return getline(a:line) =~# (s:StartExpr() . g:table_mode_separator . '[^' .
+        \ g:table_mode_fillchar . ']*[^' . g:table_mode_corner . ']*$')
 endfunction
 
+function! tablemode#IsATableHeader(line) "{{{2
+  return getline(a:line) =~# s:HeaderBorderExpr()
+endfunction
 
 function! tablemode#LineNr(row) "{{{2
   if tablemode#IsATableRow('.')
@@ -755,7 +771,9 @@ function! tablemode#TableMotion(direction) "{{{2
   if tablemode#IsATableRow('.')
     if a:direction ==# 'l'
       if s:IsLastCell()
-        if !tablemode#IsATableRow(line('.') + s:RowGap()) | return | endif
+        if !tablemode#IsATableHeader(line('.') + s:RowGap()) && !tablemode#IsATableRow(line('.') + s:RowGap())
+          return
+        endif
         call tablemode#TableMotion('j')
         normal! 0
       endif
@@ -768,7 +786,9 @@ function! tablemode#TableMotion(direction) "{{{2
       endif
     elseif a:direction ==# 'h'
       if s:IsFirstCell()
-        if !tablemode#IsATableRow(line('.') - s:RowGap()) | return | endif
+        if !tablemode#IsATableHeader(line('.') - s:RowGap()) && !tablemode#IsATableRow(line('.') - s:RowGap())
+          return
+        endif
         call tablemode#TableMotion('k')
         normal! $
       endif
@@ -780,9 +800,17 @@ function! tablemode#TableMotion(direction) "{{{2
         execute 'normal! 2F' . g:table_mode_separator . '2l'
       endif
     elseif a:direction ==# 'j'
-      if tablemode#IsATableRow(line('.') + s:RowGap()) | execute 'normal ' . s:RowGap() . 'j' | endif
+      if tablemode#IsATableRow(line('.') + s:RowGap())
+        execute 'normal ' . s:RowGap() . 'j'
+      elseif tablemode#IsATableHeader(line('.') + s:RowGap())
+        execute 'normal ' . (s:RowGap() + 1) . 'j'
+      endif
     elseif a:direction ==# 'k'
-      if tablemode#IsATableRow(line('.') - s:RowGap()) | execute 'normal ' . s:RowGap() . 'k' | endif
+      if tablemode#IsATableRow(line('.') - s:RowGap())
+        execute 'normal ' . s:RowGap() . 'k'
+      elseif tablemode#IsATableHeader(line('.') - s:RowGap())
+        execute 'normal ' . (s:RowGap() + 1) . 'k'
+      endif
     endif
   endif
 endfunction
@@ -884,6 +912,7 @@ function! tablemode#AddFormula() "{{{2
   if fr !=# ''
     let fr = '$' . row . ',' . colm . '=' . fr
     let fline = tablemode#GetLastRow('.') + s:RowGap()
+    if getline(fline) =~# s:HeaderBorderExpr() | let fline += s:RowGap() | endif
     let cursor_pos = [line('.'), col('.')]
     if getline(fline) =~# 'tmf: '
       " Comment line correctly
@@ -972,11 +1001,14 @@ function! tablemode#EvaluateFormulaLine() abort "{{{2
   endif
   if tablemode#IsATableRow('.') " We're inside the table
     let line = s:GetLastRow('.')
-    if getline(line + s:RowGap()) =~# 'tmf: '
+    let fline = line + s:RowGap()
-      let exprs = split(matchstr(getline(line + s:RowGap()), matchexpr), ';')
+    if getline(fline) =~# s:HeaderBorderExpr() | let fline += s:RowGap() | endif
+    if getline(fline) =~# 'tmf: '
+      let exprs = split(matchstr(getline(fline), matchexpr), ';')
     endif
   elseif getline('.') =~# 'tmf: ' " We're on the formula line
     let line = line('.') - s:RowGap()
+    if getline(line) =~# s:HeaderBorderExpr() | let line -= s:RowGap() | endif
     if tablemode#IsATableRow(line)
       let exprs = split(matchstr(getline('.'), matchexpr), ';')
     endif

doc/table-mode.txt

@@ -1,7 +1,7 @@
-*table-mode.txt*			Table Mode for easy table formatting. v3.2
+*table-mode.txt*			Table Mode for easy table formatting. v3.3
 ===============================================================================
 	Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
-				 VERSION 3.2
+				 VERSION 3.3
 
 		Author: Dhruva Sagar <http://dhruvasagar.com/>
 		License: MIT <http://opensource.org/licenses/MIT/>
@@ -29,7 +29,7 @@ GETTING STARTED					*table-mode-getting-started*
 
 Create Table on the fly:
 	Using Table Mode is dead simple. You simply start typing on a new line
-	with the table separator - |g:table-mode-separator|, and you just type
+	with the table separator - |table-mode-separator|, and you just type
 	away! The plugin does the rest automatically for you as you type. With
 	each additional separator you add, it aligns the table properly,
 	without having to do anything else.
@@ -323,11 +323,9 @@ MAPPINGS						*table-mode-mappings*
 		would evaluate the formula line and update the table
 		accordingly. This invokes the |TableEvalFormulaLine| command.
 
-+-              Expands to a header border, the line immidiately above this
+||              Expands to a header border, the line immidiately above or
-                will be considered as the table header. You can change this by
+		below this will be considered as the table header. You can
-                changing |table-mode-corner| and |table-mode-fillchar|
+		change this by changing |table-mode-separator| options.
-                options. This is an iabbrev so is triggered when you press
-                space or <CR> after typing the mapping.
 
 ===============================================================================
 COMMANDS						*table-mode-commands*

plugin/table-mode.vim

@@ -4,7 +4,7 @@
 " Author:        Dhruva Sagar <http://dhruvasagar.com/>
 " License:       MIT (http://www.opensource.org/licenses/MIT)
 " Website:       http://github.com/dhruvasagar/vim-table-mode
-" Version:       3.2
+" Version:       3.3
 " Note:          This plugin was heavily inspired by the 'CucumberTables.vim'
 "                (https://gist.github.com/tpope/287147) plugin by Tim Pope and
 "                uses a small amount of code from it.