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

support single quotes when decoding raw string

Browse Source
This commit is contained in:
BigAru
2019-03-24 16:52:26 +01:00
parent 6a1df730c5
commit d2ab0bd05a
9 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/refactors/convertStringOrTemplateLiteral.ts
+7 -7
View File
@@ -124,10 +124,10 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
return { nodes: [node], containsString: false, areOperatorsValid: true };
}
const nodeOperatorValid = node.operatorToken.kind === SyntaxKind.PlusToken;
const isPlus = leftOperatorValid && nodeOperatorValid && rightOperatorValid;
const currentOperatorValid = node.operatorToken.kind === SyntaxKind.PlusToken;
const areOperatorsValid = leftOperatorValid && currentOperatorValid && rightOperatorValid;
return { nodes: leftNodes.concat(rightNodes), containsString: true, areOperatorsValid: isPlus };
return { nodes: leftNodes.concat(rightNodes), containsString: true, areOperatorsValid };
}
return { nodes: [node as Expression], containsString: isStringLiteral(node), areOperatorsValid: true };
@@ -179,10 +179,10 @@ namespace ts.refactor.convertStringOrTemplateLiteral {
const octalToUnicode = (_match: string, grp: string) => String.fromCharCode(parseInt(grp, 8));
function decodeRawString(content: string) {
const outerQuotes = /"((.|\s)*)"/;
const unicodeEscape = /\\u([\d\w]+)/gi;
const unicodeEscapeWithBraces = /\\u\{([\d\w]+\})/gi;
const hexEscape = /\\x([\d\w]+)/gi;
const outerQuotes = /["']((.|\s)*)["']/;
const unicodeEscape = /\\u(\w+)/gi;
const unicodeEscapeWithBraces = /\\u\{(\w+)\}/gi;
const hexEscape = /\\x(\w+)/gi;
const octalEscape = /\\([0-7]+)/g;
return content.replace(outerQuotes, (_match, grp) => grp)