Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ampersand in jsx href and src #1056

Merged
merged 18 commits into from Apr 8, 2017
Merged

Fix ampersand in jsx href and src #1056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
52a22ef
Add exceptions for html escape usage in href and src attributes.
yamafaktory Mar 20, 2017
9684dcb
Add new test cases.
yamafaktory Mar 20, 2017
f727380
Remove useless spaces.
yamafaktory Mar 20, 2017
7722580
Do not escape if the parser does not do so.
yamafaktory Mar 21, 2017
f7fe929
Implement a different heuristic for keeping along with the parser.
yamafaktory Mar 21, 2017
aaae029
Update tests.
yamafaktory Mar 21, 2017
b96d537
Forgot passing options as param.
yamafaktory Mar 21, 2017
546e6c2
Experimental alternative implementation.
yamafaktory Mar 22, 2017
394f1b4
Remove other function.
yamafaktory Mar 22, 2017
12bdb89
Merge branch 'master' of https://github.com/jlongster/prettier into 1…
yamafaktory Mar 25, 2017
5c41b55
Push test after merge.
yamafaktory Mar 25, 2017
17c6661
Merge branch 'master' of https://github.com/jlongster/prettier into 1…
yamafaktory Apr 7, 2017
384539e
Update getJsXRawValue in order to return the unprocessed raw value.
yamafaktory Apr 7, 2017
a8930ca
Drop unused htmlEscapeInsideDoubleQuote function.
yamafaktory Apr 8, 2017
96e3641
Move getJSXRawValue function logic to the its only call, drop it.
yamafaktory Apr 8, 2017
8238382
Remove ambiguous comment.
yamafaktory Apr 8, 2017
13074f0
Add Babylon parser.
yamafaktory Apr 8, 2017
2da92a2
Update test cases accordingly, revert regression introduced previously.
yamafaktory Apr 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/printer.js
View file
Open in desktop
Expand Up @@ -1200,7 +1200,10 @@ function genericPrintNoParens(path, options, print) {
(n.value.type === "StringLiteral" || n.value.type === "Literal") &&
typeof n.value.value === "string"
) {
res = '"' + util.htmlEscapeInsideDoubleQuote(n.value.value) + '"';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you delete that function from util since it's no longer being used?

const value = n.value.extra ? n.value.extra.raw : n.value.raw;
res = '"' +
value.slice(1, value.length - 1).replace(/"/g, """) +
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi, you can do .slice(1, -1)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, yeah you're right!

'"';
} else {
res = path.call(print, "value");
}
Expand Down
11 changes: 0 additions & 11 deletions src/util.js
View file
Open in desktop
Expand Up @@ -265,16 +265,6 @@ function setLocEnd(node, index) {
}
}

// http://stackoverflow.com/a/7124052
function htmlEscapeInsideDoubleQuote(str) {
return str.replace(/&/g, "&").replace(/"/g, """);
// Intentionally disable the following since it is safe inside of a
// double quote context
// .replace(/'/g, ''')
// .replace(/</g, '&lt;')
// .replace(/>/g, '&gt;');
}

// http://stackoverflow.com/a/7124052
function htmlEscapeInsideAngleBracket(str) {
return str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
Expand Down Expand Up @@ -328,6 +318,5 @@ module.exports = {
locEnd,
setLocStart,
setLocEnd,
htmlEscapeInsideDoubleQuote,
htmlEscapeInsideAngleBracket
};
15 changes: 13 additions & 2 deletions tests/jsx/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
Expand Up @@ -139,6 +139,17 @@ exports[`expression.js 1`] = `
"
`;

exports[`html_escape.js 1`] = `
"export default () => <a href=\\"https://foo.bar?q1=foo&q2=bar\\" />;

() => <img src=\\"https://bar.foo?param1=1&param2=2\\" />;
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export default () => <a href=\\"https://foo.bar?q1=foo&q2=bar\\" />;

() => <img src=\\"https://bar.foo?param1=1&param2=2\\" />;
"
`;

exports[`hug.js 1`] = `
"<div>
{__DEV__
Expand Down Expand Up @@ -279,7 +290,7 @@ exports[`parens.js 1`] = `
<path
key='1'
d='M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,'
/>,
/>,
];

<div {...((foo || foo === null) ? {foo} : null)} />
Expand All @@ -305,7 +316,7 @@ exports[`quotes.js 1`] = `
<div id={'\\\\'\\"&quot;<>&amp;quot;'} />;
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<div id=\\"&quot;'<>&amp;quot;\\" />;
<div id=\\"&quot;'<>&amp;quot;\\" />;
<div id=\\"&quot;&#39;<>&amp;quot;\\" />;
<div id={\\"'\\\\\\"&quot;<>&amp;quot;\\"} />;
"
`;
3 changes: 3 additions & 0 deletions tests/jsx/html_escape.js
View file
Open in desktop
@@ -0,0 +1,3 @@
export default () => <a href="https://foo.bar?q1=foo&q2=bar" />;

() => <img src="https://bar.foo?param1=1&param2=2" />;
2 changes: 1 addition & 1 deletion tests/jsx/jsfmt.spec.js
View file
Open in desktop
@@ -1 +1 @@
run_spec(__dirname, null, ["typescript"]);
run_spec(__dirname, null, ["babylon", "typescript"]);
2 changes: 1 addition & 1 deletion tests/jsx/parens.js
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ a = [
<path
key='1'
d='M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,'
/>,
/>,
];

<div {...((foo || foo === null) ? {foo} : null)} />