From 2a15acbbfd2f6a1042e60140afb844c6c7f7c606 Mon Sep 17 00:00:00 2001 From: BigAru Date: Sun, 24 Mar 2019 15:24:04 +0100 Subject: [PATCH] refactor creation of template expression --- .../convertStringOrTemplateLiteral.ts | 50 ++++++++----------- ...gOrTemplateLiteral_ToStringAsFnArgument.ts | 1 + ...gOrTemplateLiteral_ToStringAvailability.ts | 1 + ...plateLiteral_ToStringAvailabilityTagged.ts | 1 + ...ingOrTemplateLiteral_ToStringBinaryExpr.ts | 1 + ...ringOrTemplateLiteral_ToStringMultiExpr.ts | 1 + ...ngOrTemplateLiteral_ToStringNestedInner.ts | 1 + ...mplateLiteral_ToStringNestedInnerNonSub.ts | 1 + ...ngOrTemplateLiteral_ToStringNestedOuter.ts | 1 + ...StringOrTemplateLiteral_ToStringOneExpr.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 + ...lateLiteral_ToTemplateAvailabilityMinus.ts | 1 + ...Literal_ToTemplateAvailabilityNoStrings.ts | 1 + ...al_ToTemplateAvailabilityPrecedingMinus.ts | 1 + ...eral_ToTemplateAvailabilityReassignment.ts | 1 + ...ingOrTemplateLiteral_ToTemplateBackTick.ts | 1 + ...gOrTemplateLiteral_ToTemplateBinaryExpr.ts | 1 + ...ateLiteral_ToTemplateBinaryExprInEnding.ts | 1 + ...emplateLiteral_ToTemplateConsecutiveStr.ts | 1 + ...TemplateLiteral_ToTemplateExprFromBrace.ts | 1 + ...ngOrTemplateLiteral_ToTemplateMultiExpr.ts | 1 + ...OrTemplateLiteral_ToTemplateOctalEscape.ts | 1 + ...ringOrTemplateLiteral_ToTemplateOneExpr.ts | 1 + ...ringOrTemplateLiteral_ToTemplateOnlyStr.ts | 1 + ...rTemplateLiteral_ToTemplateOtherExprSeq.ts | 1 + ...OrTemplateLiteral_ToTemplatePlusExprSeq.ts | 1 + ...gOrTemplateLiteral_ToTemplatePrefixExpr.ts | 1 + ...tringOrTemplateLiteral_ToTemplateSimple.ts | 1 + ...OrTemplateLiteral_ToTemplateSingleQuote.ts | 1 + 34 files changed, 54 insertions(+), 29 deletions(-) diff --git a/src/services/refactors/convertStringOrTemplateLiteral.ts b/src/services/refactors/convertStringOrTemplateLiteral.ts index e7ffebf6bc..efd92d5d40 100644 --- a/src/services/refactors/convertStringOrTemplateLiteral.ts +++ b/src/services/refactors/convertStringOrTemplateLiteral.ts @@ -14,19 +14,21 @@ namespace ts.refactor.convertStringOrTemplateLiteral { const { file, startPosition } = context; const node = getNodeOrParentOfParentheses(file, startPosition); const maybeBinary = getParentBinaryExpression(node); - const actions: RefactorActionInfo[] = []; + const refactorInfo: ApplicableRefactorInfo = { name: refactorName, description: refactorDescription, actions: [] }; if ((isBinaryExpression(maybeBinary) || isStringLiteral(maybeBinary)) && isStringConcatenationValid(maybeBinary)) { - actions.push({ name: toTemplateLiteralActionName, description: toTemplateLiteralDescription }); + refactorInfo.actions.push({ name: toTemplateLiteralActionName, description: toTemplateLiteralDescription }); + return [refactorInfo]; } const templateLiteral = findAncestor(node, n => isTemplateLiteral(n)); if (templateLiteral && !isTaggedTemplateExpression(templateLiteral.parent)) { - actions.push({ name: toStringConcatenationActionName, description: toStringConcatenationDescription }); + refactorInfo.actions.push({ name: toStringConcatenationActionName, description: toStringConcatenationDescription }); + return [refactorInfo]; } - return [{ name: refactorName, description: refactorDescription, actions }]; + return emptyArray; } function getNodeOrParentOfParentheses(file: SourceFile, startPosition: number) { @@ -137,46 +139,35 @@ namespace ts.refactor.convertStringOrTemplateLiteral { return { nodes: [node as Expression], containsString: isStringLiteral(node), areOperatorsValid: true }; } - function createHead(nodes: ReadonlyArray): [number, TemplateHead] { - let begin = 0; + function concatConsecutiveString(index: number, nodes: ReadonlyArray): [number, string] { let text = ""; - while (begin < nodes.length && isStringLiteral(nodes[begin])) { - const next = nodes[begin] as StringLiteral; - text = text + decodeRawString(next.getText()); - begin++; + while (index < nodes.length && isStringLiteral(nodes[index])) { + text = text + decodeRawString(nodes[index].getText()); + index++; } text = escapeText(text); - return [begin, createTemplateHead(text)]; + return [index, text]; } function nodesToTemplate(nodes: ReadonlyArray) { const templateSpans: TemplateSpan[] = []; - const [begin, head] = createHead(nodes); + const [begin, headText] = concatConsecutiveString(0, nodes); + const templateHead = createTemplateHead(headText); - if (begin === nodes.length) { - return createNoSubstitutionTemplateLiteral(head.text); - } + if (begin === nodes.length) return createNoSubstitutionTemplateLiteral(headText); for (let i = begin; i < nodes.length; i++) { - let current = nodes[i]; - let text = ""; + const expression = isParenthesizedExpression(nodes[i]) ? (nodes[i] as ParenthesizedExpression).expression : nodes[i]; + const [newIndex, subsequentText] = concatConsecutiveString(i + 1, nodes); + i = newIndex - 1; - while (i + 1 < nodes.length && isStringLiteral(nodes[i + 1])) { - const next = nodes[i + 1] as StringLiteral; - text = text + decodeRawString(next.getText()); - i++; - } - - text = escapeText(text); - const templatePart = i === nodes.length - 1 ? createTemplateTail(text) : createTemplateMiddle(text); - - if (isParenthesizedExpression(current)) current = current.expression; - templateSpans.push(createTemplateSpan(current, templatePart)); + const templatePart = i === nodes.length - 1 ? createTemplateTail(subsequentText) : createTemplateMiddle(subsequentText); + templateSpans.push(createTemplateSpan(expression, templatePart)); } - return createTemplateExpression(head, templateSpans); + return createTemplateExpression(templateHead, templateSpans); } const octalToUnicode = (_match: string, grp: string) => String.fromCharCode(parseInt(grp, 8)); @@ -196,3 +187,4 @@ namespace ts.refactor.convertStringOrTemplateLiteral { } } + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAsFnArgument.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAsFnArgument.ts index de79522269..af7f7323eb 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAsFnArgument.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAsFnArgument.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: `console.log("foobar is " + 32 + " years old")`, }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailability.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailability.ts index 03e0882bb2..0727209c02 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailability.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailability.ts @@ -27,3 +27,4 @@ verify.not.refactorAvailable("Convert string concatenation or template literal", goTo.select("p", "o"); verify.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_ToStringAvailabilityTagged.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailabilityTagged.ts index 0b02128f3e..41d85620d3 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailabilityTagged.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailabilityTagged.ts @@ -15,3 +15,4 @@ 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 1850b40f22..83f1be6028 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringBinaryExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringBinaryExpr.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: `const foo = "foobar is " + (42 + 6) + " years old"`, }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringMultiExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringMultiExpr.ts index 3fdd7fb636..3f9cab1d41 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringMultiExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringMultiExpr.ts @@ -14,3 +14,4 @@ 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 710d0f9748..7f050781ef 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInner.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInner.ts @@ -12,3 +12,4 @@ 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 83783e4d65..52d601fe9d 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInnerNonSub.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedInnerNonSub.ts @@ -12,3 +12,4 @@ 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 fb09d7876b..0ffa553936 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedOuter.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringNestedOuter.ts @@ -12,3 +12,4 @@ 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 0e5cb6ae25..f24ef3dfb3 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOneExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOneExpr.ts @@ -12,3 +12,4 @@ edit.applyRefactor({ `const age = 42 const foo = "foobar is " + age + " years old"`, }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOtherExprSeq.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOtherExprSeq.ts index 2970dce189..1c8af7e67b 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOtherExprSeq.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringOtherExprSeq.ts @@ -10,3 +10,4 @@ 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 4b8e581b8c..c008741a25 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringPlusExprSeq.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringPlusExprSeq.ts @@ -10,3 +10,4 @@ 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 7229e9e9f7..82180c6953 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromExpr.ts @@ -12,3 +12,4 @@ 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 c44e4ee646..1125970dec 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromMiddle.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSelectedFromMiddle.ts @@ -12,3 +12,4 @@ 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 3da488fcf2..c2d7598e95 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSimple.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringSimple.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: `const foo = "foobar rocks"`, }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts index a41eef34b4..6482440068 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: `console.log(\`foobar is \${32} years old\`)`, }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityMinus.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityMinus.ts index 50c7921836..98350585cd 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityMinus.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityMinus.ts @@ -23,3 +23,4 @@ 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 f015af3b3c..58fbadba54 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityNoStrings.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityNoStrings.ts @@ -17,3 +17,4 @@ 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 04f24dffc8..128bc5ddc1 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityPrecedingMinus.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityPrecedingMinus.ts @@ -22,3 +22,4 @@ verify.refactorAvailable("Convert string concatenation or template literal", "Co goTo.select("r", "q"); verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to string concatenation"); verify.refactorAvailable("Convert string concatenation or template literal", "Convert to template literal"); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityReassignment.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityReassignment.ts index 03f87ed521..3eca754b60 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityReassignment.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAvailabilityReassignment.ts @@ -14,3 +14,4 @@ verify.refactorAvailable("Convert string concatenation or template literal", "Co goTo.select("v", "u"); verify.not.refactorAvailable("Convert string concatenation or template literal", "Convert to string concatenation"); verify.refactorAvailable("Convert string concatenation or template literal", "Convert to template literal"); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts index 205f84c19a..6dd92c0253 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts @@ -10,3 +10,4 @@ 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 2519ac3466..e101a9250d 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExpr.ts @@ -10,3 +10,4 @@ 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 a7ab291657..9cbe91accb 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExprInEnding.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExprInEnding.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: "const foo = `foobar is \${42 + 6}`", }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateConsecutiveStr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateConsecutiveStr.ts index a053a6c5e3..8e08d3c024 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateConsecutiveStr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateConsecutiveStr.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: `const foo = \`foobar is \${42} years old and \${6} cars are missing\``, }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateExprFromBrace.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateExprFromBrace.ts index 5924da73eb..d6dc5be226 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateExprFromBrace.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateExprFromBrace.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: `const foo = \`foobar is \${42 + 6} years old\``, }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts index e781bae663..95b933a18c 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts @@ -14,3 +14,4 @@ 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 index 39168d42d3..e5a104e29c 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOctalEscape.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOctalEscape.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: "const foo = `Octal #`;", }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts index a790a623aa..70fcb5ae63 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts @@ -12,3 +12,4 @@ 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 bd1fa6009f..b921cc05d8 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOnlyStr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOnlyStr.ts @@ -10,3 +10,4 @@ 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 493f724a2b..b00dad88c2 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOtherExprSeq.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOtherExprSeq.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: `const foo = \`foobar is \${42 * 6 / 4} years old\``, }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePlusExprSeq.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePlusExprSeq.ts index aadc6068a6..2fe8936bf9 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePlusExprSeq.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePlusExprSeq.ts @@ -10,3 +10,4 @@ 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 7b8c624411..1d7e0e9cc0 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePrefixExpr.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplatePrefixExpr.ts @@ -10,3 +10,4 @@ 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 2c5663b07d..5088cfa822 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSimple.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSimple.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: `const foo = \`foobar rocks\``, }); + diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts index 4a4d2c5b26..03e1ac971b 100644 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts +++ b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts @@ -10,3 +10,4 @@ edit.applyRefactor({ newContent: `const foo = \`foobar rocks\``, }); +