JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix \\n and \\r in template strings (#1857)

Browse Source 
fixes #1856
This commit is contained in:
kzc
2017-04-30 05:05:32 -04:00
committed by Alex Lam S.L
parent 5c6316a37d
commit 73d6438773
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/output.js
View File

@@ -171,17 +171,6 @@ function OutputStream(options) {
return '"' + str.replace(/\x22/g, '\\"') + '"'; return '"' + str.replace(/\x22/g, '\\"') + '"';
} }
function quote_template() { function quote_template() {
if (!options.ascii_only) {
str = str.replace(/\\(n|r|u2028|u2029)/g, function(s, c) {
switch(c) {
case "n": return "\n";
case "r": return "\r";
case "u2028": return "\u2028";
case "u2029": return "\u2029";
}
return s;
});
}
return '`' + str.replace(/`/g, '\\`') + '`'; return '`' + str.replace(/`/g, '\\`') + '`';
} }
if (options.ascii_only) str = to_ascii(str); if (options.ascii_only) str = to_ascii(str);

31
test/compress/template-string.js
View File

@@ -45,7 +45,7 @@ template_strings_without_ascii_only: {
bar bar
ↂωↂ` ↂωↂ`
} }
expect_exact: "var foo=`foo\n bar\n ↂωↂ`;" expect_exact: "var foo=`foo\\n bar\\n ↂωↂ`;"
} }
template_string_with_constant_expression: { template_string_with_constant_expression: {
@@ -351,7 +351,8 @@ template_starting_with_newline: {
return ` return `
this is a template string!`; this is a template string!`;
}; };
} expect_exact: "function foo(e){return`\nthis is a template string!`}" }
expect_exact: "function foo(e){return`\\nthis is a template string!`}"
} }
template_with_newline: { template_with_newline: {
@@ -363,7 +364,8 @@ template_with_newline: {
return `yep, return `yep,
this is a template string!`; this is a template string!`;
}; };
} expect_exact: "function foo(e){return`yep,\nthis is a template string!`}" }
expect_exact: "function foo(e){return`yep,\\nthis is a template string!`}"
} }
template_ending_with_newline: { template_ending_with_newline: {
@@ -375,5 +377,26 @@ template_ending_with_newline: {
return `this is a template string! return `this is a template string!
`; `;
}; };
} expect_exact: "function foo(e){return`this is a template string!\n`}" }
expect_exact: "function foo(e){return`this is a template string!\\n`}"
}
issue_1856: {
beautify = {
ascii_only: false,
}
input: {
console.log(`\\n\\r\\u2028\\u2029\n\r\u2028\u2029`);
}
expect_exact: "console.log(`\\\\n\\\\r\\\\u2028\\\\u2029\\n\\r\\u2028\\u2029`);"
}
issue_1856_ascii_only: {
beautify = {
ascii_only: true,
}
input: {
console.log(`\\n\\r\\u2028\\u2029\n\r\u2028\u2029`);
}
expect_exact: "console.log(`\\\\n\\\\r\\\\u2028\\\\u2029\\n\\r\\u2028\\u2029`);"
} }