Skip to content

Escape quotes when emitting React #5178

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

Merged
merged 1 commit into from
Oct 12, 2015
Merged

Escape quotes when emitting React #5178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/compiler/emitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6848,7 +6848,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
if (isLineBreak(c)) {
if (firstNonWhitespace !== -1 && (lastNonWhitespace - firstNonWhitespace + 1 > 0)) {
let part = text.substr(firstNonWhitespace, lastNonWhitespace - firstNonWhitespace + 1);
result = (result ? result + "\" + ' ' + \"" : "") + part;
result = (result ? result + "\" + ' ' + \"" : "") + escapeString(part);
}
firstNonWhitespace = -1;
}
Expand All @@ -6862,7 +6862,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi

if (firstNonWhitespace !== -1) {
let part = text.substr(firstNonWhitespace);
result = (result ? result + "\" + ' ' + \"" : "") + part;
result = (result ? result + "\" + ' ' + \"" : "") + escapeString(part);
}

if (result) {
Expand Down
6 changes: 6 additions & 0 deletions tests/baselines/reference/tsxReactEmit6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ namespace M {
// and M.React.__spread
var foo;
var spread1 = <div x='' {...foo} y='' />;

// Quotes
var x = <div>This "quote" thing</div>;
}



//// [file.js]
Expand All @@ -33,4 +37,6 @@ var M;
// and M.React.__spread
var foo;
var spread1 = M.React.createElement("div", M.React.__spread({x: ''}, foo, {y: ''}));
// Quotes
var x = M.React.createElement("div", null, "This \"quote\" thing");
})(M || (M = {}));
7 changes: 7 additions & 0 deletions tests/baselines/reference/tsxReactEmit6.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,12 @@ namespace M {
>x : Symbol(unknown)
>foo : Symbol(foo, Decl(react-consumer.tsx, 7, 4))
>y : Symbol(unknown)

// Quotes
var x = <div>This "quote" thing</div>;
>x : Symbol(x, Decl(react-consumer.tsx, 11, 4))
>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 2, 22))
>div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 2, 22))
}


8 changes: 8 additions & 0 deletions tests/baselines/reference/tsxReactEmit6.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,13 @@ namespace M {
>x : any
>foo : any
>y : any

// Quotes
var x = <div>This "quote" thing</div>;
>x : JSX.Element
><div>This "quote" thing</div> : JSX.Element
>div : any
>div : any
}


4 changes: 4 additions & 0 deletions tests/cases/conformance/jsx/tsxReactEmit6.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@ namespace M {
// and M.React.__spread
var foo;
var spread1 = <div x='' {...foo} y='' />;

// Quotes
var x = <div>This "quote" thing</div>;
}