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

Break after equal on assignment if rhs is await/yield expression #15204

Merged
merged 9 commits into from
Aug 6, 2023
+147 −1
Merged

Break after equal on assignment if rhs is await/yield expression #15204

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
75b00b2
add as-is test
seiyab Aug 3, 2023
b389ea1
break after equal on assignment if rhs is wait
seiyab Aug 3, 2023
7ce5fc7
rename test file
seiyab Aug 4, 2023
651099b
add as-is test
seiyab Aug 4, 2023
19c26c0
treat YieldExpression
seiyab Aug 4, 2023
70ae55b
add tests
seiyab Aug 4, 2023
16f94eb
add changelog
seiyab Aug 4, 2023
900f47f
fix a bug
seiyab Aug 4, 2023
6ac0033
add test for delegated yield
seiyab Aug 5, 2023
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
2 changes: 1 addition & 1 deletion src/language-js/print/assignment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ function shouldBreakAfterOperator(path, options, print, hasShortKey) {
let node = rightNode;
const propertiesForPath = [];
for (;;) {
if (node.type === "UnaryExpression") {
if (node.type === "UnaryExpression" || node.type === "AwaitExpression") {
Copy link
Member

Choose a reason for hiding this comment

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

If we are doing this, I think we should treat yield the sameway, though it's not very common to be on RHS.

Copy link
Sponsor Contributor Author

Choose a reason for hiding this comment

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

Ah, I agree with you,thank you.
Maybe typeof too？

Copy link
Sponsor Contributor Author

Choose a reason for hiding this comment

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

I noticed typeof already breaks after =.
I try to work on yield.

node = node.argument;
propertiesForPath.push("argument");
} else if (node.type === "TSNonNullExpression") {
Expand Down
36 changes: 36 additions & 0 deletions tests/format/js/assignment/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`await-discussion-15196.js format 1`] = `
====================================options=====================================
parsers: ["babel", "flow", "typescript"]
printWidth: 80
| printWidth
=====================================input======================================
async function f() {
const { section, rubric, authors, tags } = await utils.upsertCommonData(mainData);

const loooooooooooooooooooooooooong1 = await looooooooooooooong.looooooooooooooong.loooooong;
const loooooooooooooooooooooooooong2 = await looooooooooooooong.looooooooooooooong.loooooong();
const loooooooooooooooooooooooooong3 = await looooooooooooooooooooooooooooooooooooooooooooog();
const loooooooooooooooooooooooooong4 = !await looooooooooooooong.looooooooooooooong.loooooong;
const loooooooooooooooooooooooooong5 = void !!await looooooooooooooong.looooooooooooooong.loooooong;
}

=====================================output=====================================
async function f() {
const { section, rubric, authors, tags } =
await utils.upsertCommonData(mainData);

const loooooooooooooooooooooooooong1 =
await looooooooooooooong.looooooooooooooong.loooooong;
const loooooooooooooooooooooooooong2 =
await looooooooooooooong.looooooooooooooong.loooooong();
const loooooooooooooooooooooooooong3 =
await looooooooooooooooooooooooooooooooooooooooooooog();
const loooooooooooooooooooooooooong4 =
!(await looooooooooooooong.looooooooooooooong.loooooong);
const loooooooooooooooooooooooooong5 =
void !!(await looooooooooooooong.looooooooooooooong.loooooong);
}

================================================================================
`;

exports[`binaryish.js format 1`] = `
====================================options=====================================
parsers: ["babel", "flow", "typescript"]
Expand Down
9 changes: 9 additions & 0 deletions tests/format/js/assignment/await-discussion-15196.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
async function f() {
Copy link
Sponsor Contributor Author

Choose a reason for hiding this comment

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

This is because Flow yields error on top-level await.

const { section, rubric, authors, tags } = await utils.upsertCommonData(mainData);

const loooooooooooooooooooooooooong1 = await looooooooooooooong.looooooooooooooong.loooooong;
const loooooooooooooooooooooooooong2 = await looooooooooooooong.looooooooooooooong.loooooong();
const loooooooooooooooooooooooooong3 = await looooooooooooooooooooooooooooooooooooooooooooog();
const loooooooooooooooooooooooooong4 = !await looooooooooooooong.looooooooooooooong.loooooong;
const loooooooooooooooooooooooooong5 = void !!await looooooooooooooong.looooooooooooooong.loooooong;
}