microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-19 12:45:58 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Respond to CR

Browse Source
This commit is contained in:
Ivo Gabe de Wolff
2015-01-23 15:44:21 +01:00
parent 434c908c36
commit cbec9a3a3a
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/compiler/emitter.ts
View File

@@ -2051,16 +2051,21 @@ module ts {
return '"' + escapeString(node.text) + '"';
}
function emitDownlevelRawTemplateLiteral(node: LiteralExpression, isLast: boolean) {
function emitDownlevelRawTemplateLiteral(node: LiteralExpression) {
var text = getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
// text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
// thus we need to remove those characters.
// First template piece starts with "`", others with "}"
// Last template piece ends with "`", others with "${"
var isLast = node.kind === SyntaxKind.NoSubstitutionTemplateLiteral || node.kind === SyntaxKind.TemplateTail;
text = text.substring(1, text.length - (isLast ? 1 : 2));
write('"' + escapeString(text) + '"');
// Newline normalization
text = text.replace(/\r\n?/g, "\n");
text = escapeString(text);
write('"' + text + '"');
}
function emitDownlevelTaggedTemplate(node: TaggedTemplateExpression) {
@@ -2074,8 +2079,8 @@ module ts {
emit(node.template);
}
else {
emit((<TemplateExpression> node.template).head);
forEach((<TemplateExpression> node.template).templateSpans, (child) => {
emit((<TemplateExpression>node.template).head);
forEach((<TemplateExpression>node.template).templateSpans, (child) => {
write(", ");
emit(child.literal);
});
@@ -2085,13 +2090,13 @@ module ts {
emit(tempVariable);
write(".raw = [");
if (node.template.kind === SyntaxKind.NoSubstitutionTemplateLiteral) {
emitDownlevelRawTemplateLiteral(<LiteralExpression> node.template, true);
emitDownlevelRawTemplateLiteral(<LiteralExpression>node.template);
}
else {
emitDownlevelRawTemplateLiteral((<TemplateExpression> node.template).head, false);
forEach((<TemplateExpression> node.template).templateSpans, (child, index) => {
emitDownlevelRawTemplateLiteral((<TemplateExpression>node.template).head);
forEach((<TemplateExpression>node.template).templateSpans, (child, index) => {
write(", ");
emitDownlevelRawTemplateLiteral(child.literal, index === (<TemplateExpression> node.template).templateSpans.length - 1);
emitDownlevelRawTemplateLiteral(child.literal);
});
}
write("], ");
@@ -2102,10 +2107,10 @@ module ts {
// Now we emit the expressions
if (node.template.kind === SyntaxKind.TemplateExpression) {
forEach((<TemplateExpression> node.template).templateSpans, templateSpan => {
forEach((<TemplateExpression>node.template).templateSpans, templateSpan => {
write(", ");
var needsParens = templateSpan.expression.kind === SyntaxKind.BinaryExpression
&& (<BinaryExpression> templateSpan.expression).operator === SyntaxKind.CommaToken;
&& (<BinaryExpression>templateSpan.expression).operator === SyntaxKind.CommaToken;
emitParenthesized(templateSpan.expression, needsParens);
});
}