From cfbac6979d0f8fda8603edcf9e01492d19f3203d Mon Sep 17 00:00:00 2001 From: Dhruva Sagar Date: Wed, 23 Apr 2014 11:27:25 +0530 Subject: [PATCH] Fixed #25 Minor refactoring & corrected variable names --- autoload/tablemode.vim | 4 ++-- autoload/tablemode/spreadsheet.vim | 4 ++-- autoload/tablemode/spreadsheet/cell.vim | 2 +- autoload/tablemode/table.vim | 2 +- plugin/table-mode.vim | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/autoload/tablemode.vim b/autoload/tablemode.vim index 4fc60a6..a173f6b 100644 --- a/autoload/tablemode.vim +++ b/autoload/tablemode.vim @@ -104,7 +104,7 @@ function! tablemode#TableizeInsertMode() "{{{2 elseif tablemode#IsTableModeActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator) let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g')) let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*')) - call tablemode#table#TableRealign('.') + call tablemode#table#Realign('.') normal! 0 call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.')) endif @@ -135,7 +135,7 @@ function! tablemode#TableizeRange(...) range "{{{2 let lnum += 1 endwhile - call tablemode#table#TableRealign(lnum - 1) + call tablemode#table#Realign(lnum - 1) endfunction function! tablemode#TableizeByDelimiter() "{{{2 diff --git a/autoload/tablemode/spreadsheet.vim b/autoload/tablemode/spreadsheet.vim index fec9d19..5ad0205 100644 --- a/autoload/tablemode/spreadsheet.vim +++ b/autoload/tablemode/spreadsheet.vim @@ -202,7 +202,7 @@ function! tablemode#spreadsheet#DeleteColumn() "{{{2 normal! d endfor - call tablemode#table#TableRealign('.') + call tablemode#table#Realign('.') endif endfunction @@ -218,7 +218,7 @@ function! tablemode#spreadsheet#DeleteRow() "{{{2 endif endfor - call tablemode#table#TableRealign('.') + call tablemode#table#Realign('.') endif endfunction diff --git a/autoload/tablemode/spreadsheet/cell.vim b/autoload/tablemode/spreadsheet/cell.vim index 2ec9b01..6ae0199 100644 --- a/autoload/tablemode/spreadsheet/cell.vim +++ b/autoload/tablemode/spreadsheet/cell.vim @@ -207,7 +207,7 @@ function! tablemode#spreadsheet#cell#SetCell(val, ...) "{{{2 let line_value = sce . line_value . ece endif call setline(line, line_value) - call tablemode#table#TableRealign(line) + call tablemode#table#Realign(line) endif endfunction function! tablemode#spreadsheet#cell#TextObject(inner) "{{{2 diff --git a/autoload/tablemode/table.vim b/autoload/tablemode/table.vim index b64193d..15c1f7f 100644 --- a/autoload/tablemode/table.vim +++ b/autoload/tablemode/table.vim @@ -147,7 +147,7 @@ function! tablemode#table#AddHeaderBorder(line) "{{{2 call setline(a:line, s:GenerateHeaderBorder(a:line)) endfunction -function! tablemode#table#TableRealign(line) "{{{2 +function! tablemode#table#Realign(line) "{{{2 let line = tablemode#utils#line(a:line) let [lnums, lines] = [[], []] diff --git a/plugin/table-mode.vim b/plugin/table-mode.vim index 58290df..cea283c 100644 --- a/plugin/table-mode.vim +++ b/plugin/table-mode.vim @@ -67,16 +67,16 @@ else endif " }}}2 -command! -nargs=? -range Tableize ,call tablemode#table#TableizeRange() +command! -nargs=? -range Tableize ,call tablemode#TableizeRange() command! TableAddFormula call tablemode#spreadsheet#formula#Add() -command! TableModeRealign call tablemode#spreadsheet#TableRealign('.') +command! TableModeRealign call tablemode#table#Realign('.') command! TableEvalFormulaLine call tablemode#spreadsheet#formula#EvaluateFormulaLine() nnoremap (table-mode-tableize) :Tableize xnoremap (table-mode-tableize) :Tableize xnoremap (table-mode-tableize-delimiter) :call tablemode#TableizeByDelimiter() -nnoremap (table-mode-realign) :call tablemode#table#TableRealign('.') +nnoremap (table-mode-realign) :call tablemode#table#Realign('.') nnoremap (table-mode-motion-up) :call tablemode#spreadsheet#cell#Motion('k') nnoremap (table-mode-motion-down) :call tablemode#spreadsheet#cell#Motion('j')