From 3e0d34cdd82c721682807f24eea45c8103289480 Mon Sep 17 00:00:00 2001 From: BigAru Date: Sun, 30 Jun 2019 19:32:26 +0200 Subject: [PATCH] remove explicit escaping for placeholder opening --- .../refactors/convertStringOrTemplateLiteral.ts | 8 +------- ...onvertStringOrTemplateLiteral_ToTemplateDollar.ts | 12 ------------ 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateDollar.ts diff --git a/src/services/refactors/convertStringOrTemplateLiteral.ts b/src/services/refactors/convertStringOrTemplateLiteral.ts index 68e9de37c8c..61fa1e6e100 100644 --- a/src/services/refactors/convertStringOrTemplateLiteral.ts +++ b/src/services/refactors/convertStringOrTemplateLiteral.ts @@ -198,7 +198,7 @@ namespace ts.refactor.convertStringOrTemplateLiteral { index++; } - text = escapeText(text); + text = escapeString(text); return [index, text, indexes]; } @@ -247,10 +247,4 @@ namespace ts.refactor.convertStringOrTemplateLiteral { } return node; } - - function escapeText(content: string) { - return content.replace("`", "\`") // back-tick - .replace("${", "$\\{"); // placeholder alike beginning - } - } diff --git a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateDollar.ts b/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateDollar.ts deleted file mode 100644 index a073b6838f5..00000000000 --- a/tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateDollar.ts +++ /dev/null @@ -1,12 +0,0 @@ -/// - -//// const foo = "/*x*/w/*y*/ith ${dollar}" - -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 = `with $\\\\{dollar}`", -});