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

[compiler][patch] Fix jsx non-ascii regex pattern #30382

Merged
merged 7 commits into from
Jul 18, 2024
Merged

[compiler][patch] Fix jsx non-ascii regex pattern #30382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
13640da
[compiler][patch] Fix jsx non-ascii regex pattern
mofeiZ Jul 18, 2024
8fc521d
Update on "[compiler][patch] Fix jsx non-ascii regex pattern"
mofeiZ Jul 18, 2024
5768a14
Update on "[compiler][patch] Fix jsx non-ascii regex pattern"
mofeiZ Jul 18, 2024
f62cedc
Update on "[compiler][patch] Fix jsx non-ascii regex pattern"
mofeiZ Jul 18, 2024
5d893a9
Update on "[compiler][patch] Fix jsx non-ascii regex pattern"
mofeiZ Jul 18, 2024
cdf360e
Update on "[compiler][patch] Fix jsx non-ascii regex pattern"
mofeiZ Jul 18, 2024
f1f0aaf
Update on "[compiler][patch] Fix jsx non-ascii regex pattern"
mofeiZ Jul 18, 2024
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
2 changes: 1 addition & 1 deletion compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/CodegenReactiveFunction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2206,7 +2206,7 @@ function codegenInstructionValue(
* https://en.wikipedia.org/wiki/List_of_Unicode_characters#Control_codes
*/
const STRING_REQUIRES_EXPR_CONTAINER_PATTERN =
/[\u{0000}-\u{001F}|\u{007F}|\u{0080}-\u{FFFF}]|"/u;
/[\u{0000}-\u{001F}\u{007F}\u{0080}-\u{FFFF}]|"/u;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Previously, we were matching | literals

Copy link
Member

Choose a reason for hiding this comment

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

I can't recall why we needed to escape the u{..., does it work without them?

Copy link
Contributor Author

@mofeiZ mofeiZ Jul 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

According to the docs, 1 and 2, I think \u{HHHH} and \uHHHH both work

function codegenJsxAttribute(
cx: Context,
attribute: JsxAttribute
Expand Down
41 changes: 36 additions & 5 deletions ...-plugin-react-compiler/src/__tests__/fixtures/compiler/fbt/fbt-params.expect.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ import fbt from "fbt";

function Component(props) {
return (
<fbt desc={"Dialog to show to user"}>
Hello <fbt:param name="user name">{props.name}</fbt:param>
</fbt>
<div>
<fbt desc={"Dialog to show to user"}>
Hello <fbt:param name="user name">{props.name}</fbt:param>
</fbt>
<fbt desc={"Available actions|response"}>
<fbt:param name="actions|response">{props.actions}</fbt:param>
</fbt>
</div>
);
}

Expand All @@ -27,7 +32,7 @@ import { c as _c } from "react/compiler-runtime";
import fbt from "fbt";

function Component(props) {
const $ = _c(2);
const $ = _c(7);
let t0;
if ($[0] !== props.name) {
t0 = fbt._("Hello {user name}", [fbt._param("user name", props.name)], {
Expand All @@ -38,7 +43,33 @@ function Component(props) {
} else {
t0 = $[1];
}
return t0;
let t1;
if ($[2] !== props.actions) {
t1 = fbt._(
"{actions|response}",
[fbt._param("actions|response", props.actions)],
{ hk: "1cjfbg" },
);
$[2] = props.actions;
$[3] = t1;
} else {
t1 = $[3];
}
let t2;
if ($[4] !== t0 || $[5] !== t1) {
t2 = (
<div>
{t0}
{t1}
</div>
);
$[4] = t0;
$[5] = t1;
$[6] = t2;
} else {
t2 = $[6];
}
return t2;
}

export const FIXTURE_ENTRYPOINT = {
Expand Down
11 changes: 8 additions & 3 deletions ...er/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/fbt/fbt-params.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@ import fbt from "fbt";

function Component(props) {
return (
<fbt desc={"Dialog to show to user"}>
Hello <fbt:param name="user name">{props.name}</fbt:param>
</fbt>
<div>
<fbt desc={"Dialog to show to user"}>
Hello <fbt:param name="user name">{props.name}</fbt:param>
</fbt>
<fbt desc={"Available actions|response"}>
<fbt:param name="actions|response">{props.actions}</fbt:param>
</fbt>
</div>
);
}

Expand Down
Loading