Merge pull request #19 from darkriszty/feature/EscapeCodeBlocks

Feature/escape code blocks

Author: darkriszty

CHANGELOG.md

@@ -6,8 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 ### Added
-- Issue #12: Full rewrite for refactoring
-- Issue #11: Support escaping of separators with backslash
+- Issue #12: Full rewrite for refactoring.
+- Issue #11: Support escaping of separators with backslash.
+- Issue #16: Ignore separators that are in code blocks.
 
 ## 1.1.1 - 2017-05-27
 ### Fixed

src/modelFactory/selectionInterpreter.ts

@@ -16,7 +16,7 @@ export class SelectionInterpreter {
             index = -1,
             previousSplitIndex = -1;
         while ((index = line.indexOf("|", index + 1)) > -1) {
-            if (line[index - 1] != "\\") {
+            if (line[index - 1] != "\\" && !this.codeBlockOpenTill(line.substr(0, index))) {
                 result.push(line.substring(previousSplitIndex + 1, index));
                 previousSplitIndex = index;
             }
@@ -25,4 +25,8 @@ export class SelectionInterpreter {
 
         return result;
     }
+
+    private codeBlockOpenTill(text: string): boolean {
+        return (text.match(/`/g) || []).length % 2 != 0;
+    }
 }

test/systemTests/resources/escapeCodeBlock-expected.md

@@ -0,0 +1,11 @@
+Type   | Range                                                       | Size
+-------|-------------------------------------------------------------|--------------------------
+sbyte  | -128 `|to|` 127                                             | Signed 8-bit integer
+byte   | 0 `|to|` 255                                                | Unsigned 8-bit integer
+char   | U+0000 `|to|` U+ffff                                        | Unicode 16-bit character
+short  | -32,768 `|to|` 32,767                                       | Signed 16-bit integer
+ushort | 0 `|to|` 65,535                                             | Unsigned 16-bit integer
+int    | -2,147,483,648 `|to|` 2,147,483,647                         | Signed 32-bit integer
+uint   | 0 `|to|` 4,294,967,295                                      | Unsigned 32-bit integer
+long   | -9,223,372,036,854,775,808 `|to|` 9,223,372,036,854,775,807 | Signed 64-bit integer
+ulong  | 0 `|to|` 18,446,744,073,709,551,615                         | Unsigned 64-bit integer

test/systemTests/resources/escapeCodeBlock-input.md

@@ -0,0 +1,11 @@
+Type | Range|	Size
+-|-|-
+sbyte |	-128 `|to|` 127|	Signed 8-bit integer
+byte|	0 `|to|` 255|	Unsigned 8-bit integer
+char|	U+0000 `|to|` U+ffff|	Unicode 16-bit character
+short|	-32,768 `|to|` 32,767|	Signed 16-bit integer
+ushort|	0 `|to|` 65,535|	Unsigned 16-bit integer
+int|	-2,147,483,648 `|to|` 2,147,483,647|	Signed 32-bit integer
+uint|	0 `|to|` 4,294,967,295|	Unsigned 32-bit integer
+long|	-9,223,372,036,854,775,808 `|to|` 9,223,372,036,854,775,807|	Signed 64-bit integer
+ulong|	0 `|to|` 18,446,744,073,709,551,615|	Unsigned 64-bit integer

test/unitTests/modelFactory/selectionInterpreter.test.ts

@@ -60,7 +60,7 @@ suite("SelectionInterpreter tests", () => {
         assert.equal(rows[0][5], "");
     });
 
-    test("allRows() doesn't consider \\| as separator ", () => {
+    test("allRows() doesn't consider \\| as separator", () => {
         const text = "h1|h2\\|still\\|h2\nv1|v2";
         const sut = createSut();
 
@@ -75,6 +75,43 @@ suite("SelectionInterpreter tests", () => {
         assert.equal(rows[1][1], "v2");
     });
 
+    test("allRows() doesn't consider separator that's in a `code block` #1", () => {
+        const text = "`h1|h2|h3`";
+        const sut = createSut();
+
+        const rows = sut.allRows(text);
+
+        assert.equal(rows.length, 1);
+        assert.equal(rows[0].length, 1);
+        assert.equal(rows[0][0], "`h1|h2|h3`");
+    });
+
+    test("allRows() doesn't consider separator that's in a `code block` #2", () => {
+        const text = "h1|h2`|still|h2`|h3";
+        const sut = createSut();
+
+        const rows = sut.allRows(text);
+
+        assert.equal(rows.length, 1);
+        assert.equal(rows[0].length, 3);
+        assert.equal(rows[0][0], "h1");
+        assert.equal(rows[0][1], "h2`|still|h2`");
+        assert.equal(rows[0][2], "h3");
+    });
+
+    test("allRows() doesn't consider separator that's in a `code block` #3", () => {
+        const text = "`h1|h1`|h2|h3`|h3`";
+        const sut = createSut();
+
+        const rows = sut.allRows(text);
+
+        assert.equal(rows.length, 1);
+        assert.equal(rows[0].length, 3);
+        assert.equal(rows[0][0], "`h1|h1`");
+        assert.equal(rows[0][1], "h2");
+        assert.equal(rows[0][2], "h3`|h3`");
+    });
+
     test("separator() returns the first row", () => {
         const text = "h1|h2\r\n:-|-\r\nv1|v2";
         const sut = createSut();