From 736d5d7d0ba358dfcff5b043e57dfbf5496fdd6f Mon Sep 17 00:00:00 2001 From: yzhang Date: Sun, 13 Dec 2020 20:57:58 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20String.raw?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tableFormatter.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/tableFormatter.ts b/src/tableFormatter.ts index efe838c9..bf7b7ea9 100644 --- a/src/tableFormatter.ts +++ b/src/tableFormatter.ts @@ -52,18 +52,18 @@ class MarkdownDocumentFormatter implements DocumentFormattingEditProvider { } private detectTables(text: string) { - const lineBreak = '\\r?\\n'; - const contentLine = '\\|?.*\\|.*\\|?'; + const lineBreak = String.raw`\r?\n`; + const contentLine = String.raw`\|?.*\|.*\|?`; - const leftSideHyphenComponent = '(?:\\|? *:?-+:? *\\|)'; - const middleHyphenComponent = '(?: *:?-+:? *\\|)*'; - const rightSideHyphenComponent = '(?: *:?-+:? *\\|?)' + const leftSideHyphenComponent = String.raw`(?:\|? *:?-+:? *\|)`; + const middleHyphenComponent = String.raw`(?: *:?-+:? *\|)*`; + const rightSideHyphenComponent = String.raw`(?: *:?-+:? *\|?)`; const multiColumnHyphenLine = leftSideHyphenComponent + middleHyphenComponent + rightSideHyphenComponent; //// GitHub issue #431 - const singleColumnHyphenLine = '(?:\\| *:?-+:? *\\|)' + const singleColumnHyphenLine = String.raw`(?:\| *:?-+:? *\|)`; - const hyphenLine = '[ \\t]*(?:' + multiColumnHyphenLine + '|' + singleColumnHyphenLine + ')[ \\t]*'; + const hyphenLine = String.raw`[ \t]*(?:${multiColumnHyphenLine}|${singleColumnHyphenLine})[ \t]*`; const tableRegex = new RegExp(contentLine + lineBreak + hyphenLine + '(?:' + lineBreak + contentLine + ')*', 'g'); return text.match(tableRegex);