testea/test-repo
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix member chain print (#18720)

Browse Source
This commit is contained in:
fisker Cheung authored and GitHub committed 2026-01-23 06:36:13 +08:00
1 parent 108c3f5c94
commit 6690ebd09b
9 files changed
+95 -81
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

changelog_unreleased/javascript/18720.md
+13
View File
@@ -0,0 +1,13 @@
#### Fix missing parentheses around optional chaining (#18720 by @fisker)
<!-- prettier-ignore -->
```jsx
// Input
(a?.b()).c();
// Prettier stable
a?.b().c();
// Prettier main
(a?.b()).c();
```
src/language-js/parentheses/needs-parentheses.js
-1
View File
@@ -848,7 +848,6 @@ function needsParentheses(path, options) {
while (object) {
switch (object.type) {
case "CallExpression":
case "OptionalCallExpression":
return true;
case "MemberExpression":
case "OptionalMemberExpression":
src/language-js/print/member-chain.js
+7 -5
View File
@@ -93,7 +93,8 @@ function printMemberChain(path, options, print) {
if (
isCallExpression(node) &&
(isMemberish(node.callee) || isCallExpression(node.callee))
(isMemberish(node.callee) || isCallExpression(node.callee)) &&
!needsParentheses(path, options)
) {
const hasTrailingEmptyLine = shouldInsertEmptyLineAfter(node);
printedNodes.unshift({
@@ -113,10 +114,9 @@ function printMemberChain(path, options, print) {
],
});
path.call(rec, "callee");
} else if (isMemberish(node)) {
} else if (isMemberish(node) && !needsParentheses(path, options)) {
printedNodes.unshift({
node,
needsParens: needsParentheses(path, options),
printed: printComments(
path,
isMemberExpression(node)
@@ -126,10 +126,12 @@ function printMemberChain(path, options, print) {
),
});
path.call(rec, "object");
} else if (node.type === "TSNonNullExpression") {
} else if (
node.type === "TSNonNullExpression" &&
!needsParentheses(path, options)
) {
printedNodes.unshift({
node,
needsParens: needsParentheses(path, options),
printed: printComments(path, "!", options),
});
path.call(rec, "expression");
tests/format/js/chain-expression/__snapshots__/format.test.js.snap
+4 -4
View File
@@ -30,7 +30,7 @@ foo(a?.b);
// In optional chaining
(a?.b())?.();
// FIXME: (a?.b()).c?.();
(a?.b()).c?.();
=====================================output=====================================
// Member expressions
@@ -57,7 +57,7 @@ foo(a?.b);
// In optional chaining
a?.b()?.();
// FIXME: (a?.b()).c?.();
(a?.b()).c?.();
================================================================================
`;
@@ -264,7 +264,7 @@ new (a[b?.c]) ();
new ((a?.b).c) ();
new (a[b?.()]) ();
new ((a?.b).c) ();
// FIXME: new ((a?.()).b) ();
new ((a?.()).b) ();
// Call expressions
new (a?.()) ();
@@ -290,7 +290,7 @@ new a[b?.c]();
new (a?.b).c();
new a[b?.()]();
new (a?.b).c();
// FIXME: new ((a?.()).b) ();
new (a?.()).b();
// Call expressions
new (a?.())();
tests/format/js/chain-expression/call-expression.js
+1 -1
View File
@@ -22,4 +22,4 @@ foo(a?.b);
// In optional chaining
(a?.b())?.();
// FIXME: (a?.b()).c?.();
(a?.b()).c?.();
tests/format/js/chain-expression/new-expression.js
+1 -1
View File
@@ -6,7 +6,7 @@ new (a[b?.c]) ();
new ((a?.b).c) ();
new (a[b?.()]) ();
new ((a?.b).c) ();
// FIXME: new ((a?.()).b) ();
new ((a?.()).b) ();
// Call expressions
new (a?.()) ();
tests/format/typescript/chain-expression/__snapshots__/format.test.js.snap
+46 -46
View File
@@ -24,7 +24,7 @@ printWidth: 80
(a[b!?.c]) ();
((a?.b).c)! ();
((a?.b).c!) ();
// FIXME: ((a?.b!).c) ();
((a?.b!).c) ();
((a!?.b).c) ();
(a[b?.()])! ();
(a[b?.()]!) ();
@@ -33,8 +33,8 @@ printWidth: 80
(a![b?.()]) ();
((a?.b).c)! ();
((a?.b).c!) ();
// FIXME: ((a?.b)!.c) ();
// FIXME: ((a?.b!).c) ();
((a?.b)!.c) ();
((a?.b!).c) ();
((a!?.b).c) ();
((a?.()).b)! ();
((a?.()).b!) ();
@@ -75,7 +75,7 @@ foo((a?.b)!);
(a?.b()!)?.();
(a?.b())!?.();
(a?.b!()).c?.();
// FIXME: (a?.b())!.c?.();
(a?.b())!.c?.();
=====================================output=====================================
// Member expressions
@@ -96,7 +96,7 @@ a[b?.c!]();
a[b!?.c]();
(a?.b).c!();
(a?.b).c!();
// FIXME: ((a?.b!).c) ();
(a?.b!).c();
(a!?.b).c();
a[b?.()]!();
a[b?.()]!();
@@ -105,8 +105,8 @@ a[b!?.()]();
a![b?.()]();
(a?.b).c!();
(a?.b).c!();
// FIXME: ((a?.b)!.c) ();
// FIXME: ((a?.b!).c) ();
(a?.b)!.c();
(a?.b!).c();
(a!?.b).c();
(a?.()).b!();
(a?.()).b!();
@@ -147,7 +147,7 @@ foo((a?.b)!);
a?.b()!?.();
(a?.b())!?.();
(a?.b!()).c?.();
// FIXME: (a?.b())!.c?.();
(a?.b())!.c?.();
================================================================================
`;
@@ -385,15 +385,15 @@ printWidth: 80
| printWidth
=====================================input======================================
// Member expressions
// FIXME: new (a?.b)! ();
// FIXME: new (a?.b!) ();
new (a?.b)! ();
new (a?.b!) ();
new (a!?.b) ();
// FIXME: new (a.b?.c)! ();
// FIXME: new (a.b?.c!) ();
new (a.b?.c)! ();
new (a.b?.c!) ();
new (a.b!?.c) ();
new (a!.b?.c) ();
// FIXME: new (a?.b.c)! ();
// FIXME: new (a?.b.c!) ();
new (a?.b.c)! ();
new (a?.b.c!) ();
new (a?.b!.c) ();
new (a!?.b.c) ();
new (a[b?.c])! ();
@@ -414,24 +414,24 @@ new ((a?.b).c!) ();
new ((a?.b)!.c) ();
new ((a?.b!).c) ();
new ((a!?.b).c) ();
// FIXME: new ((a?.()).b)! ();
// FIXME: new ((a?.()).b!) ();
// FIXME: new ((a?.())!.b) ();
// FIXME: new ((a?.()!).b) ();
// FIXME: new ((a!?.()).b) ();
new ((a?.()).b)! ();
new ((a?.()).b!) ();
new ((a?.())!.b) ();
new ((a?.()!).b) ();
new ((a!?.()).b) ();
// Call expressions
// FIXME: new (a?.())! ();
// FIXME: new (a?.()!) ();
new (a?.())! ();
new (a?.()!) ();
new (a!?.()) ();
// FIXME: new (a.b.c?.())! ();
// FIXME: new (a.b.c?.()!) ();
new (a.b.c?.())! ();
new (a.b.c?.()!) ();
new (a.b.c!?.()) ();
// FIXME: new (a.b?.c())! ();
// FIXME: new (a.b?.c()!) ();
new (a.b?.c())! ();
new (a.b?.c()!) ();
new (a.b!?.c()) ();
// FIXME: new (a?.b.c())! ();
// FIXME: new (a?.b.c()!) ();
new (a?.b.c())! ();
new (a?.b.c()!) ();
new (a?.b!.c()) ();
new (a(b?.c))! ();
new (a(b?.c)!) ();
@@ -455,15 +455,15 @@ new ((a?.b)!?.c)();
=====================================output=====================================
// Member expressions
// FIXME: new (a?.b)! ();
// FIXME: new (a?.b!) ();
new (a?.b)!();
new (a?.b!)();
new (a!?.b)();
// FIXME: new (a.b?.c)! ();
// FIXME: new (a.b?.c!) ();
new (a.b?.c)!();
new (a.b?.c!)();
new (a.b!?.c)();
new (a!.b?.c)();
// FIXME: new (a?.b.c)! ();
// FIXME: new (a?.b.c!) ();
new (a?.b.c)!();
new (a?.b.c!)();
new (a?.b!.c)();
new (a!?.b.c)();
new a[b?.c]!();
@@ -484,24 +484,24 @@ new (a?.b).c!();
new (a?.b)!.c();
new (a?.b!).c();
new (a!?.b).c();
// FIXME: new ((a?.()).b)! ();
// FIXME: new ((a?.()).b!) ();
// FIXME: new ((a?.())!.b) ();
// FIXME: new ((a?.()!).b) ();
// FIXME: new ((a!?.()).b) ();
new (a?.()).b!();
new (a?.()).b!();
new (a?.())!.b();
new (a?.()!).b();
new (a!?.()).b();
// Call expressions
// FIXME: new (a?.())! ();
// FIXME: new (a?.()!) ();
new (a?.())!();
new (a?.()!)();
new (a!?.())();
// FIXME: new (a.b.c?.())! ();
// FIXME: new (a.b.c?.()!) ();
new (a.b.c?.())!();
new (a.b.c?.()!)();
new (a.b.c!?.())();
// FIXME: new (a.b?.c())! ();
// FIXME: new (a.b?.c()!) ();
new (a.b?.c())!();
new (a.b?.c()!)();
new (a.b!?.c())();
// FIXME: new (a?.b.c())! ();
// FIXME: new (a?.b.c()!) ();
new (a?.b.c())!();
new (a?.b.c()!)();
new (a?.b!.c())();
new (a(b?.c)!)();
new (a(b?.c)!)();
tests/format/typescript/chain-expression/call-expression.ts
+4 -4
View File
@@ -16,7 +16,7 @@
(a[b!?.c]) ();
((a?.b).c)! ();
((a?.b).c!) ();
// FIXME: ((a?.b!).c) ();
((a?.b!).c) ();
((a!?.b).c) ();
(a[b?.()])! ();
(a[b?.()]!) ();
@@ -25,8 +25,8 @@
(a![b?.()]) ();
((a?.b).c)! ();
((a?.b).c!) ();
// FIXME: ((a?.b)!.c) ();
// FIXME: ((a?.b!).c) ();
((a?.b)!.c) ();
((a?.b!).c) ();
((a!?.b).c) ();
((a?.()).b)! ();
((a?.()).b!) ();
@@ -67,4 +67,4 @@ foo((a?.b)!);
(a?.b()!)?.();
(a?.b())!?.();
(a?.b!()).c?.();
// FIXME: (a?.b())!.c?.();
(a?.b())!.c?.();
tests/format/typescript/chain-expression/new-expression.ts
+19 -19
View File
@@ -1,13 +1,13 @@
// Member expressions
// FIXME: new (a?.b)! ();
// FIXME: new (a?.b!) ();
new (a?.b)! ();
new (a?.b!) ();
new (a!?.b) ();
// FIXME: new (a.b?.c)! ();
// FIXME: new (a.b?.c!) ();
new (a.b?.c)! ();
new (a.b?.c!) ();
new (a.b!?.c) ();
new (a!.b?.c) ();
// FIXME: new (a?.b.c)! ();
// FIXME: new (a?.b.c!) ();
new (a?.b.c)! ();
new (a?.b.c!) ();
new (a?.b!.c) ();
new (a!?.b.c) ();
new (a[b?.c])! ();
@@ -28,24 +28,24 @@ new ((a?.b).c!) ();
new ((a?.b)!.c) ();
new ((a?.b!).c) ();
new ((a!?.b).c) ();
// FIXME: new ((a?.()).b)! ();
// FIXME: new ((a?.()).b!) ();
// FIXME: new ((a?.())!.b) ();
// FIXME: new ((a?.()!).b) ();
// FIXME: new ((a!?.()).b) ();
new ((a?.()).b)! ();
new ((a?.()).b!) ();
new ((a?.())!.b) ();
new ((a?.()!).b) ();
new ((a!?.()).b) ();
// Call expressions
// FIXME: new (a?.())! ();
// FIXME: new (a?.()!) ();
new (a?.())! ();
new (a?.()!) ();
new (a!?.()) ();
// FIXME: new (a.b.c?.())! ();
// FIXME: new (a.b.c?.()!) ();
new (a.b.c?.())! ();
new (a.b.c?.()!) ();
new (a.b.c!?.()) ();
// FIXME: new (a.b?.c())! ();
// FIXME: new (a.b?.c()!) ();
new (a.b?.c())! ();
new (a.b?.c()!) ();
new (a.b!?.c()) ();
// FIXME: new (a?.b.c())! ();
// FIXME: new (a?.b.c()!) ();
new (a?.b.c())! ();
new (a?.b.c()!) ();
new (a?.b!.c()) ();
new (a(b?.c))! ();
new (a(b?.c)!) ();