Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean test cases

Browse Source
This commit is contained in:
BigAru
2019-03-24 11:37:58 +01:00
parent d2ab0bd05a
commit 1bcd8da415
5 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/refactors/convertStringOrTemplateLiteral.ts
+2 -9
View File
@@ -175,27 +175,20 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
return createTemplateExpression(head, templateSpans);
}
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(\w+)/gi;
const unicodeEscapeWithBraces = /\\u\{(\w+)\}/gi;
const hexEscape = /\\x(\w+)/gi;
const octalEscape = /\\([0-7]+)/g;
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
.replace("${", "$\\{"); // placeholder alike beginning
}
}
tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringAvailabilityTagged.ts
+1 -1
View File
@@ -1,6 +1,6 @@
/// <reference path='fourslash.ts' />
//// function tag(literals: TemplateStringsArray, ...placeholders: string[]) { return "tagged" }
//// function tag(literals: TemplateStringsArray, ...placeholders: any[]) { return "tagged" }
//// const alpha = tag/*z*/`/*y*/foobar`
//// const beta = tag/*x*/`/*w*/foobar ${/*v*/4/*u*/2}`
tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringBackTick.ts
-12
View File
@@ -1,12 +0,0 @@
/// <reference path='fourslash.ts' />
//// const foo = `/*x*/w/*y*/ith back\`tick`
goTo.select("x", "y");
edit.applyRefactor({
refactorName: "Convert string concatenation or template literal",
actionName: "Convert to string concatenation",
actionDescription: "Convert to string concatenation",
newContent:
"const foo = \"with back`tick\"",
});
tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToStringDollar.ts
-12
View File
@@ -1,12 +0,0 @@
/// <reference path='fourslash.ts' />
//// const foo = `/*x*/w/*y*/ith \${dollar}`
goTo.select("x", "y");
edit.applyRefactor({
refactorName: "Convert string concatenation or template literal",
actionName: "Convert to string concatenation",
actionDescription: "Convert to string concatenation",
newContent:
"const foo = \"with \${dollar}\"",
});
tests/cases/fourslash/refactorConvertStringOrTemplateLiteral_ToTemplateOctalEscape.ts
+2 -3
View File
@@ -1,7 +1,6 @@
/// <reference path='fourslash.ts' />
debugger;
//// const foo = "/*x*/U/*y*/nicode \u0023 \u{0023} " + "Hex \x23 " + "Octal \43";
//// const foo = "/*x*/O/*y*/ctal \43";
goTo.select("x", "y");
edit.applyRefactor({
@@ -9,5 +8,5 @@ edit.applyRefactor({
actionName: "Convert to template literal",
actionDescription: "Convert to template literal",
newContent:
"const foo = `Unicode # # Hex # Octal #\`;",
"const foo = `Octal #`;",
});