use stringLiteral property text instead of decodeRawString

src/services/refactors/convertStringOrTemplateLiteral.ts

@@ -192,7 +192,8 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
         const indexes = [];
 
         while (index < nodes.length && isStringLiteral(nodes[index])) {
-            text = text + decodeRawString(nodes[index].getText());
+            const stringNode = nodes[index] as StringLiteral;
+            text = text + stringNode.text;
             indexes.push(index);
             index++;
         }
@@ -247,28 +248,9 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
         return node;
     }
 
-    const hexToUnicode = (_match: string, grp: string) => String.fromCharCode(parseInt(grp, 16));
-    const octalToUnicode = (_match: string, grp: string) => String.fromCharCode(parseInt(grp, 8));
-
-    function decodeRawString(content: string) {
-        const outerQuotes = /["']((.|\s)*)["']/;
-        const unicodeEscape = /\\u([a-fA-F0-9]{4})/gi;
-        const unicodeEscapeWithBraces = /\\u\{([0-9a-fA-F]{1,})\}/gi;
-        const hexEscape = /\\x([a-fA-F0-9]{2})/gi;
-        const octalEscape = /\\((?:[1-7][0-7]{0,2}|[0-7]{2,3}))/g;
-
-        return content.replace(outerQuotes, (_match, grp) => grp)
-                      .replace(unicodeEscape, hexToUnicode)
-                      .replace(unicodeEscapeWithBraces, hexToUnicode)
-                      .replace(hexEscape, hexToUnicode)
-                      .replace(octalEscape, octalToUnicode);
-
-    }
-
     function escapeText(content: string) {
         return content.replace("`", "\`")       // back-tick
                       .replace("${", "$\\{");  // placeholder alike beginning
     }
 
 }
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAsFnArgument.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `console.log("foobar is " + 32 + " years old")`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailabilityTagged.ts

@@ -15,4 +15,3 @@ verify.not.refactorAvailable("Convert string concatenation or template literal",
 goTo.select("v", "u");
 verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to string concatenation");
 verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to template literal");
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringBinaryExpr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = "foobar is " + (42 + 6) + " years old"`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringComment.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = /* H */ "HEAD " + /* C0 */ 42 /* C1 */ + " Span1 " + /* C2 */ 43 /* C3 */ + " Span2 " + /* C4 */ 44 /* C5 */ + " Span3" /* T */`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringCommentOnlyExpr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = /* C0 */ 42 /* C1 */`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringCommentWithoutStr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = "HEAD | " + /* C0 */ 42 /* C1 */ + /* C2 */ 43 /* C3 */ + /* C4 */ 44 /* C5 */`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringMultiExpr.ts

@@ -14,4 +14,3 @@ edit.applyRefactor({
 const name = "Eddy"
 const foo = name + " is " + age + " years old"`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInner.ts

@@ -12,4 +12,3 @@ edit.applyRefactor({
 `const age = 42
 const foo = \`foobar is a \${ age < 18 ? 'child' : "grown-up " + (age > 40 ? 'who needs probably assistance' : '') }\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInnerNonSub.ts

@@ -12,4 +12,3 @@ edit.applyRefactor({
 `const age = 42
 const foo = \`foobar is a \${ "34" }\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedOuter.ts

@@ -12,4 +12,3 @@ edit.applyRefactor({
 `const age = 42
 const foo = "foobar is a " + (age < 18 ? 'child' : \`grown-up \${age > 40 ? 'who needs probaply assistance' : ''}\`)`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOneExpr.ts

@@ -12,4 +12,3 @@ edit.applyRefactor({
 `const age = 42
 const foo = "foobar is " + age + " years old"`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOnlyExpr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = 42`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOtherExprSeq.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = "foobar is " + 42 * 6 % 4 + " years old"`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringPlusExprSeq.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = "foobar is " + 42 + 6 + " years old"`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromExpr.ts

@@ -12,4 +12,3 @@ edit.applyRefactor({
 `const age = 42
 const foo = "foobar is " + age + " years old"`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromMiddle.ts

@@ -12,4 +12,3 @@ edit.applyRefactor({
 `const age = 42
 const foo = "foobar is " + age + " years old " + false`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSimple.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = "foobar rocks"`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `console.log(\`foobar is \${32} years old\`)`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailability.ts

@@ -36,4 +36,4 @@ edit.applyRefactor({
 `const age = 22
 const name = "Eddy"
 const foo = \`Mr \${name} is \${age * 4 / 2} years old\``,
-});
+});

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityMinus.ts

@@ -23,4 +23,3 @@ verify.not.refactorAvailable("Convert string concatenation or template literal",
 goTo.select("r", "q");
 verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to string concatenation");
 verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to template literal");
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityNoStrings.ts

@@ -17,4 +17,3 @@ verify.not.refactorAvailable("Convert string concatenation or template literal",
 goTo.select("t", "s");
 verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to string concatenation");
 verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to template literal");
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityPrecedingMinus.ts

@@ -30,4 +30,4 @@ edit.applyRefactor({
     newContent:
 `const age = 22
 const foo = \`\${age * 4 - 2 / 4} years old\``,
-});
+});

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityReassignment.ts

@@ -22,4 +22,4 @@ edit.applyRefactor({
     newContent:
 `let foo = ""
 foo = \`Mr Bar is\${42} years old\``,
-});
+});

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 "const foo = `with back\\`tick`",
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExpr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = \`foobar is \${42 + 6} years old\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExprInEnding.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 "const foo = `foobar is \${42 + 6}`",
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateComment.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 "const foo = /* C0 */ `foo is\${ /* C1 */ /* C2 */42 /* C3 */} and bar is\${ /* C4 */ /* C5 */52 /* C6 */}`",
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentAfterOperator.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 "const foo = /* C0 */ `foo is\${ /* C1 */ /* C2 */42 /* C3 */} and bar is\${ /* C4 */ /* C5 */52 /* C6 */}`",
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentNoExpr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 "const foo = /* C0 */ `foo is` /* C1 */ /* C2 */ /* C3 */",
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentParenth.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 "const foo = `foobar is\${/* C1 */ 42 /* C2 */ /* C3 */} years old`",
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentTrailingExpr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 "const foo = /* C0 */ `foo is\${ /* C1 */ /* C2 */42 /* C3 */}`",
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentTrailingStr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 "const foo = /* C0 */ `foo is\${ /* C1 */ /* C2 */42} years old` /* C3 */",
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateConsecutiveStr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = \`foobar is \${42} years old and \${6} cars are missing\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateDollar.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 "const foo = `with $\\\\{dollar}`",
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts

@@ -14,4 +14,3 @@ edit.applyRefactor({
 const name = "Eddy"
 const foo = \`\${name} is \${age} years old\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOctalEscape.ts

@@ -1,13 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// const foo = "/*x*/U/*y*/nicode \u0023 \u{0023} " + "Hex \x23 " + "Octal \43";
-
-goTo.select("x", "y");
-edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
-    newContent:
-"const foo = `Unicode # # Hex # Octal #`;",
-});
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts

@@ -12,4 +12,3 @@ edit.applyRefactor({
 `const age = 42
 const foo = \`foobar is \${age} years old\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOnlyStr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 "const foo = `foobar rocks fantastically`",
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOtherExprSeq.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = \`foobar is \${42 * 6 / 4} years old\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromExpr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = \`foobar is \${42 + 6} years old\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromOpening.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = \`foobar is \${42 + 6} years old\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromStr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = "foobar is " + (\`\${42 + 6}str\`) + " years old"`,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePlusExprSeq.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = \`foobar is \${42}\${6} years old\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePrefixExpr.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = \`\${42 - 6 * 4 + 23 / 12} years old\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSimple.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = \`foobar rocks\``,
 });
-

tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts

@@ -10,4 +10,3 @@ edit.applyRefactor({
     newContent:
 `const foo = \`foobar rocks\``,
 });
-