From: Hiroshi Shirosaki <h.shirosaki@gmail.com>
Date: Thu, 25 Feb 2016 01:44:41 +0000 (+0900)
Subject: TableFormat does not remove colons for alignment
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/e07c336bca7861790e8bbc496bb7a47f489e0907?ds=sidebyside

TableFormat does not remove colons for alignment

Fix #265, #220
---

diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index c7fba7f..71c6735 100644
--- 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 c29ab03..2fc06a3 100644
--- 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 |   |