From 04f96db89d98af4434953a3a562a579b6b1ea717 Mon Sep 17 00:00:00 2001 From: BigAru Date: Sun, 30 Jun 2019 13:45:47 +0200 Subject: [PATCH] use stringLiteral property text instead of decodeRawString --- .../convertStringOrTemplateLiteral.ts | 22 ++----------------- ...gOrTemplateLiteral_ToStringAsFnArgument.ts | 1 - ...plateLiteral_ToStringAvailabilityTagged.ts | 1 - ...ingOrTemplateLiteral_ToStringBinaryExpr.ts | 1 - ...StringOrTemplateLiteral_ToStringComment.ts | 1 - ...TemplateLiteral_ToStringCommentOnlyExpr.ts | 1 - ...mplateLiteral_ToStringCommentWithoutStr.ts | 1 - ...ringOrTemplateLiteral_ToStringMultiExpr.ts | 1 - ...ngOrTemplateLiteral_ToStringNestedInner.ts | 1 - ...mplateLiteral_ToStringNestedInnerNonSub.ts | 1 - ...ngOrTemplateLiteral_ToStringNestedOuter.ts | 1 - ...StringOrTemplateLiteral_ToStringOneExpr.ts | 1 - ...tringOrTemplateLiteral_ToStringOnlyExpr.ts | 1 - ...gOrTemplateLiteral_ToStringOtherExprSeq.ts | 1 - ...ngOrTemplateLiteral_ToStringPlusExprSeq.ts | 1 - ...emplateLiteral_ToStringSelectedFromExpr.ts | 1 - ...plateLiteral_ToStringSelectedFromMiddle.ts | 1 - ...tStringOrTemplateLiteral_ToStringSimple.ts | 1 - ...rTemplateLiteral_ToTemplateAsFnArgument.ts | 1 - ...rTemplateLiteral_ToTemplateAvailability.ts | 2 +- ...lateLiteral_ToTemplateAvailabilityMinus.ts | 1 - ...Literal_ToTemplateAvailabilityNoStrings.ts | 1 - ...al_ToTemplateAvailabilityPrecedingMinus.ts | 2 +- ...eral_ToTemplateAvailabilityReassignment.ts | 2 +- ...ingOrTemplateLiteral_ToTemplateBackTick.ts | 1 - ...gOrTemplateLiteral_ToTemplateBinaryExpr.ts | 1 - ...ateLiteral_ToTemplateBinaryExprInEnding.ts | 1 - ...ringOrTemplateLiteral_ToTemplateComment.ts | 1 - ...eLiteral_ToTemplateCommentAfterOperator.ts | 1 - ...TemplateLiteral_ToTemplateCommentNoExpr.ts | 1 - ...emplateLiteral_ToTemplateCommentParenth.ts | 1 - ...teLiteral_ToTemplateCommentTrailingExpr.ts | 1 - ...ateLiteral_ToTemplateCommentTrailingStr.ts | 1 - ...emplateLiteral_ToTemplateConsecutiveStr.ts | 1 - ...tringOrTemplateLiteral_ToTemplateDollar.ts | 1 - ...ngOrTemplateLiteral_ToTemplateMultiExpr.ts | 1 - ...OrTemplateLiteral_ToTemplateOctalEscape.ts | 13 ----------- ...ringOrTemplateLiteral_ToTemplateOneExpr.ts | 1 - ...ringOrTemplateLiteral_ToTemplateOnlyStr.ts | 1 - ...rTemplateLiteral_ToTemplateOtherExprSeq.ts | 1 - ...mplateLiteral_ToTemplateParenthFromExpr.ts | 1 - ...ateLiteral_ToTemplateParenthFromOpening.ts | 1 - ...emplateLiteral_ToTemplateParenthFromStr.ts | 1 - ...OrTemplateLiteral_ToTemplatePlusExprSeq.ts | 1 - ...gOrTemplateLiteral_ToTemplatePrefixExpr.ts | 1 - ...tringOrTemplateLiteral_ToTemplateSimple.ts | 1 - ...OrTemplateLiteral_ToTemplateSingleQuote.ts | 1 - 47 files changed, 5 insertions(+), 78 deletions(-) delete mode 100644 tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOctalEscape.ts diff --git a/src/services/refactors/convertStringOrTemplateLiteral.ts b/src/services/refactors/convertStringOrTemplateLiteral.ts index a9acee60a5d..68e9de37c8c 100644 --- a/src/services/refactors/convertStringOrTemplateLiteral.ts +++ b/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 } } - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAsFnArgument.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAsFnArgument.ts index af7f7323eb6..de79522269a 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAsFnArgument.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAsFnArgument.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `console.log("foobar is " + 32 + " years old")`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailabilityTagged.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailabilityTagged.ts index 41d85620d3c..0b02128f3e9 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailabilityTagged.ts +++ b/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"); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringBinaryExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringBinaryExpr.ts index 83f1be6028e..1850b40f22c 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringBinaryExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringBinaryExpr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = "foobar is " + (42 + 6) + " years old"`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringComment.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringComment.ts index 0ed6df9afb6..d895c9c4306 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringComment.ts +++ b/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 */`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringCommentOnlyExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringCommentOnlyExpr.ts index 8f85a76b7e1..07f1ddba4d9 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringCommentOnlyExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringCommentOnlyExpr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = /* C0 */ 42 /* C1 */`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringCommentWithoutStr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringCommentWithoutStr.ts index 8a06197b782..18fe962e728 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringCommentWithoutStr.ts +++ b/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 */`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringMultiExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringMultiExpr.ts index 3f9cab1d41e..3fdd7fb6362 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringMultiExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringMultiExpr.ts @@ -14,4 +14,3 @@ edit.applyRefactor({ const name = "Eddy" const foo = name + " is " + age + " years old"`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInner.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInner.ts index 7f050781ef5..710d0f97489 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInner.ts +++ b/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' : '') }\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInnerNonSub.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInnerNonSub.ts index 52d601fe9d7..83783e4d658 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInnerNonSub.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInnerNonSub.ts @@ -12,4 +12,3 @@ edit.applyRefactor({ `const age = 42 const foo = \`foobar is a \${ "34" }\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedOuter.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedOuter.ts index 0ffa553936d..fb09d7876b9 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedOuter.ts +++ b/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' : ''}\`)`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOneExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOneExpr.ts index f24ef3dfb3c..0e5cb6ae257 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOneExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOneExpr.ts @@ -12,4 +12,3 @@ edit.applyRefactor({ `const age = 42 const foo = "foobar is " + age + " years old"`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOnlyExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOnlyExpr.ts index 86889395b7d..da84ef1c409 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOnlyExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOnlyExpr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = 42`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOtherExprSeq.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOtherExprSeq.ts index 1c8af7e67b6..2970dce1895 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOtherExprSeq.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOtherExprSeq.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = "foobar is " + 42 * 6 % 4 + " years old"`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringPlusExprSeq.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringPlusExprSeq.ts index c008741a258..4b8e581b8c6 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringPlusExprSeq.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringPlusExprSeq.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = "foobar is " + 42 + 6 + " years old"`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromExpr.ts index 82180c69530..7229e9e9f7a 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromExpr.ts @@ -12,4 +12,3 @@ edit.applyRefactor({ `const age = 42 const foo = "foobar is " + age + " years old"`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromMiddle.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromMiddle.ts index 1125970dece..c44e4ee646f 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromMiddle.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromMiddle.ts @@ -12,4 +12,3 @@ edit.applyRefactor({ `const age = 42 const foo = "foobar is " + age + " years old " + false`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSimple.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSimple.ts index c2d7598e95d..3da488fcf25 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSimple.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSimple.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = "foobar rocks"`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts index 64824400687..a41eef34b41 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `console.log(\`foobar is \${32} years old\`)`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailability.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailability.ts index cc4d41d1905..2965cb42bed 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailability.ts +++ b/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\``, -}); \ No newline at end of file +}); diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityMinus.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityMinus.ts index 98350585cdc..50c7921836c 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityMinus.ts +++ b/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"); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityNoStrings.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityNoStrings.ts index 58fbadba54d..f015af3b3c7 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityNoStrings.ts +++ b/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"); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityPrecedingMinus.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityPrecedingMinus.ts index 33597661616..11540519e0d 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityPrecedingMinus.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityPrecedingMinus.ts @@ -30,4 +30,4 @@ edit.applyRefactor({ newContent: `const age = 22 const foo = \`\${age * 4 - 2 / 4} years old\``, -}); \ No newline at end of file +}); diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityReassignment.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityReassignment.ts index 8f51e6c6832..3c3200559fe 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityReassignment.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityReassignment.ts @@ -22,4 +22,4 @@ edit.applyRefactor({ newContent: `let foo = "" foo = \`Mr Bar is\${42} years old\``, -}); \ No newline at end of file +}); diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts index 6dd92c0253f..205f84c19a1 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: "const foo = `with back\\`tick`", }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExpr.ts index e101a9250de..2519ac34664 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExpr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = \`foobar is \${42 + 6} years old\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExprInEnding.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExprInEnding.ts index 9cbe91accbb..a7ab291657b 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExprInEnding.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExprInEnding.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: "const foo = `foobar is \${42 + 6}`", }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateComment.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateComment.ts index 4bf761cfcd5..18bdf4d1c7c 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateComment.ts +++ b/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 */}`", }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentAfterOperator.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentAfterOperator.ts index 362a6728c41..1b18d5e71bb 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentAfterOperator.ts +++ b/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 */}`", }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentNoExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentNoExpr.ts index 75ea3a28e9c..fd63bd234fc 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentNoExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentNoExpr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: "const foo = /* C0 */ `foo is` /* C1 */ /* C2 */ /* C3 */", }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentParenth.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentParenth.ts index b7b3bb2838b..57df8e671cf 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentParenth.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentParenth.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: "const foo = `foobar is\${/* C1 */ 42 /* C2 */ /* C3 */} years old`", }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentTrailingExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentTrailingExpr.ts index 25e006bd169..6b54b8b5488 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentTrailingExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentTrailingExpr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: "const foo = /* C0 */ `foo is\${ /* C1 */ /* C2 */42 /* C3 */}`", }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentTrailingStr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentTrailingStr.ts index 9c5e6a5f4cb..e2d3f05050c 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentTrailingStr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateCommentTrailingStr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: "const foo = /* C0 */ `foo is\${ /* C1 */ /* C2 */42} years old` /* C3 */", }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateConsecutiveStr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateConsecutiveStr.ts index 8e08d3c024c..a053a6c5e3b 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateConsecutiveStr.ts +++ b/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\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateDollar.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateDollar.ts index 9f234f01f84..a073b6838f5 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateDollar.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateDollar.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: "const foo = `with $\\\\{dollar}`", }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts index 95b933a18c1..e781bae6634 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts @@ -14,4 +14,3 @@ edit.applyRefactor({ const name = "Eddy" const foo = \`\${name} is \${age} years old\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOctalEscape.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOctalEscape.ts deleted file mode 100644 index a3450ff09ca..00000000000 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOctalEscape.ts +++ /dev/null @@ -1,13 +0,0 @@ -/// - -//// 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 #`;", -}); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts index 70fcb5ae637..a790a623aaa 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts @@ -12,4 +12,3 @@ edit.applyRefactor({ `const age = 42 const foo = \`foobar is \${age} years old\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOnlyStr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOnlyStr.ts index b921cc05d8f..bd1fa6009fc 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOnlyStr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOnlyStr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: "const foo = `foobar rocks fantastically`", }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOtherExprSeq.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOtherExprSeq.ts index b00dad88c2f..493f724a2bd 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOtherExprSeq.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOtherExprSeq.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = \`foobar is \${42 * 6 / 4} years old\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromExpr.ts index f79929e9cbe..7fd5fc0424b 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromExpr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = \`foobar is \${42 + 6} years old\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromOpening.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromOpening.ts index d6dc5be2261..5924da73ebc 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromOpening.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromOpening.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = \`foobar is \${42 + 6} years old\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromStr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromStr.ts index 47a34a31309..e3d2892aaaa 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromStr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateParenthFromStr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = "foobar is " + (\`\${42 + 6}str\`) + " years old"`, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePlusExprSeq.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePlusExprSeq.ts index 2fe8936bf93..aadc6068a68 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePlusExprSeq.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePlusExprSeq.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = \`foobar is \${42}\${6} years old\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePrefixExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePrefixExpr.ts index 1d7e0e9cc0f..7b8c6244114 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePrefixExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePrefixExpr.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = \`\${42 - 6 * 4 + 23 / 12} years old\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSimple.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSimple.ts index 5088cfa822c..2c5663b07dc 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSimple.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSimple.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = \`foobar rocks\``, }); - diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts index 03e1ac971bc..4a4d2c5b26e 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts @@ -10,4 +10,3 @@ edit.applyRefactor({ newContent: `const foo = \`foobar rocks\``, }); -