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.

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

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions changelog_unreleased/javascript/15204.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#### Break after `=` of assignment if RHS is poorly breakable AwaitExpression or YieldExpression (#15204 by @seiyab)

<!-- prettier-ignore -->
```js
// Input
const { section, rubric, authors, tags } = await utils.upsertCommonData(mainData);

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

// Prettier main
const { section, rubric, authors, tags } =
await utils.upsertCommonData(mainData);
```
6 changes: 5 additions & 1 deletion src/language-js/print/assignment.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,11 @@ function shouldBreakAfterOperator(path, options, print, hasShortKey) {
let node = rightNode;
const propertiesForPath = [];
for (;;) {
if (node.type === "UnaryExpression") {
if (
node.type === "UnaryExpression" ||
node.type === "AwaitExpression" ||
(node.type === "YieldExpression" && node.argument !== null)
) {
node = node.argument;
propertiesForPath.push("argument");
} else if (node.type === "TSNonNullExpression") {
Expand Down
98 changes: 98 additions & 0 deletions tests/format/js/assignment/__snapshots__/jsfmt.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,104 @@ printWidth: 80
================================================================================
`;

exports[`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;

const longlonglonglonglonglonglong1 = await new Promise((resolve, reject) => { setTimeout(() => { resolve('foo'); }, 300); })
const longlonglonglonglonglonglong2 = await { then(onFulfilled, onRejected) { onFulfilled(1234567890) } };
}

function* g() {
const { section, rubric, authors, tags } = yield utils.upsertCommonData(mainData);

const loooooooooooooooooooooooooong1 = yield looooooooooooooong.looooooooooooooong.loooooong;
const loooooooooooooooooooooooooong2 = yield looooooooooooooong.looooooooooooooong.loooooong();
const loooooooooooooooooooooooooong3 = yield looooooooooooooooooooooooooooooooooooooooooooog();
const loooooooooooooooooooooooooong4 = !(yield looooooooooooooong.looooooooooooooong.loooooong);
const loooooooooooooooooooooooooong5 = void !!(yield looooooooooooooong.looooooooooooooong.loooooong);
const loooooooooooooooooooooooooong6 = yield* looooooooooooooong.looooooooooooooong.loooooong;

const longlonglonglonglonglonglong1 = yield qwertyuiop(asdfghjkl, zxcvbnm, qwertyuiop, asdfghjkl);
const longlonglonglonglonglonglong2 = yield { qwertyuiop: 1234567890, asdfghjkl: 1234567890, zxcvbnm: 123456789 };

const x = yield;
}

=====================================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);

const longlonglonglonglonglonglong1 = await new Promise((resolve, reject) => {
setTimeout(() => {
resolve("foo");
}, 300);
});
const longlonglonglonglonglonglong2 = await {
then(onFulfilled, onRejected) {
onFulfilled(1234567890);
},
};
}

function* g() {
const { section, rubric, authors, tags } =
yield utils.upsertCommonData(mainData);

const loooooooooooooooooooooooooong1 =
yield looooooooooooooong.looooooooooooooong.loooooong;
const loooooooooooooooooooooooooong2 =
yield looooooooooooooong.looooooooooooooong.loooooong();
const loooooooooooooooooooooooooong3 =
yield looooooooooooooooooooooooooooooooooooooooooooog();
const loooooooooooooooooooooooooong4 =
!(yield looooooooooooooong.looooooooooooooong.loooooong);
const loooooooooooooooooooooooooong5 =
void !!(yield looooooooooooooong.looooooooooooooong.loooooong);
const loooooooooooooooooooooooooong6 =
yield* looooooooooooooong.looooooooooooooong.loooooong;

const longlonglonglonglonglonglong1 = yield qwertyuiop(
asdfghjkl,
zxcvbnm,
qwertyuiop,
asdfghjkl,
);
const longlonglonglonglonglonglong2 = yield {
qwertyuiop: 1234567890,
asdfghjkl: 1234567890,
zxcvbnm: 123456789,
};

const x = yield;
}

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

exports[`issue-1419.js format 1`] = `
====================================options=====================================
parsers: ["babel", "flow", "typescript"]
Expand Down
28 changes: 28 additions & 0 deletions tests/format/js/assignment/discussion-15196.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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;

const longlonglonglonglonglonglong1 = await new Promise((resolve, reject) => { setTimeout(() => { resolve('foo'); }, 300); })
const longlonglonglonglonglonglong2 = await { then(onFulfilled, onRejected) { onFulfilled(1234567890) } };
}

function* g() {
const { section, rubric, authors, tags } = yield utils.upsertCommonData(mainData);

const loooooooooooooooooooooooooong1 = yield looooooooooooooong.looooooooooooooong.loooooong;
const loooooooooooooooooooooooooong2 = yield looooooooooooooong.looooooooooooooong.loooooong();
const loooooooooooooooooooooooooong3 = yield looooooooooooooooooooooooooooooooooooooooooooog();
const loooooooooooooooooooooooooong4 = !(yield looooooooooooooong.looooooooooooooong.loooooong);
const loooooooooooooooooooooooooong5 = void !!(yield looooooooooooooong.looooooooooooooong.loooooong);
const loooooooooooooooooooooooooong6 = yield* looooooooooooooong.looooooooooooooong.loooooong;

const longlonglonglonglonglonglong1 = yield qwertyuiop(asdfghjkl, zxcvbnm, qwertyuiop, asdfghjkl);
const longlonglonglonglonglonglong2 = yield { qwertyuiop: 1234567890, asdfghjkl: 1234567890, zxcvbnm: 123456789 };

const x = yield;
Copy link
Member

Choose a reason for hiding this comment

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

one test for yield* ... please.

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 have missed it, thank you for feedback.

}