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

Support optional newline after tables for formula

Browse Source 
Fixes #86

This allows the formula line to be evaluated, even if there is a single
empty line after the table. The "empty" line is allowed to contain
whitespace, but nothing else.

The formula will evaluate if triggered on the table, the empty line, or
the formula lines.
This commit is contained in:
Cameron Fowler
2022-07-21 14:10:35 +12:00
parent f47287df37
commit 33ea774b69
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@@ -224,9 +224,10 @@ it using `:TableModeRealign` or using the default mapping
results. results.
- You can directly add / manipulate formula expressions in the formula line. - You can directly add / manipulate formula expressions in the formula line.
The formula line is a commented line right after the table, beginning with The formula line is a commented line right after the table, or optionally
'tmf:' (table mode formula). eg) `# tmf: $3=$2*$1`. You can add multiple separated from the table by a single empty line. It begins with 'tmf:'
formulas on the line separated with a ';' eg) `# tmf: $3=$2*$1;$4=$3/3.14` (table mode formula). eg) `# tmf: $3=$2*$1`. You can add multiple formulas on
the line separated with a ';' eg) `# tmf: $3=$2*$1;$4=$3/3.14`
You can evaluate the formula line using `:TableEvalFormulaLine` or the You can evaluate the formula line using `:TableEvalFormulaLine` or the
mapping <kbd>\<Leader\>tfe</kbd> (defined by the option `g:table_mode_eval_expr_map`) mapping <kbd>\<Leader\>tfe</kbd> (defined by the option `g:table_mode_eval_expr_map`)

15
autoload/tablemode/spreadsheet/formula.vim
View File

@@ -7,6 +7,10 @@ function! s:IsHTMLComment(line) "{{{2
return !s:IsFormulaLine(a:line) && getline(a:line) =~# '^\s*<!--' return !s:IsFormulaLine(a:line) && getline(a:line) =~# '^\s*<!--'
endfunction endfunction
function! s:IsBlankLine(line) "{{{2
return getline(a:line) =~# '^\s*$'
endfunction
" Public Functions {{{1 " Public Functions {{{1
function! tablemode#spreadsheet#formula#Add(...) "{{{2 function! tablemode#spreadsheet#formula#Add(...) "{{{2
let fr = a:0 ? a:1 : input('f=') let fr = a:0 ? a:1 : input('f=')
@@ -144,6 +148,16 @@ function! tablemode#spreadsheet#formula#EvaluateFormulaLine() "{{{2
let fline = line + 1 let fline = line + 1
if s:IsHTMLComment(fline) | let fline += 1 | endif if s:IsHTMLComment(fline) | let fline += 1 | endif
if tablemode#table#IsBorder(fline) | let fline += 1 | endif if tablemode#table#IsBorder(fline) | let fline += 1 | endif
if s:IsBlankLine(fline) | let fline += 1 | endif
while s:IsFormulaLine(fline)
let exprs += split(matchstr(getline(fline), matchexpr), ';')
let fline += 1
endwhile
elseif s:IsBlankLine('.') " We're possibly in the blank line above the formula line
let fline = line('.') + 1
let line = line('.') - 1
if s:IsHTMLComment(fline) | let fline += 1 | endif
if tablemode#table#IsBorder(line) | let line -= 1 | endif
while s:IsFormulaLine(fline) while s:IsFormulaLine(fline)
let exprs += split(matchstr(getline(fline), matchexpr), ';') let exprs += split(matchstr(getline(fline), matchexpr), ';')
let fline += 1 let fline += 1
@@ -153,6 +167,7 @@ function! tablemode#spreadsheet#formula#EvaluateFormulaLine() "{{{2
let line = line('.') - 1 let line = line('.') - 1
while s:IsFormulaLine(line) | let fline = line | let line -= 1 | endwhile while s:IsFormulaLine(line) | let fline = line | let line -= 1 | endwhile
if s:IsHTMLComment(line) | let line -= 1 | endif if s:IsHTMLComment(line) | let line -= 1 | endif
if s:IsBlankLine(line) | let line -= 1 | endif
if tablemode#table#IsBorder(line) | let line -= 1 | endif if tablemode#table#IsBorder(line) | let line -= 1 | endif
if tablemode#table#IsRow(line) if tablemode#table#IsRow(line)
" let exprs = split(matchstr(getline('.'), matchexpr), ';') " let exprs = split(matchstr(getline('.'), matchexpr), ';')