Plugins update, PySmell remove, some cosmetic changes in vimrc.

autoload/vimwiki_tbl.vim

@@ -1,3 +1,4 @@
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
 " Vimwiki autoload plugin file
 " Desc: Tables
 " | Easily | manageable | text  | tables | !       |
@@ -18,7 +19,19 @@ let s:textwidth = &tw
 
 " Misc functions {{{
 function! s:wide_len(str) "{{{
-  return strlen(substitute(a:str, '.', 'x', 'g'))
+  if !g:vimwiki_CJK_length
+    let ret = strlen(substitute(a:str, '.', 'x', 'g'))
+  else
+    let savemodified = &modified
+    let save_cursor = getpos('.')
+    exe "norm! o\<esc>"
+    call setline(line("."), a:str)
+    let ret = virtcol("$") - 1
+    d
+    call setpos('.', save_cursor)
+    let &modified = savemodified
+  endif
+  return ret
 endfunction "}}}
 
 function! s:is_table(line) "{{{
@@ -26,14 +39,31 @@ function! s:is_table(line) "{{{
 endfunction "}}}
 
 function! s:is_separator(line) "{{{
-  return a:line =~ '^\s*|\s*-\+'
+  return a:line =~ '^\s*[|+]\s*--[-|+]\+'
 endfunction "}}}
 
 function! s:is_last_column(lnum, cnum) "{{{
   return strpart(getline(a:lnum), a:cnum - 1) =~ '^[^|]*|\s*$'
 endfunction "}}}
 
-function! s:count_separators(lnum) "{{{
+function! s:is_first_column(lnum, cnum) "{{{
+  let line = strpart(getline(a:lnum), 0, a:cnum - 1)
+  return line =~ '^\s*|[^|]*$' || line =~ '^\s*$'
+endfunction "}}}
+
+function! s:count_separators_up(lnum) "{{{
+  let lnum = a:lnum - 1
+  while lnum > 1
+    if !s:is_separator(getline(lnum))
+      break
+    endif
+    let lnum -= 1
+  endwhile
+
+  return (a:lnum-lnum)
+endfunction "}}}
+
+function! s:count_separators_down(lnum) "{{{
   let lnum = a:lnum + 1
   while lnum < line('$')
     if !s:is_separator(getline(lnum))
@@ -78,19 +108,38 @@ function! s:create_row_sep(cols) "{{{
 endfunction "}}}
 
 function! s:get_values(line) "{{{
-  let cells = []
-  let cnt = 0
-  let idx = 0
-  while idx != -1 && idx < strlen(a:line) - 1
-    let cell = matchstr(a:line, '|\zs[^|]\+\ze|', idx)
-    let cell = substitute(cell, '^\s*\(.\{-}\)\s*$', '\1', 'g')
-    call add(cells, [cnt, cell])
-    let cnt += 1
-    let idx = matchend(a:line, '|\zs[^|]\+\ze|', idx)
-  endwhile
-  return cells
+  return split(a:line, '\s*|\s*', 1)[1:-2]
 endfunction "}}}
 
+function! s:col_count(lnum) "{{{
+  let line = getline(a:lnum)
+  if !s:is_separator(line)
+    return len(split(line, '\s*|\s*', 1)[1:-2])
+  else
+    return len(split(line, '-+-', 1))
+  endif
+endfunction "}}}
+
+function! s:get_indent(lnum) "{{{
+  if !s:is_table(getline(a:lnum))
+    return
+  endif
+
+  let indent = 0
+
+  let lnum = a:lnum - 1
+  while lnum > 1
+    let line = getline(lnum)
+    if !s:is_table(line)
+      let indent = indent(lnum+1)
+      break
+    endif
+    let lnum -= 1
+  endwhile
+
+  return indent
+endfunction " }}}
+
 function! s:get_rows(lnum) "{{{
   if !s:is_table(getline(a:lnum))
     return
@@ -131,29 +180,57 @@ function! s:get_cell_max_lens(lnum) "{{{
     if s:is_separator(row)
       continue
     endif
-    for [idx, cell] in s:get_values(row)
+    let cells = s:get_values(row)
+    for idx in range(len(cells))
+      let value = cells[idx]
       if has_key(max_lens, idx)
-        let max_lens[idx] = max([s:wide_len(cell), max_lens[idx]])
+        let max_lens[idx] = max([s:wide_len(value), max_lens[idx]])
       else
-        let max_lens[idx] = s:wide_len(cell)
+        let max_lens[idx] = s:wide_len(value)
       endif
     endfor
   endfor
   return max_lens
 endfunction "}}}
 
-function! s:get_aligned_rows(lnum, max_lens) "{{{
+function! s:get_aligned_rows(lnum, col1, col2) "{{{
+  let max_lens = s:get_cell_max_lens(a:lnum)
   let rows = []
   for [lnum, row] in s:get_rows(a:lnum)
     if s:is_separator(row)
-      let new_row = s:fmt_sep(a:max_lens)
+      let new_row = s:fmt_sep(max_lens, a:col1, a:col2)
     else
-      let new_row = s:fmt_row(row, a:max_lens)
+      let new_row = s:fmt_row(row, max_lens, a:col1, a:col2)
     endif
     call add(rows, [lnum, new_row])
   endfor
   return rows
 endfunction "}}}
+
+" Number of the current column. Starts from 0.
+function! s:cur_column() "{{{
+  let line = getline('.')
+  if !s:is_table(line)
+    return -1
+  endif
+  if s:is_separator(line)
+    let sep = '[+|]'
+  else
+    let sep = '|'
+  endif
+
+  let curs_pos = col('.')
+  let mpos = match(line, '|', 0)
+  let col = -1
+  while mpos < curs_pos && mpos != -1
+    let mpos = match(line, sep, mpos+1)
+    if mpos != -1
+      let col += 1
+    endif
+  endwhile
+  return col
+endfunction "}}}
+
 " }}}
 
 " Format functions {{{
@@ -169,14 +246,20 @@ function! s:fmt_cell(cell, max_len) "{{{
   return cell
 endfunction "}}}
 
-function! s:fmt_row(line, max_lens) "{{{
+function! s:fmt_row(line, max_lens, col1, col2) "{{{
   let new_line = '|'
-  let values = s:get_values(a:line)
-  for [idx, cell] in values
-    let new_line .= s:fmt_cell(cell, a:max_lens[idx]).'|'
+  let cells = s:get_values(a:line)
+  for idx in range(len(cells))
+    if idx == a:col1
+      let idx = a:col2
+    elseif idx == a:col2
+      let idx = a:col1
+    endif
+    let value = cells[idx]
+    let new_line .= s:fmt_cell(value, a:max_lens[idx]).'|'
   endfor
 
-  let idx = len(values)
+  let idx = len(cells)
   while idx < len(a:max_lens)
     let new_line .= s:fmt_cell('', a:max_lens[idx]).'|'
     let idx += 1
@@ -192,9 +275,14 @@ function! s:fmt_cell_sep(max_len) "{{{
   endif
 endfunction "}}}
 
-function! s:fmt_sep(max_lens) "{{{
+function! s:fmt_sep(max_lens, col1, col2) "{{{
   let sep = '|'
   for idx in range(len(a:max_lens))
+    if idx == a:col1
+      let idx = a:col2
+    elseif idx == a:col2
+      let idx = a:col1
+    endif
     let sep .= s:fmt_cell_sep(a:max_lens[idx]).'+'
   endfor
   let sep = substitute(sep, '+$', '|', '')
@@ -207,7 +295,7 @@ function! s:kbd_create_new_row(cols, goto_first) "{{{
   let cmd = "\<ESC>o".s:create_empty_row(a:cols)
   let cmd .= "\<ESC>:call vimwiki_tbl#format(line('.'))\<CR>"
   if a:goto_first
-    let cmd .= "0f|T|a"
+    let cmd .= "\<ESC>0:call search('|', 'c', line('.'))\<CR>la"
   else
     let cmd .= "0".(col('.')-1)."lT|a"
   endif
@@ -219,16 +307,27 @@ function! s:kbd_goto_next_row() "{{{
   return cmd
 endfunction "}}}
 
+function! s:kbd_goto_prev_row() "{{{
+  let cmd = "\<ESC>jt|T|a"
+  return cmd
+endfunction "}}}
+
 function! s:kbd_goto_next_col(last) "{{{
-  if col('.') == 1
-    let cmd = "\<ESC>la"
+  if a:last
+    let seps = s:count_separators_down(line('.'))
+    let cmd = "\<ESC>".seps."j0:call search('|', 'c', line('.'))\<CR>la"
   else
-    if a:last
-      let seps = s:count_separators(line('.'))
-      let cmd = "\<ESC>".seps."j0f|F|la"
-    else
-      let cmd = "\<ESC>f|la"
-    endif
+    let cmd = "\<ESC>:call search('|', 'c', line('.'))\<CR>la"
+  endif
+  return cmd
+endfunction "}}}
+
+function! s:kbd_goto_prev_col(first) "{{{
+  if a:first
+    let seps = s:count_separators_up(line('.'))
+    let cmd = "\<ESC>".seps."k$:call search('|', 'b', line('.'))\<CR>la"
+  else
+    let cmd = "\<ESC>2F|la"
   endif
   return cmd
 endfunction "}}}
@@ -264,15 +363,37 @@ function! vimwiki_tbl#kbd_tab() "{{{
   return s:kbd_goto_next_col(last)
 endfunction "}}}
 
-function! vimwiki_tbl#format(lnum) "{{{
+function! vimwiki_tbl#kbd_shift_tab() "{{{
+  let lnum = line('.')
+  if !s:is_table(getline(lnum))
+    return "\<S-Tab>"
+  endif
+
+  let first = s:is_first_column(lnum, col('.'))
+  if first && !s:is_table(getline(lnum-1))
+    return ""
+  endif
+  return s:kbd_goto_prev_col(first)
+endfunction "}}}
+
+function! vimwiki_tbl#format(lnum, ...) "{{{
   let line = getline(a:lnum)
   if !s:is_table(line)
     return
   endif
 
-  let max_lens = s:get_cell_max_lens(a:lnum)
+  if a:0 == 2
+    let col1 = a:1
+    let col2 = a:2
+  else
+    let col1 = 0
+    let col2 = 0
+  endif
 
-  for [lnum, row] in s:get_aligned_rows(a:lnum, max_lens)
+  let indent = s:get_indent(a:lnum)
+
+  for [lnum, row] in s:get_aligned_rows(a:lnum, col1, col2)
+    let row = repeat(' ', indent).row
     call setline(lnum, row)
   endfor
 
@@ -332,4 +453,52 @@ function! vimwiki_tbl#reset_tw(lnum) "{{{
   let &tw = 0
 endfunction "}}}
 
+" TODO: move_column_left and move_column_right are good candidates to be
+" refactored.
+function! vimwiki_tbl#move_column_left() "{{{
+  if !s:is_table(getline('.'))
+    return
+  endif
+
+  let cur_col = s:cur_column()
+  if cur_col == -1
+    return
+  endif
+
+  if cur_col > 0
+    call vimwiki_tbl#format(line('.'), cur_col-1, cur_col)
+    call cursor(line('.'), 1)
+    if !s:is_separator(getline('.'))
+      call search('\%(|[^|]\+\)\{'.(cur_col-1).'}| .', 'eW')
+    else
+      call search('|\%([^+]\++\)\{'.(cur_col-1).'}--', 'eW')
+    endif
+  endif
+endfunction "}}}
+
+function! vimwiki_tbl#move_column_right() "{{{
+  if !s:is_table(getline('.'))
+    return
+  endif
+
+  let cur_col = s:cur_column()
+  if cur_col == -1
+    return
+  endif
+
+  if cur_col < s:col_count(line('.'))-1
+    call vimwiki_tbl#format(line('.'), cur_col, cur_col+1)
+    call cursor(line('.'), 1)
+    if !s:is_separator(getline('.'))
+      call search('\%(|[^|]\+\)\{'.(cur_col+1).'}| .', 'eW')
+    else
+      call search('|\%([^+]\++\)\{'.(cur_col+1).'}--', 'eW')
+    endif
+  endif
+endfunction "}}}
+
+function! vimwiki_tbl#get_rows(lnum) "{{{
+  return s:get_rows(a:lnum)
+endfunction "}}}
+
 "}}}