From f755285cf33f98f50fd16ae89a5bd413a255f3b1 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@insanum.com>
Date: Sat, 18 Apr 2020 21:47:22 -0700
Subject: [PATCH] simplified the CountE function cleanup for HTML comment tag
 checks

---
 autoload/tablemode/spreadsheet.vim         |  8 +-------
 autoload/tablemode/spreadsheet/formula.vim | 16 +++++++---------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/autoload/tablemode/spreadsheet.vim b/autoload/tablemode/spreadsheet.vim
index 005272e..8abcc94 100644
--- a/autoload/tablemode/spreadsheet.vim
+++ b/autoload/tablemode/spreadsheet.vim
@@ -50,13 +50,7 @@ function! s:Max(list) "{{{2
 endfunction
 
 function! s:CountE(list) "{{{2
-  let result = 0
-  for item in a:list
-    if empty(item)
-      let result += 1
-    endif
-  endfor
-  return result
+  return len(filter(copy(a:list), {_,l -> empty(l)}))
 endfunction
 
 function! s:CountNE(list) "{{{2
diff --git a/autoload/tablemode/spreadsheet/formula.vim b/autoload/tablemode/spreadsheet/formula.vim
index 85e840f..5d9b230 100644
--- a/autoload/tablemode/spreadsheet/formula.vim
+++ b/autoload/tablemode/spreadsheet/formula.vim
@@ -1,4 +1,8 @@
 " Private Functions {{{1
+function! s:IsHTMLComment(line) "{{{2
+  return getline(a:line) =~# '^\s*<!--'
+endfunction
+
 function! s:IsFormulaLine(line) "{{{2
   return getline(a:line) =~# 'tmf: '
 endfunction
@@ -15,9 +19,7 @@ function! tablemode#spreadsheet#formula#Add(...) "{{{2
     let fr = '$' . row . ',' . colm . '=' . fr
     let fline = tablemode#spreadsheet#GetLastRow('.') + 1
     if tablemode#table#IsBorder(fline) | let fline += 1 | endif
-    if getline(fline) =~# '^\s*<!--' " ignore line with an HTML comment tag
-      let fline += 1
-    endif
+    if s:IsHTMLComment(fline) | let fline += 1 | endif
     let cursor_pos = [line('.'), col('.')]
     if getline(fline) =~# 'tmf: '
       " Comment line correctly
@@ -138,9 +140,7 @@ function! tablemode#spreadsheet#formula#EvaluateFormulaLine() abort "{{{2
   if tablemode#table#IsRow('.') " We're inside the table
     let line = tablemode#spreadsheet#GetLastRow('.')
     let fline = line + 1
-    if getline(fline) =~# '^\s*<!--' " ignore line with an HTML comment tag
-      let fline += 1
-    endif
+    if s:IsHTMLComment(fline) | let fline += 1 | endif
     if tablemode#table#IsBorder(fline) | let fline += 1 | endif
     while s:IsFormulaLine(fline)
       let exprs += split(matchstr(getline(fline), matchexpr), ';')
@@ -150,9 +150,7 @@ function! tablemode#spreadsheet#formula#EvaluateFormulaLine() abort "{{{2
     let fline = line('.')
     let line = line('.') - 1
     while s:IsFormulaLine(line) | let fline = line | let line -= 1 | endwhile
-    if getline(fline) =~# '^\s*<!--' " ignore line with an HTML comment tag
-      let line -= 1
-    endif
+    if s:IsHTMLComment(line) | let line -= 1 | endif
     if tablemode#table#IsBorder(line) | let line -= 1 | endif
     if tablemode#table#IsRow(line)
       " let exprs = split(matchstr(getline('.'), matchexpr), ';')