m-vim_plugins/vim-table-mode
1
0
Fork 0
mirror of https://github.com/dhruvasagar/vim-table-mode.git synced 2025-11-08 11:03:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed #25

Browse Source 
Minor refactoring & corrected variable names
This commit is contained in:
Dhruva Sagar
2014-04-23 11:27:25 +05:30
parent 7e00cea7f5
commit cfbac6979d
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/tablemode.vim
View File

@@ -104,7 +104,7 @@ function! tablemode#TableizeInsertMode() "{{{2
elseif tablemode#IsTableModeActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator) 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 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.*')) 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 normal! 0
call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.')) call search(repeat('[^' . g:table_mode_separator . ']*' . g:table_mode_separator, column) . '\s\{-\}' . repeat('.', position), 'ce', line('.'))
endif endif
@@ -135,7 +135,7 @@ function! tablemode#TableizeRange(...) range "{{{2
let lnum += 1 let lnum += 1
endwhile endwhile
call tablemode#table#TableRealign(lnum - 1) call tablemode#table#Realign(lnum - 1)
endfunction endfunction
function! tablemode#TableizeByDelimiter() "{{{2 function! tablemode#TableizeByDelimiter() "{{{2

4
autoload/tablemode/spreadsheet.vim
View File

@@ -202,7 +202,7 @@ function! tablemode#spreadsheet#DeleteColumn() "{{{2
normal! d normal! d
endfor endfor
call tablemode#table#TableRealign('.') call tablemode#table#Realign('.')
endif endif
endfunction endfunction
@@ -218,7 +218,7 @@ function! tablemode#spreadsheet#DeleteRow() "{{{2
endif endif
endfor endfor
call tablemode#table#TableRealign('.') call tablemode#table#Realign('.')
endif endif
endfunction endfunction

2
autoload/tablemode/spreadsheet/cell.vim
View File

@@ -207,7 +207,7 @@ function! tablemode#spreadsheet#cell#SetCell(val, ...) "{{{2
let line_value = sce . line_value . ece let line_value = sce . line_value . ece
endif endif
call setline(line, line_value) call setline(line, line_value)
call tablemode#table#TableRealign(line) call tablemode#table#Realign(line)
endif endif
endfunction endfunction
function! tablemode#spreadsheet#cell#TextObject(inner) "{{{2 function! tablemode#spreadsheet#cell#TextObject(inner) "{{{2

2
autoload/tablemode/table.vim
View File

@@ -147,7 +147,7 @@ function! tablemode#table#AddHeaderBorder(line) "{{{2
call setline(a:line, s:GenerateHeaderBorder(a:line)) call setline(a:line, s:GenerateHeaderBorder(a:line))
endfunction endfunction
function! tablemode#table#TableRealign(line) "{{{2 function! tablemode#table#Realign(line) "{{{2
let line = tablemode#utils#line(a:line) let line = tablemode#utils#line(a:line)
let [lnums, lines] = [[], []] let [lnums, lines] = [[], []]

6
plugin/table-mode.vim
View File

@@ -67,16 +67,16 @@ else
endif endif
" }}}2 " }}}2
command! -nargs=? -range Tableize <line1>,<line2>call tablemode#table#TableizeRange(<q-args>) command! -nargs=? -range Tableize <line1>,<line2>call tablemode#TableizeRange(<q-args>)
command! TableAddFormula call tablemode#spreadsheet#formula#Add() 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() command! TableEvalFormulaLine call tablemode#spreadsheet#formula#EvaluateFormulaLine()
nnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR> nnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR>
xnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR> xnoremap <silent> <Plug>(table-mode-tableize) :Tableize<CR>
xnoremap <silent> <Plug>(table-mode-tableize-delimiter) :<C-U>call tablemode#TableizeByDelimiter()<CR> xnoremap <silent> <Plug>(table-mode-tableize-delimiter) :<C-U>call tablemode#TableizeByDelimiter()<CR>
nnoremap <silent> <Plug>(table-mode-realign) :call tablemode#table#TableRealign('.')<CR> nnoremap <silent> <Plug>(table-mode-realign) :call tablemode#table#Realign('.')<CR>
nnoremap <silent> <Plug>(table-mode-motion-up) :<C-U>call tablemode#spreadsheet#cell#Motion('k')<CR> nnoremap <silent> <Plug>(table-mode-motion-up) :<C-U>call tablemode#spreadsheet#cell#Motion('k')<CR>
nnoremap <silent> <Plug>(table-mode-motion-down) :<C-U>call tablemode#spreadsheet#cell#Motion('j')<CR> nnoremap <silent> <Plug>(table-mode-motion-down) :<C-U>call tablemode#spreadsheet#cell#Motion('j')<CR>