Merge pull request #61 from nekno/gh-pages

Fix bug in `isColumnSeparator()` parsing logic
ozh · Mar 19, 2022 · d92c1f0 · d92c1f0
2 parents a551bbd + 2762be9
commit d92c1f0
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/assets/js/script.js b/assets/js/script.js
@@ -513,6 +513,9 @@ function parseTable(table) {
     for (var j = 0; j < longest.length; j++) {
         if (isColumnSeparator(lines.slice(), j)) {
             colIndexes.push(j);
+            // column separators are each padded by a space
+            // so skip over minimum distance between 2 columns
+            j += 2;
         }
     }
 
@@ -560,13 +563,24 @@ function isColumnSeparator(lines, column) {
     } else {
         var thisLine = lines[0];
         var nextLine = lines[1];
+
         if (column >= thisLine.length) {
             // Column is out of range, must not be a separator
             return false;
         }
-        if (thisLine[column] == nextLine[column] && thisLine[column] != " ") {
+
+        var previousColumn = column - 1;
+        var thisLineThisChar = thisLine[column];
+        var thisLinePreviousChar = (previousColumn > 0) ? thisLine[previousColumn] : " ";
+        var nextLineThisChar = nextLine[column];
+        var nextLinePreviousChar = (previousColumn > 0) ? nextLine[previousColumn] : " ";
+
+        if (thisLineThisChar == nextLineThisChar
+            && !isSpace(thisLineThisChar)
+            && isSpace(thisLinePreviousChar, nextLinePreviousChar)
+           ) {
             // Rows match, check next row down
-            return isColumnSeparator(lines.splice(0,1), column);
+            return isColumnSeparator(lines.splice(1), column);
         } else {
             // Rows are different, this is not a separator
             return false;
@@ -578,6 +592,10 @@ function isSeparatorLine(line) {
     return line.trim().indexOf(" ") == -1; // must not have spaces
 }
 
+function isSpace(...chars) {
+    return chars.every(value => value == " ");
+}
+
 function _trim(str) {
     var rgx = /^\s*(.*?)\s*$/;
     var result = str.match(rgx);