✅ #603

yzhang-gh · Jan 27, 2020 · 4f27e33 · 4f27e33
1 parent f0bf512
commit 4f27e33
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/src/test/suite/testUtils.ts b/src/test/suite/testUtils.ts
@@ -45,7 +45,7 @@ export async function testCommand(command: string, configs, lines: string[], sel
                 return commands.executeCommand(command).then(() => {
                     let actual = window.activeTextEditor.document.getText();
                     actual = actual.replace(/\r\n/g, '\n').replace(/\t/g, '    '); /* !!! */
-                    assert.deepEqual(actual, expLines.join('\n'));
+                    assert.deepEqual(actual, expLines.join('\n').replace(/\t/g, '    '));
                     assert.deepEqual(window.activeTextEditor.selection, expSelection);
                 });
             });

diff --git a/src/test/suite/toc.test.ts b/src/test/suite/toc.test.ts
@@ -473,6 +473,35 @@ suite("TOC.", () => {
             new Selection(9, 25, 9, 25)).then(done, done);
     });
 
+    test("Ignore code blocks 2 (GitHub #603)", done => {
+        testCommand('markdown.extension.toc.create', {},
+            [
+                '# Section 1',
+                '',
+                '\t```',
+                '\t## Section 1.1',
+                '\t```',
+                '',
+                '# Section 2',
+                '',
+                ''
+            ],
+            new Selection(8, 0, 8, 0),
+            [
+                '# Section 1',
+                '',
+                '\t```',
+                '\t## Section 1.1',
+                '\t```',
+                '',
+                '# Section 2',
+                '',
+                '- [Section 1](#section-1)',
+                '- [Section 2](#section-2)'
+            ],
+            new Selection(9, 25, 9, 25)).then(done, done);
+    });
+
     test("Markdown syntax in headings", done => {
         testCommand('markdown.extension.toc.create', {},
             [

diff --git a/src/toc.ts b/src/toc.ts
@@ -296,10 +296,11 @@ export function buildToc(doc: TextDocument) {
             && !lineText.includes('&lt; omit in toc &gt;');
     }).map(lineText => {
         lineText = lineText.replace(/^ +/, '');
-        let entry = {};
-        let matches = /^(#+) (.*)/.exec(lineText);
-        entry['level'] = matches[1].length;
-        entry['text'] = matches[2].replace(/#+$/, '').trim();
+        const matches = /^(#+) (.*)/.exec(lineText);
+        const entry = {
+            level: matches[1].length,
+            text: matches[2].replace(/#+$/, '').trim()
+        };
         return entry;
     });