TableFormat does not remove colons for alignment

Fix #265, #220

diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index c7fba7fae6bdf275344714e9426a7ca5c3dd471d..71c67357ac1ed11c6409a8984c826e3565559cd9 100644 (file)
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -459,8 +459,11 @@ function! s:TableFormat()
     " 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 /|.
     let l:flags = (&gdefault ? '' : 'g')
-    execute 's/[^|]//' . l:flags
+    execute 's/\(:\@<!-:\@!\|[^|:-]\)//e' . l:flags
+    execute 's/--/-/e' . l:flags
     Tabularize /|
+    execute 's/:\( \+\)|/\1:|/e' . l:flags
+    execute 's/|\( \+\):/|:\1/e' . l:flags
     execute 's/ /-/' . l:flags
     call setpos('.', l:pos)
 endfunction

diff --git a/test/table-format.vader b/test/table-format.vader
index c29ab0345e922cbb7cce9e22511176a63b966af3..2fc06a394b70f4102341d1faa88aff9ab010680b 100644 (file)
--- a/test/table-format.vader
+++ b/test/table-format.vader
@@ -29,3 +29,16 @@ Expect (table is not modified):
   | a | b |
   |---|---|
   | c | d |
+
+Given markdown;
+| left |right|  center  ||
+| :- | --: |:---:|:|
+| left |right|  center  ||
+
+Execute (format table with colons):
+  TableFormat
+
+Expect (preserve colons to align text):
+  | left | right | center |   |
+  |:-----|------:|:------:|:--|
+  | left | right | center |   |