From 4cf1f534307fc2c89b63075bd6b36b3ee352fdbb Mon Sep 17 00:00:00 2001 From: Dhruva Sagar Date: Sat, 9 Apr 2016 12:55:29 +0530 Subject: [PATCH] Fix #86 Fixed issue with table formula addition when there exists one already and the comment string is singular, i.e. no end delimiter. --- autoload/tablemode/spreadsheet/formula.vim | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/autoload/tablemode/spreadsheet/formula.vim b/autoload/tablemode/spreadsheet/formula.vim index b111980..8271b5d 100644 --- a/autoload/tablemode/spreadsheet/formula.vim +++ b/autoload/tablemode/spreadsheet/formula.vim @@ -16,7 +16,10 @@ function! tablemode#spreadsheet#formula#Add(...) "{{{2 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 start_pos = match(line_val, tablemode#table#StartCommentExpr()) + let end_pos = match(line_val, tablemode#table#EndCommentExpr()) + if empty(end_pos) | let end_pos = len(line_val) | endif + let line_expr = strpart(line_val, start_pos, end_pos) 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)