mirror of
https://github.com/dhruvasagar/vim-table-mode.git
synced 2025-11-08 11:03:47 -05:00
Releasing v4.2.0
* Refactored cell & formula logic out into separate files * Added more tests to test things independently.
This commit is contained in:
@@ -1,4 +1,8 @@
|
|||||||
# Change Log
|
# Change Log
|
||||||
|
## Version 4.2.0
|
||||||
|
* Refactored cells logic out to autoload/tablemode/spreadsheet/cell.vim
|
||||||
|
* Refactored formula logic out to autoload/tablemode/spreadsheet/formula.vim
|
||||||
|
|
||||||
## Version 4.1.0
|
## Version 4.1.0
|
||||||
* Fixed bad references within plugin
|
* Fixed bad references within plugin
|
||||||
* Added fixtures
|
* Added fixtures
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# VIM Table Mode v4.1.0 [](https://travis-ci.org/dhruvasagar/vim-table-mode)
|
# VIM Table Mode v4.2.0 [](https://travis-ci.org/dhruvasagar/vim-table-mode)
|
||||||
|
|
||||||
An awesome automatic table creator & formatter allowing one to create neat
|
An awesome automatic table creator & formatter allowing one to create neat
|
||||||
tables as you type.
|
tables as you type.
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
||||||
" License: MIT (http://www.opensource.org/licenses/MIT)
|
" License: MIT (http://www.opensource.org/licenses/MIT)
|
||||||
" Website: https://github.com/dhruvasagar/vim-table-mode
|
" Website: https://github.com/dhruvasagar/vim-table-mode
|
||||||
" Version: 4.1.0
|
|
||||||
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
||||||
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
||||||
"
|
"
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
||||||
" License: MIT (http://www.opensource.org/licenses/MIT)
|
" License: MIT (http://www.opensource.org/licenses/MIT)
|
||||||
" Website: https://github.com/dhruvasagar/vim-table-mode
|
" Website: https://github.com/dhruvasagar/vim-table-mode
|
||||||
" Version: 4.1.0
|
|
||||||
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
||||||
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
||||||
"
|
"
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
||||||
" License: MIT (http://www.opensource.org/licenses/MIT)
|
" License: MIT (http://www.opensource.org/licenses/MIT)
|
||||||
" Website: https://github.com/dhruvasagar/vim-table-mode
|
" Website: https://github.com/dhruvasagar/vim-table-mode
|
||||||
" Version: 4.1.0
|
|
||||||
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
||||||
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
||||||
"
|
"
|
||||||
@@ -37,42 +36,6 @@ function! s:Average(list) "{{{2
|
|||||||
return s:Sum(a:list)/len(a:list)
|
return s:Sum(a:list)/len(a:list)
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
" function! s:ParseRange(range, ...) {{{2
|
|
||||||
" range: A string representing range of cells.
|
|
||||||
" - Can be row1:row2 for values in the current columns in those rows.
|
|
||||||
" - Can be row1,col1:row2,col2 for range between row1,col1 till
|
|
||||||
" row2,col2.
|
|
||||||
function! s:ParseRange(range, ...)
|
|
||||||
if a:0 < 1
|
|
||||||
let default_col = tablemode#spreadsheet#ColumnNr('.')
|
|
||||||
elseif a:0 < 2
|
|
||||||
let default_col = a:1
|
|
||||||
endif
|
|
||||||
|
|
||||||
if type(a:range) != type('')
|
|
||||||
let range = string(a:range)
|
|
||||||
else
|
|
||||||
let range = a:range
|
|
||||||
endif
|
|
||||||
|
|
||||||
let [rowcol1, rowcol2] = split(range, ':')
|
|
||||||
let [rcs1, rcs2] = [map(split(rowcol1, ','), 'str2nr(v:val)'), map(split(rowcol2, ','), 'str2nr(v:val)')]
|
|
||||||
|
|
||||||
if len(rcs1) == 2
|
|
||||||
let [row1, col1] = rcs1
|
|
||||||
else
|
|
||||||
let [row1, col1] = [rcs1[0], default_col]
|
|
||||||
endif
|
|
||||||
|
|
||||||
if len(rcs2) == 2
|
|
||||||
let [row2, col2] = rcs2
|
|
||||||
else
|
|
||||||
let [row2, col2] = [rcs2[0], default_col]
|
|
||||||
endif
|
|
||||||
|
|
||||||
return [row1, col1, row2, col2]
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Public Functions {{{1
|
" Public Functions {{{1
|
||||||
function! tablemode#spreadsheet#sid() "{{{2
|
function! tablemode#spreadsheet#sid() "{{{2
|
||||||
return maparg('<sid>', 'n')
|
return maparg('<sid>', 'n')
|
||||||
@@ -229,115 +192,6 @@ function! tablemode#spreadsheet#GetFirstRow(line) "{{{2
|
|||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
" function! tablemode#spreadsheet#GetCells() - Function to get values of cells in a table {{{2
|
|
||||||
" tablemode#spreadsheet#GetCells(row) - Get values of all cells in a row as a List.
|
|
||||||
" tablemode#spreadsheet#GetCells(0, col) - Get values of all cells in a column as a List.
|
|
||||||
" tablemode#spreadsheet#GetCells(row, col) - Get the value of table cell by given row, col.
|
|
||||||
function! tablemode#spreadsheet#GetCells(line, ...) abort
|
|
||||||
let line = tablemode#utils#line(a:line)
|
|
||||||
|
|
||||||
if tablemode#table#IsATableRow(line)
|
|
||||||
if a:0 < 1
|
|
||||||
let [row, colm] = [line, 0]
|
|
||||||
elseif a:0 < 2
|
|
||||||
let [row, colm] = [a:1, 0]
|
|
||||||
elseif a:0 < 3
|
|
||||||
let [row, colm] = a:000
|
|
||||||
endif
|
|
||||||
|
|
||||||
let first_row = tablemode#spreadsheet#GetFirstRow(line)
|
|
||||||
if row == 0
|
|
||||||
let values = []
|
|
||||||
let line = first_row
|
|
||||||
while tablemode#table#IsATableRow(line) || tablemode#table#IsATableHeader(line)
|
|
||||||
if tablemode#table#IsATableRow(line)
|
|
||||||
let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
|
|
||||||
call add(values, tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, '')))
|
|
||||||
endif
|
|
||||||
let line += 1
|
|
||||||
endwhile
|
|
||||||
return values
|
|
||||||
else
|
|
||||||
let row_nr = 0
|
|
||||||
let line = first_row
|
|
||||||
while tablemode#table#IsATableRow(line) || tablemode#table#IsATableHeader(line)
|
|
||||||
if tablemode#table#IsATableRow(line)
|
|
||||||
let row_nr += 1
|
|
||||||
if row ==# row_nr | break | endif
|
|
||||||
endif
|
|
||||||
let line += 1
|
|
||||||
endwhile
|
|
||||||
|
|
||||||
let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
|
|
||||||
if colm == 0
|
|
||||||
return map(split(row_line, g:table_mode_separator), 'tablemode#utils#strip(v:val)')
|
|
||||||
else
|
|
||||||
let split_line = split(row_line, g:table_mode_separator)
|
|
||||||
return tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, ''))
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#GetCell(...) "{{{2
|
|
||||||
if a:0 == 0
|
|
||||||
let [row, colm] = [tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
|
|
||||||
elseif a:0 == 2
|
|
||||||
let [row, colm] = [a:1, a:2]
|
|
||||||
endif
|
|
||||||
|
|
||||||
return tablemode#spreadsheet#GetCells('.', row, colm)
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#GetRow(row, ...) abort "{{{2
|
|
||||||
let line = a:0 < 1 ? '.' : a:1
|
|
||||||
return tablemode#spreadsheet#GetCells(line, a:row)
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#GetRowColumn(col, ...) abort "{{{2
|
|
||||||
let line = a:0 < 1 ? '.' : a:1
|
|
||||||
let row = tablemode#RowNr('.')
|
|
||||||
return tablemode#spreadsheet#GetCells(line, row, a:col)
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#GetColumn(col, ...) abort "{{{2
|
|
||||||
let line = a:0 < 1 ? '.' : a:1
|
|
||||||
return tablemode#spreadsheet#GetCells(line, 0, a:col)
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#GetColumnRow(row, ...) abort "{{{2
|
|
||||||
let line = a:0 < 1 ? '.' : a:1
|
|
||||||
let col = tablemode#spreadsheet#ColumnNr('.')
|
|
||||||
return tablemode#spreadsheet#GetCells(line, a:row, col)
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#SetCell(val, ...) "{{{2
|
|
||||||
if a:0 == 0
|
|
||||||
let [line, row, colm] = ['.', tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
|
|
||||||
elseif a:0 == 2
|
|
||||||
let [line, row, colm] = ['.', a:1, a:2]
|
|
||||||
elseif a:0 == 3
|
|
||||||
let [line, row, colm] = a:000
|
|
||||||
endif
|
|
||||||
|
|
||||||
if tablemode#table#IsATableRow(line)
|
|
||||||
let line = tablemode#utils#line(line) + (row - tablemode#spreadsheet#RowNr(line)) * 1
|
|
||||||
let line_val = getline(line)
|
|
||||||
let cstartexpr = tablemode#table#StartCommentExpr()
|
|
||||||
let values = split(getline(line)[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator)
|
|
||||||
if len(values) < colm | return | endif
|
|
||||||
let values[colm-1] = a:val
|
|
||||||
let line_value = g:table_mode_separator . join(values, g:table_mode_separator) . g:table_mode_separator
|
|
||||||
if tablemode#utils#strlen(cstartexpr) > 0 && line_val =~# cstartexpr
|
|
||||||
let sce = matchstr(line_val, tablemode#table#StartCommentExpr())
|
|
||||||
let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
|
|
||||||
let line_value = sce . line_value . ece
|
|
||||||
endif
|
|
||||||
call setline(line, line_value)
|
|
||||||
call tablemode#table#TableRealign(line)
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#DeleteColumn() "{{{2
|
function! tablemode#spreadsheet#DeleteColumn() "{{{2
|
||||||
if tablemode#table#IsATableRow('.')
|
if tablemode#table#IsATableRow('.')
|
||||||
for i in range(v:count1)
|
for i in range(v:count1)
|
||||||
@@ -368,171 +222,16 @@ function! tablemode#spreadsheet#DeleteRow() "{{{2
|
|||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! tablemode#spreadsheet#GetCellRange(range, ...) abort "{{{2
|
|
||||||
if a:0 < 1
|
|
||||||
let [line, colm] = ['.', tablemode#spreadsheet#ColumnNr('.')]
|
|
||||||
elseif a:0 < 2
|
|
||||||
let [line, colm] = [a:1, tablemode#spreadsheet#ColumnNr('.')]
|
|
||||||
elseif a:0 < 3
|
|
||||||
let [line, colm] = [a:1, a:2]
|
|
||||||
else
|
|
||||||
call tablemode#utils#throw('Invalid Range')
|
|
||||||
endif
|
|
||||||
|
|
||||||
let values = []
|
|
||||||
|
|
||||||
if tablemode#table#IsATableRow(line)
|
|
||||||
let [row1, col1, row2, col2] = s:ParseRange(a:range, colm)
|
|
||||||
|
|
||||||
if row1 == row2
|
|
||||||
if col1 == col2
|
|
||||||
call add(values, tablemode#spreadsheet#GetCells(line, row1, col1))
|
|
||||||
else
|
|
||||||
let values = tablemode#spreadsheet#GetRow(row1, line)[(col1-1):(col2-1)]
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
if col1 == col2
|
|
||||||
let values = tablemode#spreadsheet#GetColumn(col1, line)[(row1-1):(row2-1)]
|
|
||||||
else
|
|
||||||
let tcol = col1
|
|
||||||
while tcol <= col2
|
|
||||||
call add(values, tablemode#spreadsheet#GetColumn(tcol, line)[(row1-1):(row2-1)])
|
|
||||||
let tcol += 1
|
|
||||||
endwhile
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
return values
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#Sum(range, ...) abort "{{{2
|
function! tablemode#spreadsheet#Sum(range, ...) abort "{{{2
|
||||||
let args = copy(a:000)
|
let args = copy(a:000)
|
||||||
call insert(args, a:range)
|
call insert(args, a:range)
|
||||||
return s:Sum(call('tablemode#spreadsheet#GetCellRange', args))
|
return s:Sum(call('tablemode#spreadsheet#cell#GetCellRange', args))
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! tablemode#spreadsheet#Average(range, ...) abort "{{{2
|
function! tablemode#spreadsheet#Average(range, ...) abort "{{{2
|
||||||
let args = copy(a:000)
|
let args = copy(a:000)
|
||||||
call insert(args, a:range)
|
call insert(args, a:range)
|
||||||
return s:Average(call('tablemode#spreadsheet#GetCellRange', args))
|
return s:Average(call('tablemode#spreadsheet#cell#GetCellRange', args))
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#AddFormula(...) "{{{2
|
|
||||||
let fr = a:0 ? a:1 : input('f=')
|
|
||||||
let row = tablemode#spreadsheet#RowNr('.')
|
|
||||||
let colm = tablemode#spreadsheet#ColumnNr('.')
|
|
||||||
let indent = indent('.')
|
|
||||||
let indent_str = repeat(' ', indent)
|
|
||||||
|
|
||||||
if fr !=# ''
|
|
||||||
let fr = '$' . row . ',' . colm . '=' . fr
|
|
||||||
let fline = tablemode#spreadsheet#GetLastRow('.') + 1
|
|
||||||
if tablemode#table#IsATableHeader(fline) | let fline += 1 | endif
|
|
||||||
let cursor_pos = [line('.'), col('.')]
|
|
||||||
if getline(fline) =~# 'tmf: '
|
|
||||||
" Comment line correctly
|
|
||||||
let line_val = getline(fline)
|
|
||||||
let line_expr = line_val[match(line_val, tablemode#table#StartCommentExpr()):match(line_val, tablemode#table#EndCommentExpr())]
|
|
||||||
let sce = matchstr(line_val, tablemode#table#StartCommentExpr() . '\zs')
|
|
||||||
let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
|
|
||||||
call setline(fline, sce . line_expr . '; ' . fr . ece)
|
|
||||||
else
|
|
||||||
let cstring = &commentstring
|
|
||||||
let [cmss, cmse] = ['', '']
|
|
||||||
if len(cstring) > 0
|
|
||||||
let cms = split(cstring, '%s')
|
|
||||||
if len(cms) == 2
|
|
||||||
let [cmss, cmse] = cms
|
|
||||||
else
|
|
||||||
let [cmss, cmse] = [cms[0], '']
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
let fr = indent_str . cmss . ' tmf: ' . fr . ' ' . cmse
|
|
||||||
call append(fline-1, fr)
|
|
||||||
call cursor(cursor_pos)
|
|
||||||
endif
|
|
||||||
call tablemode#spreadsheet#EvaluateFormulaLine()
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#EvaluateExpr(expr, line) abort "{{{2
|
|
||||||
let line = tablemode#utils#line(a:line)
|
|
||||||
let [target, expr] = map(split(a:expr, '='), 'tablemode#utils#strip(v:val)')
|
|
||||||
let cell = substitute(target, '\$', '', '')
|
|
||||||
if cell =~# ','
|
|
||||||
let [row, colm] = map(split(cell, ','), 'str2nr(v:val)')
|
|
||||||
else
|
|
||||||
let [row, colm] = [0, str2nr(cell)]
|
|
||||||
endif
|
|
||||||
|
|
||||||
if expr =~# 'Sum(.*)'
|
|
||||||
let expr = substitute(expr, 'Sum(\([^)]*\))', 'tablemode#spreadsheet#Sum("\1",'.line.','.colm.')', 'g')
|
|
||||||
endif
|
|
||||||
|
|
||||||
if expr =~# 'Average(.*)'
|
|
||||||
let expr = substitute(expr, 'Average(\([^)]*\))', 'tablemode#spreadsheet#Average("\1",'.line.','.colm.')', 'g')
|
|
||||||
endif
|
|
||||||
|
|
||||||
if expr =~# '\$\d\+,\d\+'
|
|
||||||
let expr = substitute(expr, '\$\(\d\+\),\(\d\+\)',
|
|
||||||
\ '\=str2float(tablemode#spreadsheet#GetCells(line, submatch(1), submatch(2)))', 'g')
|
|
||||||
endif
|
|
||||||
|
|
||||||
if cell =~# ','
|
|
||||||
if expr =~# '\$'
|
|
||||||
let expr = substitute(expr, '\$\(\d\+\)',
|
|
||||||
\ '\=str2float(tablemode#spreadsheet#GetCells(line, row, submatch(1)))', 'g')
|
|
||||||
endif
|
|
||||||
call tablemode#spreadsheet#SetCell(eval(expr), line, row, colm)
|
|
||||||
else
|
|
||||||
let [row, line] = [1, tablemode#spreadsheet#GetFirstRow(line)]
|
|
||||||
while tablemode#table#IsATableRow(line)
|
|
||||||
let texpr = expr
|
|
||||||
if expr =~# '\$'
|
|
||||||
let texpr = substitute(texpr, '\$\(\d\+\)',
|
|
||||||
\ '\=str2float(tablemode#spreadsheet#GetCells(line, row, submatch(1)))', 'g')
|
|
||||||
endif
|
|
||||||
|
|
||||||
call tablemode#spreadsheet#SetCell(eval(texpr), line, row, colm)
|
|
||||||
let row += 1
|
|
||||||
let line += 1
|
|
||||||
endwhile
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! tablemode#spreadsheet#EvaluateFormulaLine() abort "{{{2
|
|
||||||
let exprs = []
|
|
||||||
let cstring = &commentstring
|
|
||||||
let matchexpr = ''
|
|
||||||
if len(cstring) > 0
|
|
||||||
let cms = split(cstring, '%s')
|
|
||||||
if len(cms) == 2
|
|
||||||
let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*\ze' . escape(cms[1], '/*') . '\s*$'
|
|
||||||
else
|
|
||||||
let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*$'
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
let matchexpr = '^\s* tmf: \zs.*$'
|
|
||||||
endif
|
|
||||||
if tablemode#table#IsATableRow('.') " We're inside the table
|
|
||||||
let line = tablemode#spreadsheet#GetLastRow('.')
|
|
||||||
let fline = line + 1
|
|
||||||
if tablemode#table#IsATableHeader(fline) | let fline += 1 | endif
|
|
||||||
if getline(fline) =~# 'tmf: '
|
|
||||||
let exprs = split(matchstr(getline(fline), matchexpr), ';')
|
|
||||||
endif
|
|
||||||
elseif getline('.') =~# 'tmf: ' " We're on the formula line
|
|
||||||
let line = line('.') - 1
|
|
||||||
if tablemode#table#IsATableHeader(line) | let line -= 1 | endif
|
|
||||||
if tablemode#table#IsATableRow(line)
|
|
||||||
let exprs = split(matchstr(getline('.'), matchexpr), ';')
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
for expr in exprs
|
|
||||||
call tablemode#spreadsheet#EvaluateExpr(expr, line)
|
|
||||||
endfor
|
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! tablemode#spreadsheet#CellTextObject(inner) "{{{2
|
function! tablemode#spreadsheet#CellTextObject(inner) "{{{2
|
||||||
|
|||||||
279
autoload/tablemode/spreadsheet/cell.vim
Normal file
279
autoload/tablemode/spreadsheet/cell.vim
Normal file
@@ -0,0 +1,279 @@
|
|||||||
|
" ============================== Header ======================================
|
||||||
|
" File: autoload/tablemode/spreadsheet/cell.vim
|
||||||
|
" Description: Table mode for vim for creating neat tables.
|
||||||
|
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
||||||
|
" License: MIT (http://www.opensource.org/licenses/MIT)
|
||||||
|
" Website: https://github.com/dhruvasagar/vim-table-mode
|
||||||
|
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
||||||
|
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
||||||
|
"
|
||||||
|
" Copyright Notice:
|
||||||
|
" Permission is hereby granted to use and distribute this code,
|
||||||
|
" with or without modifications, provided that this copyright
|
||||||
|
" notice is copied with it. Like anything else that's free,
|
||||||
|
" table-mode.vim is provided *as is* and comes with no warranty
|
||||||
|
" of any kind, either expressed or implied. In no event will
|
||||||
|
" the copyright holder be liable for any damamges resulting
|
||||||
|
" from the use of this software.
|
||||||
|
" =============================================================================
|
||||||
|
" Private Functions {{{1
|
||||||
|
" function! s:ParseRange(range, ...) {{{2
|
||||||
|
" range: A string representing range of cells.
|
||||||
|
" - Can be row1:row2 for values in the current columns in those rows.
|
||||||
|
" - Can be row1,col1:row2,col2 for range between row1,col1 till
|
||||||
|
" row2,col2.
|
||||||
|
function! s:ParseRange(range, ...)
|
||||||
|
if a:0 < 1
|
||||||
|
let default_col = tablemode#spreadsheet#ColumnNr('.')
|
||||||
|
elseif a:0 < 2
|
||||||
|
let default_col = a:1
|
||||||
|
endif
|
||||||
|
|
||||||
|
if type(a:range) != type('')
|
||||||
|
let range = string(a:range)
|
||||||
|
else
|
||||||
|
let range = a:range
|
||||||
|
endif
|
||||||
|
|
||||||
|
let [rowcol1, rowcol2] = split(range, ':')
|
||||||
|
let [rcs1, rcs2] = [map(split(rowcol1, ','), 'str2nr(v:val)'), map(split(rowcol2, ','), 'str2nr(v:val)')]
|
||||||
|
|
||||||
|
if len(rcs1) == 2
|
||||||
|
let [row1, col1] = rcs1
|
||||||
|
else
|
||||||
|
let [row1, col1] = [rcs1[0], default_col]
|
||||||
|
endif
|
||||||
|
|
||||||
|
if len(rcs2) == 2
|
||||||
|
let [row2, col2] = rcs2
|
||||||
|
else
|
||||||
|
let [row2, col2] = [rcs2[0], default_col]
|
||||||
|
endif
|
||||||
|
|
||||||
|
return [row1, col1, row2, col2]
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
|
||||||
|
" Public Functions {{{1
|
||||||
|
function! tablemode#spreadsheet#cell#sid() "{{{2
|
||||||
|
return maparg('<sid>', 'n')
|
||||||
|
endfunction
|
||||||
|
nnoremap <sid> <sid>
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#cell#scope() "{{{2
|
||||||
|
return s:
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" function! tablemode#spreadsheet#cell#GetCells() - Function to get values of cells in a table {{{2
|
||||||
|
" tablemode#spreadsheet#GetCells(row) - Get values of all cells in a row as a List.
|
||||||
|
" tablemode#spreadsheet#GetCells(0, col) - Get values of all cells in a column as a List.
|
||||||
|
" tablemode#spreadsheet#GetCells(row, col) - Get the value of table cell by given row, col.
|
||||||
|
function! tablemode#spreadsheet#cell#GetCells(line, ...) abort
|
||||||
|
let line = tablemode#utils#line(a:line)
|
||||||
|
|
||||||
|
if tablemode#table#IsATableRow(line)
|
||||||
|
if a:0 < 1
|
||||||
|
let [row, colm] = [line, 0]
|
||||||
|
elseif a:0 < 2
|
||||||
|
let [row, colm] = [a:1, 0]
|
||||||
|
elseif a:0 < 3
|
||||||
|
let [row, colm] = a:000
|
||||||
|
endif
|
||||||
|
|
||||||
|
let first_row = tablemode#spreadsheet#GetFirstRow(line)
|
||||||
|
if row == 0
|
||||||
|
let values = []
|
||||||
|
let line = first_row
|
||||||
|
while tablemode#table#IsATableRow(line) || tablemode#table#IsATableHeader(line)
|
||||||
|
if tablemode#table#IsATableRow(line)
|
||||||
|
let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
|
||||||
|
call add(values, tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, '')))
|
||||||
|
endif
|
||||||
|
let line += 1
|
||||||
|
endwhile
|
||||||
|
return values
|
||||||
|
else
|
||||||
|
let row_nr = 0
|
||||||
|
let line = first_row
|
||||||
|
while tablemode#table#IsATableRow(line) || tablemode#table#IsATableHeader(line)
|
||||||
|
if tablemode#table#IsATableRow(line)
|
||||||
|
let row_nr += 1
|
||||||
|
if row ==# row_nr | break | endif
|
||||||
|
endif
|
||||||
|
let line += 1
|
||||||
|
endwhile
|
||||||
|
|
||||||
|
let row_line = getline(line)[stridx(getline(line), g:table_mode_separator):strridx(getline(line), g:table_mode_separator)]
|
||||||
|
if colm == 0
|
||||||
|
return map(split(row_line, g:table_mode_separator), 'tablemode#utils#strip(v:val)')
|
||||||
|
else
|
||||||
|
let split_line = split(row_line, g:table_mode_separator)
|
||||||
|
return tablemode#utils#strip(get(split(row_line, g:table_mode_separator), colm>0?colm-1:colm, ''))
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#cell#GetCell(...) "{{{2
|
||||||
|
if a:0 == 0
|
||||||
|
let [row, colm] = [tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
|
||||||
|
elseif a:0 == 2
|
||||||
|
let [row, colm] = [a:1, a:2]
|
||||||
|
endif
|
||||||
|
|
||||||
|
return tablemode#spreadsheet#cell#GetCells('.', row, colm)
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#cell#GetRow(row, ...) abort "{{{2
|
||||||
|
let line = a:0 < 1 ? '.' : a:1
|
||||||
|
return tablemode#spreadsheet#cell#GetCells(line, a:row)
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#cell#GetCellRange(range, ...) abort "{{{2
|
||||||
|
if a:0 < 1
|
||||||
|
let [line, colm] = ['.', tablemode#spreadsheet#ColumnNr('.')]
|
||||||
|
elseif a:0 < 2
|
||||||
|
let [line, colm] = [a:1, tablemode#spreadsheet#ColumnNr('.')]
|
||||||
|
elseif a:0 < 3
|
||||||
|
let [line, colm] = [a:1, a:2]
|
||||||
|
else
|
||||||
|
call tablemode#utils#throw('Invalid Range')
|
||||||
|
endif
|
||||||
|
|
||||||
|
let values = []
|
||||||
|
|
||||||
|
if tablemode#table#IsATableRow(line)
|
||||||
|
let [row1, col1, row2, col2] = s:ParseRange(a:range, colm)
|
||||||
|
|
||||||
|
if row1 == row2
|
||||||
|
if col1 == col2
|
||||||
|
call add(values, tablemode#spreadsheet#cell#GetCells(line, row1, col1))
|
||||||
|
else
|
||||||
|
let values = tablemode#spreadsheet#cell#GetRow(row1, line)[(col1-1):(col2-1)]
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if col1 == col2
|
||||||
|
let values = tablemode#spreadsheet#cell#GetColumn(col1, line)[(row1-1):(row2-1)]
|
||||||
|
else
|
||||||
|
let tcol = col1
|
||||||
|
while tcol <= col2
|
||||||
|
call add(values, tablemode#spreadsheet#cell#GetColumn(tcol, line)[(row1-1):(row2-1)])
|
||||||
|
let tcol += 1
|
||||||
|
endwhile
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
return values
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#cell#GetRowColumn(col, ...) abort "{{{2
|
||||||
|
let line = a:0 < 1 ? '.' : a:1
|
||||||
|
let row = tablemode#spreadsheet#RowNr('.')
|
||||||
|
return tablemode#spreadsheet#cell#GetCells(line, row, a:col)
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#cell#GetColumn(col, ...) abort "{{{2
|
||||||
|
let line = a:0 < 1 ? '.' : a:1
|
||||||
|
return tablemode#spreadsheet#cell#GetCells(line, 0, a:col)
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#cell#GetColumnRow(row, ...) abort "{{{2
|
||||||
|
let line = a:0 < 1 ? '.' : a:1
|
||||||
|
let col = tablemode#spreadsheet#ColumnNr('.')
|
||||||
|
return tablemode#spreadsheet#cell#GetCells(line, a:row, col)
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#cell#SetCell(val, ...) "{{{2
|
||||||
|
if a:0 == 0
|
||||||
|
let [line, row, colm] = ['.', tablemode#spreadsheet#RowNr('.'), tablemode#spreadsheet#ColumnNr('.')]
|
||||||
|
elseif a:0 == 2
|
||||||
|
let [line, row, colm] = ['.', a:1, a:2]
|
||||||
|
elseif a:0 == 3
|
||||||
|
let [line, row, colm] = a:000
|
||||||
|
endif
|
||||||
|
|
||||||
|
if tablemode#table#IsATableRow(line)
|
||||||
|
let line = tablemode#utils#line(line) + (row - tablemode#spreadsheet#RowNr(line)) * 1
|
||||||
|
let line_val = getline(line)
|
||||||
|
let cstartexpr = tablemode#table#StartCommentExpr()
|
||||||
|
let values = split(getline(line)[stridx(line_val, g:table_mode_separator):strridx(line_val, g:table_mode_separator)], g:table_mode_separator)
|
||||||
|
if len(values) < colm | return | endif
|
||||||
|
let values[colm-1] = a:val
|
||||||
|
let line_value = g:table_mode_separator . join(values, g:table_mode_separator) . g:table_mode_separator
|
||||||
|
if tablemode#utils#strlen(cstartexpr) > 0 && line_val =~# cstartexpr
|
||||||
|
let sce = matchstr(line_val, tablemode#table#StartCommentExpr())
|
||||||
|
let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
|
||||||
|
let line_value = sce . line_value . ece
|
||||||
|
endif
|
||||||
|
call setline(line, line_value)
|
||||||
|
call tablemode#table#TableRealign(line)
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
function! tablemode#spreadsheet#cell#TextObject(inner) "{{{2
|
||||||
|
if tablemode#table#IsATableRow('.')
|
||||||
|
call tablemode#spreadsheet#MoveToStartOfCell()
|
||||||
|
if a:inner
|
||||||
|
normal! v
|
||||||
|
call search('[^' . g:table_mode_separator . ']\ze\s*' . g:table_mode_separator)
|
||||||
|
else
|
||||||
|
execute 'normal! vf' . g:table_mode_separator . 'l'
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
function! tablemode#spreadsheet#cell#Motion(direction, ...) "{{{2
|
||||||
|
let l:count = a:0 ? a:1 : v:count1
|
||||||
|
if tablemode#table#IsATableRow('.')
|
||||||
|
for ii in range(l:count)
|
||||||
|
if a:direction ==# 'l'
|
||||||
|
if tablemode#spreadsheet#IsLastCell()
|
||||||
|
if !tablemode#table#IsATableRow(line('.') + 1) && (tablemode#table#IsATableHeader(line('.') + 1) && !tablemode#table#IsATableRow(line('.') + 2))
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
call tablemode#spreadsheet#cell#Motion('j', 1)
|
||||||
|
normal! 0
|
||||||
|
endif
|
||||||
|
|
||||||
|
" If line starts with g:table_mode_separator
|
||||||
|
if getline('.')[col('.')-1] ==# g:table_mode_separator
|
||||||
|
normal! 2l
|
||||||
|
else
|
||||||
|
execute 'normal! f' . g:table_mode_separator . '2l'
|
||||||
|
endif
|
||||||
|
elseif a:direction ==# 'h'
|
||||||
|
if tablemode#spreadsheet#IsFirstCell()
|
||||||
|
if !tablemode#table#IsATableRow(line('.') - 1) && (tablemode#table#IsATableHeader(line('.') - 1) && !tablemode#table#IsATableRow(line('.') - 2))
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
call tablemode#spreadsheet#cell#Motion('k', 1)
|
||||||
|
normal! $
|
||||||
|
endif
|
||||||
|
|
||||||
|
" If line ends with g:table_mode_separator
|
||||||
|
if getline('.')[col('.')-1] ==# g:table_mode_separator
|
||||||
|
execute 'normal! F' . g:table_mode_separator . '2l'
|
||||||
|
else
|
||||||
|
execute 'normal! 2F' . g:table_mode_separator . '2l'
|
||||||
|
endif
|
||||||
|
elseif a:direction ==# 'j'
|
||||||
|
if tablemode#table#IsATableRow(line('.') + 1)
|
||||||
|
" execute 'normal! ' . 1 . 'j'
|
||||||
|
normal! j
|
||||||
|
elseif tablemode#table#IsATableHeader(line('.') + 1) && tablemode#table#IsATableRow(line('.') + 2)
|
||||||
|
" execute 'normal! ' . 2 . 'j'
|
||||||
|
normal! 2j
|
||||||
|
endif
|
||||||
|
elseif a:direction ==# 'k'
|
||||||
|
if tablemode#table#IsATableRow(line('.') - 1)
|
||||||
|
" execute 'normal! ' . 1 . 'k'
|
||||||
|
normal! k
|
||||||
|
elseif tablemode#table#IsATableHeader(line('.') - 1) && tablemode#table#IsATableRow(line('.') - 2)
|
||||||
|
" execute 'normal! ' . (1 + 1) . 'k'
|
||||||
|
normal! 2k
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfor
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" vim: sw=2 sts=2 fdl=0 fdm=marker
|
||||||
147
autoload/tablemode/spreadsheet/formula.vim
Normal file
147
autoload/tablemode/spreadsheet/formula.vim
Normal file
@@ -0,0 +1,147 @@
|
|||||||
|
" ============================== Header ======================================
|
||||||
|
" File: autoload/tablemode/spreadsheet/formula.vim
|
||||||
|
" Description: Table mode for vim for creating neat tables.
|
||||||
|
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
||||||
|
" License: MIT (http://www.opensource.org/licenses/MIT)
|
||||||
|
" Website: https://github.com/dhruvasagar/vim-table-mode
|
||||||
|
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
||||||
|
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
||||||
|
"
|
||||||
|
" Copyright Notice:
|
||||||
|
" Permission is hereby granted to use and distribute this code,
|
||||||
|
" with or without modifications, provided that this copyright
|
||||||
|
" notice is copied with it. Like anything else that's free,
|
||||||
|
" table-mode.vim is provided *as is* and comes with no warranty
|
||||||
|
" of any kind, either expressed or implied. In no event will
|
||||||
|
" the copyright holder be liable for any damamges resulting
|
||||||
|
" from the use of this software.
|
||||||
|
" =============================================================================
|
||||||
|
|
||||||
|
" Private Functions {{{1
|
||||||
|
|
||||||
|
" Public Functions {{{1
|
||||||
|
function! tablemode#spreadsheet#formula#sid() "{{{2
|
||||||
|
return maparg('<sid>', 'n')
|
||||||
|
endfunction
|
||||||
|
nnoremap <sid> <sid>
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#formula#scope() "{{{2
|
||||||
|
return s:
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#formula#Add(...) "{{{2
|
||||||
|
let fr = a:0 ? a:1 : input('f=')
|
||||||
|
let row = tablemode#spreadsheet#RowNr('.')
|
||||||
|
let colm = tablemode#spreadsheet#ColumnNr('.')
|
||||||
|
let indent = indent('.')
|
||||||
|
let indent_str = repeat(' ', indent)
|
||||||
|
|
||||||
|
if fr !=# ''
|
||||||
|
let fr = '$' . row . ',' . colm . '=' . fr
|
||||||
|
let fline = tablemode#spreadsheet#GetLastRow('.') + 1
|
||||||
|
if tablemode#table#IsATableHeader(fline) | let fline += 1 | endif
|
||||||
|
let cursor_pos = [line('.'), col('.')]
|
||||||
|
if getline(fline) =~# 'tmf: '
|
||||||
|
" Comment line correctly
|
||||||
|
let line_val = getline(fline)
|
||||||
|
let line_expr = line_val[match(line_val, tablemode#table#StartCommentExpr()):match(line_val, tablemode#table#EndCommentExpr())]
|
||||||
|
let sce = matchstr(line_val, tablemode#table#StartCommentExpr() . '\zs')
|
||||||
|
let ece = matchstr(line_val, tablemode#table#EndCommentExpr())
|
||||||
|
call setline(fline, sce . line_expr . '; ' . fr . ece)
|
||||||
|
else
|
||||||
|
let cstring = &commentstring
|
||||||
|
let [cmss, cmse] = ['', '']
|
||||||
|
if len(cstring) > 0
|
||||||
|
let cms = split(cstring, '%s')
|
||||||
|
if len(cms) == 2
|
||||||
|
let [cmss, cmse] = cms
|
||||||
|
else
|
||||||
|
let [cmss, cmse] = [cms[0], '']
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
let fr = indent_str . cmss . ' tmf: ' . fr . ' ' . cmse
|
||||||
|
call append(fline-1, fr)
|
||||||
|
call cursor(cursor_pos)
|
||||||
|
endif
|
||||||
|
call tablemode#spreadsheet#formula#EvaluateFormulaLine()
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#formula#EvaluateExpr(expr, line) abort "{{{2
|
||||||
|
let line = tablemode#utils#line(a:line)
|
||||||
|
let [target, expr] = map(split(a:expr, '='), 'tablemode#utils#strip(v:val)')
|
||||||
|
let cell = substitute(target, '\$', '', '')
|
||||||
|
if cell =~# ','
|
||||||
|
let [row, colm] = map(split(cell, ','), 'str2nr(v:val)')
|
||||||
|
else
|
||||||
|
let [row, colm] = [0, str2nr(cell)]
|
||||||
|
endif
|
||||||
|
|
||||||
|
if expr =~# 'Sum(.*)'
|
||||||
|
let expr = substitute(expr, 'Sum(\([^)]*\))', 'tablemode#spreadsheet#Sum("\1",'.line.','.colm.')', 'g')
|
||||||
|
endif
|
||||||
|
|
||||||
|
if expr =~# 'Average(.*)'
|
||||||
|
let expr = substitute(expr, 'Average(\([^)]*\))', 'tablemode#spreadsheet#Average("\1",'.line.','.colm.')', 'g')
|
||||||
|
endif
|
||||||
|
|
||||||
|
if expr =~# '\$\d\+,\d\+'
|
||||||
|
let expr = substitute(expr, '\$\(\d\+\),\(\d\+\)',
|
||||||
|
\ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, submatch(1), submatch(2)))', 'g')
|
||||||
|
endif
|
||||||
|
|
||||||
|
if cell =~# ','
|
||||||
|
if expr =~# '\$'
|
||||||
|
let expr = substitute(expr, '\$\(\d\+\)',
|
||||||
|
\ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, row, submatch(1)))', 'g')
|
||||||
|
endif
|
||||||
|
call tablemode#spreadsheet#cell#SetCell(eval(expr), line, row, colm)
|
||||||
|
else
|
||||||
|
let [row, line] = [1, tablemode#spreadsheet#GetFirstRow(line)]
|
||||||
|
while tablemode#table#IsATableRow(line)
|
||||||
|
let texpr = expr
|
||||||
|
if expr =~# '\$'
|
||||||
|
let texpr = substitute(texpr, '\$\(\d\+\)',
|
||||||
|
\ '\=str2float(tablemode#spreadsheet#cell#GetCells(line, row, submatch(1)))', 'g')
|
||||||
|
endif
|
||||||
|
|
||||||
|
call tablemode#spreadsheet#cell#SetCell(eval(texpr), line, row, colm)
|
||||||
|
let row += 1
|
||||||
|
let line += 1
|
||||||
|
endwhile
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! tablemode#spreadsheet#formula#EvaluateFormulaLine() abort "{{{2
|
||||||
|
let exprs = []
|
||||||
|
let cstring = &commentstring
|
||||||
|
let matchexpr = ''
|
||||||
|
if len(cstring) > 0
|
||||||
|
let cms = split(cstring, '%s')
|
||||||
|
if len(cms) == 2
|
||||||
|
let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*\ze' . escape(cms[1], '/*') . '\s*$'
|
||||||
|
else
|
||||||
|
let matchexpr = '^\s*' . escape(cms[0], '/*') . '\s*tmf: \zs.*$'
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
let matchexpr = '^\s* tmf: \zs.*$'
|
||||||
|
endif
|
||||||
|
if tablemode#table#IsATableRow('.') " We're inside the table
|
||||||
|
let line = tablemode#spreadsheet#GetLastRow('.')
|
||||||
|
let fline = line + 1
|
||||||
|
if tablemode#table#IsATableHeader(fline) | let fline += 1 | endif
|
||||||
|
if getline(fline) =~# 'tmf: '
|
||||||
|
let exprs = split(matchstr(getline(fline), matchexpr), ';')
|
||||||
|
endif
|
||||||
|
elseif getline('.') =~# 'tmf: ' " We're on the formula line
|
||||||
|
let line = line('.') - 1
|
||||||
|
if tablemode#table#IsATableHeader(line) | let line -= 1 | endif
|
||||||
|
if tablemode#table#IsATableRow(line)
|
||||||
|
let exprs = split(matchstr(getline('.'), matchexpr), ';')
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
for expr in exprs
|
||||||
|
call tablemode#spreadsheet#formula#EvaluateExpr(expr, line)
|
||||||
|
endfor
|
||||||
|
endfunction
|
||||||
@@ -4,7 +4,6 @@
|
|||||||
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
||||||
" License: MIT (http://www.opensource.org/licenses/MIT)
|
" License: MIT (http://www.opensource.org/licenses/MIT)
|
||||||
" Website: https://github.com/dhruvasagar/vim-table-mode
|
" Website: https://github.com/dhruvasagar/vim-table-mode
|
||||||
" Version: 4.1.0
|
|
||||||
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
||||||
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
||||||
"
|
"
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
||||||
" License: MIT (http://www.opensource.org/licenses/MIT)
|
" License: MIT (http://www.opensource.org/licenses/MIT)
|
||||||
" Website: https://github.com/dhruvasagar/vim-table-mode
|
" Website: https://github.com/dhruvasagar/vim-table-mode
|
||||||
" Version: 4.1.0
|
|
||||||
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
||||||
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
||||||
"
|
"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
*table-mode.txt* Table Mode for easy table formatting. v4.1.0
|
*table-mode.txt* Table Mode for easy table formatting. v4.2.0
|
||||||
===============================================================================
|
===============================================================================
|
||||||
Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
|
Table Mode, THE AWESOME AUTOMATIC TABLE CREATOR & FORMATTER
|
||||||
VERSION 4.1.0
|
VERSION 4.2.0
|
||||||
|
|
||||||
Author: Dhruva Sagar <http://dhruvasagar.com/>
|
Author: Dhruva Sagar <http://dhruvasagar.com/>
|
||||||
License: MIT <http://opensource.org/licenses/MIT/>
|
License: MIT <http://opensource.org/licenses/MIT/>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
" Author: Dhruva Sagar <http://dhruvasagar.com/>
|
||||||
" License: MIT (http://www.opensource.org/licenses/MIT)
|
" License: MIT (http://www.opensource.org/licenses/MIT)
|
||||||
" Website: http://github.com/dhruvasagar/vim-table-mode
|
" Website: http://github.com/dhruvasagar/vim-table-mode
|
||||||
" Version: 3.3.3
|
|
||||||
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
" Note: This plugin was heavily inspired by the 'CucumberTables.vim'
|
||||||
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
" (https://gist.github.com/tpope/287147) plugin by Tim Pope.
|
||||||
"
|
"
|
||||||
@@ -69,9 +68,9 @@ endif
|
|||||||
" }}}2
|
" }}}2
|
||||||
|
|
||||||
command! -nargs=? -range Tableize <line1>,<line2>call tablemode#table#TableizeRange(<q-args>)
|
command! -nargs=? -range Tableize <line1>,<line2>call tablemode#table#TableizeRange(<q-args>)
|
||||||
command! TableAddFormula call tablemode#spreadsheet#AddFormula()
|
command! TableAddFormula call tablemode#spreadsheet#formula#Add()
|
||||||
command! TableModeRealign call tablemode#spreadsheet#TableRealign('.')
|
command! TableModeRealign call tablemode#spreadsheet#TableRealign('.')
|
||||||
command! TableEvalFormulaLine call tablemode#spreadsheet#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>
|
||||||
@@ -79,19 +78,19 @@ xnoremap <silent> <Plug>(table-mode-tableize-delimiter) :<C-U>call tablemode#Tab
|
|||||||
|
|
||||||
nnoremap <silent> <Plug>(table-mode-realign) :call tablemode#table#TableRealign('.')<CR>
|
nnoremap <silent> <Plug>(table-mode-realign) :call tablemode#table#TableRealign('.')<CR>
|
||||||
|
|
||||||
nnoremap <silent> <Plug>(table-mode-motion-up) :<C-U>call tablemode#table#TableMotion('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#table#TableMotion('j')<CR>
|
nnoremap <silent> <Plug>(table-mode-motion-down) :<C-U>call tablemode#spreadsheet#cell#Motion('j')<CR>
|
||||||
nnoremap <silent> <Plug>(table-mode-motion-left) :<C-U>call tablemode#table#TableMotion('h')<CR>
|
nnoremap <silent> <Plug>(table-mode-motion-left) :<C-U>call tablemode#spreadsheet#cell#Motion('h')<CR>
|
||||||
nnoremap <silent> <Plug>(table-mode-motion-right) :<C-U>call tablemode#table#TableMotion('l')<CR>
|
nnoremap <silent> <Plug>(table-mode-motion-right) :<C-U>call tablemode#spreadsheet#cell#Motion('l')<CR>
|
||||||
|
|
||||||
onoremap <silent> <Plug>(table-mode-cell-text-object-a) :<C-U>call tablemode#spreadsheet#CellTextObject(0)<CR>
|
onoremap <silent> <Plug>(table-mode-cell-text-object-a) :<C-U>call tablemode#spreadsheet#cell#TextObject(0)<CR>
|
||||||
onoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spreadsheet#CellTextObject(1)<CR>
|
onoremap <silent> <Plug>(table-mode-cell-text-object-i) :<C-U>call tablemode#spreadsheet#cell#TextObject(1)<CR>
|
||||||
|
|
||||||
nnoremap <silent> <Plug>(table-mode-delete-row) :call tablemode#spreadsheet#DeleteRow()<CR>
|
nnoremap <silent> <Plug>(table-mode-delete-row) :call tablemode#spreadsheet#DeleteRow()<CR>
|
||||||
nnoremap <silent> <Plug>(table-mode-delete-column) :call tablemode#spreadsheet#DeleteColumn()<CR>
|
nnoremap <silent> <Plug>(table-mode-delete-column) :call tablemode#spreadsheet#DeleteColumn()<CR>
|
||||||
|
|
||||||
nnoremap <silent> <Plug>(table-mode-add-formula) :call tablemode#spreadsheet#AddFormula()<CR>
|
nnoremap <silent> <Plug>(table-mode-add-formula) :call tablemode#spreadsheet#formula#Add()<CR>
|
||||||
nnoremap <silent> <Plug>(table-mode-eval-formula) :call tablemode#spreadsheet#EvaluateFormulaLine()<CR>
|
nnoremap <silent> <Plug>(table-mode-eval-formula) :call tablemode#spreadsheet#formula#EvaluateFormulaLine()<CR>
|
||||||
|
|
||||||
nnoremap <silent> <Plug>(table-mode-echo-cell) :call <SID>TableEchoCell()<CR>
|
nnoremap <silent> <Plug>(table-mode-echo-cell) :call <SID>TableEchoCell()<CR>
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
" vim: fdm=indent
|
" vim: fdm=indent
|
||||||
source t/config.vim
|
source t/config/options.vim
|
||||||
|
|
||||||
call vspec#hint({'scope': 'tablemode#align#scope()', 'sid': 'tablemode#align#sid()'})
|
call vspec#hint({'scope': 'tablemode#align#scope()', 'sid': 'tablemode#align#sid()'})
|
||||||
|
|
||||||
|
|||||||
49
t/cell.vim
Normal file
49
t/cell.vim
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
" vim: fdm=indent
|
||||||
|
source t/config/options.vim
|
||||||
|
|
||||||
|
call vspec#hint({'scope': 'tablemode#spreadsheet#cell#scope()', 'sid': 'tablemode#spreadsheet#cell#sid()'})
|
||||||
|
|
||||||
|
describe 'cell API'
|
||||||
|
before
|
||||||
|
new
|
||||||
|
read t/fixtures/sample.txt
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should return the cells'
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCells(2, 1, 1) ==# 'test11'
|
||||||
|
" Get Rows
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCells(2, 1) == ['test11', 'test12']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCells(2, 2) == ['test21', 'test22']
|
||||||
|
" Get Columns
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCells(2, 0, 1) == ['test11', 'test21']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCells(2, 0, 2) == ['test12', 'test22']
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should return the cells in a range'
|
||||||
|
" Entire table as range
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1,1:2,2', 2, 1) == [['test11', 'test21'], ['test12', 'test22']]
|
||||||
|
|
||||||
|
" Get Rows given different seed lines and columns
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 2, 1) == ['test11', 'test12']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 2, 2) == ['test11', 'test12']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 1) == ['test11', 'test12']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 2) == ['test11', 'test12']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 2, 1) == ['test21', 'test22']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 2, 2) == ['test21', 'test22']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 1) == ['test21', 'test22']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 2) == ['test21', 'test22']
|
||||||
|
|
||||||
|
" Get Columns given different seed lines and column
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 2, 1) == ['test11', 'test21']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 2, 2) == ['test12', 'test22']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 1) == ['test11', 'test21']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 2) == ['test12', 'test22']
|
||||||
|
|
||||||
|
" Get Column given negative values in range for representing rows from
|
||||||
|
" the end, -1 being the second last row.
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 1) == ['test11']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 1) == ['test11']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 2) == ['test12']
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 2) == ['test12']
|
||||||
|
end
|
||||||
|
end
|
||||||
41
t/formula.vim
Normal file
41
t/formula.vim
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
" vim: fdm=indent
|
||||||
|
source t/config/options.vim
|
||||||
|
|
||||||
|
call vspec#hint({'scope': 'tablemode#spreadsheet#formula#scope()', 'sid': 'tablemode#spreadsheet#formula#sid()'})
|
||||||
|
|
||||||
|
describe 'Formulas'
|
||||||
|
describe 'Add Formula'
|
||||||
|
before
|
||||||
|
new
|
||||||
|
read t/fixtures/formula/sample.txt
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should add a formula successfully'
|
||||||
|
call cursor(6, 15)
|
||||||
|
call tablemode#spreadsheet#formula#Add("Sum(1:4)")
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCell() == '125.0'
|
||||||
|
call cursor(8, 15)
|
||||||
|
Expect getline('.') == '/* tmf: $5,2=Sum(1:4) */'
|
||||||
|
|
||||||
|
call cursor(7, 15)
|
||||||
|
call tablemode#spreadsheet#formula#Add("Sum(1:-1)")
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCell() == '250.0'
|
||||||
|
call cursor(8, 15)
|
||||||
|
Expect getline('.') == '/* tmf: $5,2=Sum(1:4) ; $6,2=Sum(1:-1) */'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'Evaluate Formula'
|
||||||
|
before
|
||||||
|
new
|
||||||
|
read t/fixtures/formula/formula.txt
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should evaluate the formula successfull'
|
||||||
|
call cursor(6, 15)
|
||||||
|
call tablemode#spreadsheet#formula#EvaluateFormulaLine()
|
||||||
|
Expect &modified == 1
|
||||||
|
Expect tablemode#spreadsheet#cell#GetCell() == '125.0'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
" vim: fdm=indent
|
" vim: fdm=indent
|
||||||
source t/config.vim
|
source t/config/options.vim
|
||||||
|
|
||||||
call vspec#hint({'scope': 'tablemode#spreadsheet#scope()', 'sid': 'tablemode#spreadsheet#sid()'})
|
call vspec#hint({'scope': 'tablemode#spreadsheet#scope()', 'sid': 'tablemode#spreadsheet#sid()'})
|
||||||
|
|
||||||
@@ -34,44 +34,6 @@ describe 'spreadsheet'
|
|||||||
Expect tablemode#spreadsheet#GetLastRow(2) == 3
|
Expect tablemode#spreadsheet#GetLastRow(2) == 3
|
||||||
Expect tablemode#spreadsheet#GetLastRow(3) == 3
|
Expect tablemode#spreadsheet#GetLastRow(3) == 3
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should return the cells'
|
|
||||||
Expect tablemode#spreadsheet#GetCells(2, 1, 1) ==# 'test11'
|
|
||||||
" Get Rows
|
|
||||||
Expect tablemode#spreadsheet#GetCells(2, 1) == ['test11', 'test12']
|
|
||||||
Expect tablemode#spreadsheet#GetCells(2, 2) == ['test21', 'test22']
|
|
||||||
" Get Columns
|
|
||||||
Expect tablemode#spreadsheet#GetCells(2, 0, 1) == ['test11', 'test21']
|
|
||||||
Expect tablemode#spreadsheet#GetCells(2, 0, 2) == ['test12', 'test22']
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should return the cells in a range'
|
|
||||||
" Entire table as range
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1,1:2,2', 2, 1) == [['test11', 'test21'], ['test12', 'test22']]
|
|
||||||
|
|
||||||
" Get Rows given different seed lines and columns
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 2, 1) == ['test11', 'test12']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 2, 2) == ['test11', 'test12']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 3, 1) == ['test11', 'test12']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1,1:1,2', 3, 2) == ['test11', 'test12']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 2, 1) == ['test21', 'test22']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 2, 2) == ['test21', 'test22']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 3, 1) == ['test21', 'test22']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('2,1:2,2', 3, 2) == ['test21', 'test22']
|
|
||||||
|
|
||||||
" Get Columns given different seed lines and column
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1:2', 2, 1) == ['test11', 'test21']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1:2', 2, 2) == ['test12', 'test22']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1:2', 3, 1) == ['test11', 'test21']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1:2', 3, 2) == ['test12', 'test22']
|
|
||||||
|
|
||||||
" Get Column given negative values in range for representing rows from
|
|
||||||
" the end, -1 being the second last row.
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1:-1', 2, 1) == ['test11']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1:-1', 3, 1) == ['test11']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1:-1', 2, 2) == ['test12']
|
|
||||||
Expect tablemode#spreadsheet#GetCellRange('1:-1', 3, 2) == ['test12']
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'Manipulations'
|
describe 'Manipulations'
|
||||||
@@ -93,41 +55,4 @@ describe 'spreadsheet'
|
|||||||
call tablemode#spreadsheet#DeleteColumn()
|
call tablemode#spreadsheet#DeleteColumn()
|
||||||
Expect tablemode#spreadsheet#ColumnCount('.') == 1
|
Expect tablemode#spreadsheet#ColumnCount('.') == 1
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
describe 'Formulas'
|
|
||||||
describe 'Add Formula'
|
|
||||||
before
|
|
||||||
new
|
|
||||||
read t/fixtures/formula/sample.txt
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should add a formula successfully'
|
|
||||||
call cursor(6, 15)
|
|
||||||
call tablemode#spreadsheet#AddFormula("Sum(1:4)")
|
|
||||||
Expect tablemode#spreadsheet#GetCell() == '125.0'
|
|
||||||
call cursor(8, 15)
|
|
||||||
Expect getline('.') == '/* tmf: $5,2=Sum(1:4) */'
|
|
||||||
|
|
||||||
call cursor(7, 15)
|
|
||||||
call tablemode#spreadsheet#AddFormula("Sum(1:-1)")
|
|
||||||
Expect tablemode#spreadsheet#GetCell() == '250.0'
|
|
||||||
call cursor(8, 15)
|
|
||||||
Expect getline('.') == '/* tmf: $5,2=Sum(1:4) ; $6,2=Sum(1:-1) */'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'Evaluate Formula'
|
|
||||||
before
|
|
||||||
new
|
|
||||||
read t/fixtures/formula/formula.txt
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should evaluate the formula successfull'
|
|
||||||
call cursor(6, 15)
|
|
||||||
call tablemode#spreadsheet#EvaluateFormulaLine()
|
|
||||||
Expect &modified == 1
|
|
||||||
Expect tablemode#spreadsheet#GetCell() == '125.0'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
" vim: fdm=indent
|
" vim: fdm=indent
|
||||||
source t/config.vim
|
source t/config/options.vim
|
||||||
|
|
||||||
call vspec#hint({'scope': 'tablemode#table#scope()', 'sid': 'tablemode#table#sid()'})
|
call vspec#hint({'scope': 'tablemode#table#scope()', 'sid': 'tablemode#table#sid()'})
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
" vim: fdm=indent
|
" vim: fdm=indent
|
||||||
source t/config.vim
|
source t/config/options.vim
|
||||||
|
|
||||||
call vspec#hint({'scope': 'tablemode#scope()', 'sid': 'tablemode#sid()'})
|
call vspec#hint({'scope': 'tablemode#scope()', 'sid': 'tablemode#sid()'})
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
" vim: fdm=indent
|
" vim: fdm=indent
|
||||||
source t/config.vim
|
source t/config/options.vim
|
||||||
|
|
||||||
call vspec#hint({'scope': 'tablemode#utils#scope()', 'sid': 'tablemode#utils#sid()'})
|
call vspec#hint({'scope': 'tablemode#utils#scope()', 'sid': 'tablemode#utils#sid()'})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user