Merge pull request #571 from tomtomjhj/table-format

Fix TableFormat for indented tables, version 2

Author: tomtomjhj

ftplugin/markdown.vim

@@ -550,7 +550,7 @@ function! s:TableFormat()
     " Move colons for alignment to left or right side of the cell.
     execute 's/:\( \+\)|/\1:|/e' . l:flags
     execute 's/|\( \+\):/|:\1/e' . l:flags
-    execute 's/ /-/' . l:flags
+    execute 's/|:\?\zs[ -]\+\ze:\?|/\=repeat("-", len(submatch(0)))/' . l:flags
     call setpos('.', l:pos)
 endfunction
 

test/table-format.vader

@@ -30,6 +30,19 @@ Expect (table is not modified):
   |---|---|
   | c | d |
 
+Given markdown (indented table);
+  | a | b |
+  |---|---|
+  | c | d |
+
+Execute (format well formatted, indented table):
+  TableFormat
+
+Expect (table is not modified):
+    | a | b |
+    |---|---|
+    | c | d |
+
 Given markdown;
 | left |right|  center  ||
 | :- | --: |:---:|:|
@@ -42,3 +55,16 @@ Expect (preserve colons to align text):
   | left | right | center |   |
   |:-----|------:|:------:|:--|
   | left | right | center |   |
+
+Given markdown (indented table with colons);
+  | left |right|  center  ||
+  | :- | --: |:---:|:|
+  | left |right|  center  ||
+
+Execute (format indented table with colons):
+  TableFormat
+
+Expect (preserve colons to align text):
+    | left | right | center |   |
+    |:-----|------:|:------:|:--|
+    | left | right | center |   |