Cleaned up refactoring names, descriptions.

DanielRosenwasser · DanielRosenwasser · commit ff4fa1feb9c2 · 2020-01-02T16:32:06.000-08:00
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -5341,14 +5341,10 @@
         "category": "Message",
         "code": 95095
     },
-    "Convert string concatenation or template literal": {
+    "Convert to template string": {
         "category": "Message",
         "code": 95096
     },
-    "Convert to template literal": {
-        "category": "Message",
-        "code": 95097
-    },
 
     "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.": {
         "category": "Error",
diff --git a/src/services/refactors/convertStringOrTemplateLiteral.ts b/src/services/refactors/convertStringOrTemplateLiteral.ts
@@ -1,10 +1,7 @@
 /* @internal */
 namespace ts.refactor.convertStringOrTemplateLiteral {
-    const refactorName = "Convert string concatenation or template literal";
-    const toTemplateLiteralActionName = "Convert to template literal";
-
-    const refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_string_concatenation_or_template_literal);
-    const toTemplateLiteralDescription = getLocaleSpecificMessage(Diagnostics.Convert_to_template_literal);
+    const refactorName = "Convert to template string";
+    const refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_to_template_string);
 
     registerRefactor(refactorName, { getEditsForAction, getAvailableActions });
 
@@ -15,7 +12,7 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
         const refactorInfo: ApplicableRefactorInfo = { name: refactorName, description: refactorDescription, actions: [] };
 
         if ((isBinaryExpression(maybeBinary) || isStringLiteral(maybeBinary)) && isStringConcatenationValid(maybeBinary)) {
-            refactorInfo.actions.push({ name: toTemplateLiteralActionName, description: toTemplateLiteralDescription });
+            refactorInfo.actions.push({ name: refactorName, description: refactorDescription });
             return [refactorInfo];
         }
         return emptyArray;
@@ -36,12 +33,12 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
         return node;
     }
 
-    function getEditsForAction(context: RefactorContext, actionName: typeof toTemplateLiteralActionName): RefactorEditInfo | undefined {
+    function getEditsForAction(context: RefactorContext, actionName: string): RefactorEditInfo | undefined {
         const { file, startPosition } = context;
         const node = getNodeOrParentOfParentheses(file, startPosition);
 
         switch (actionName) {
-            case toTemplateLiteralActionName:
+            case refactorDescription:
                 return { edits: getEditsForToTemplateLiteral(context, node) };
             default:
                 return Debug.fail("invalid action");
diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateAsFnArgument.ts
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     newContent:
 `console.log(\`foobar is \${32} years old\`)`,
 });
diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBackTick.ts
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     newContent:
 "const foo = `with back\\`tick`",
 });
diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateBinaryExpr.ts
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     newContent:
 "const foo = `foobar is \${42 + 6}`",
 });
diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateComment.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateComment.ts
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     newContent:
 `const foo = \`foobar is \${42} years old and \${6} cars are missing\``,
 });
diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateMultiExpr.ts
@@ -6,9 +6,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     newContent:
 `const age = 22
 const name = "Eddy"
diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOneExpr.ts
@@ -5,9 +5,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     newContent:
 `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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     newContent:
 "const foo = `foobar rocks fantastically`",
 });
diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOtherExprSeq.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOtherExprSeq.ts
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     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
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     newContent:
 `const foo = \`foobar rocks\``,
 });
diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateSingleQuote.ts
@@ -4,9 +4,9 @@
 
 goTo.select("x", "y");
 edit.applyRefactor({
-    refactorName: "Convert string concatenation or template literal",
-    actionName: "Convert to template literal",
-    actionDescription: "Convert to template literal",
+    refactorName: "Convert to template string",
+    actionName: "Convert to template string",
+    actionDescription: ts.Diagnostics.Convert_to_template_string.message,
     newContent:
 `const foo = \`foobar rocks\``,
 });
