🤖 Pick PR #62311 (Fix parenthesizer rules for manuall...) into release-5.9

src/compiler/factory/parenthesizerRules.ts

@@ -112,6 +112,16 @@ export function createParenthesizerRules(factory: NodeFactory): ParenthesizerRul
         return parenthesizerRule;
     }
 
+    function mixingBinaryOperatorsRequiresParentheses(a: SyntaxKind, b: SyntaxKind) {
+        if (a === SyntaxKind.QuestionQuestionToken) {
+            return b === SyntaxKind.AmpersandAmpersandToken || b === SyntaxKind.BarBarToken;
+        }
+        if (b === SyntaxKind.QuestionQuestionToken) {
+            return a === SyntaxKind.AmpersandAmpersandToken || a === SyntaxKind.BarBarToken;
+        }
+        return false;
+    }
+
     /**
      * Determines whether the operand to a BinaryExpression needs to be parenthesized.
      *
@@ -121,6 +131,10 @@ export function createParenthesizerRules(factory: NodeFactory): ParenthesizerRul
      *                           BinaryExpression.
      */
     function binaryOperandNeedsParentheses(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand: Expression | undefined) {
+        const emittedOperand = skipPartiallyEmittedExpressions(operand);
+        if (isBinaryExpression(emittedOperand) && mixingBinaryOperatorsRequiresParentheses(binaryOperator, emittedOperand.operatorToken.kind)) {
+            return true;
+        }
         // If the operand has lower precedence, then it needs to be parenthesized to preserve the
         // intent of the expression. For example, if the operand is `a + b` and the operator is
         // `*`, then we need to parenthesize the operand to preserve the intended order of
@@ -140,7 +154,6 @@ export function createParenthesizerRules(factory: NodeFactory): ParenthesizerRul
         // the intended order of operations: `(a ** b) ** c`
         const binaryOperatorPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, binaryOperator);
         const binaryOperatorAssociativity = getOperatorAssociativity(SyntaxKind.BinaryExpression, binaryOperator);
-        const emittedOperand = skipPartiallyEmittedExpressions(operand);
         if (!isLeftSideOfBinary && operand.kind === SyntaxKind.ArrowFunction && binaryOperatorPrecedence > OperatorPrecedence.Assignment) {
             // We need to parenthesize arrow functions on the right side to avoid it being
             // parsed as parenthesized expression: `a && (() => {})`

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryAmpersandAmpersandExpressionWithLeftBinaryQuestionQuestionExpression.js

@@ -0,0 +1 @@
+(a ?? b) && c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryAmpersandAmpersandExpressionWithRightBinaryQuestionQuestionExpression.js

@@ -0,0 +1 @@
+a && (b ?? c);

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryBarBarExpressionWithLeftBinaryQuestionQuestionExpression.js

@@ -0,0 +1 @@
+(a ?? b) || c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryBarBarExpressionWithRightBinaryQuestionQuestionExpression.js

@@ -0,0 +1 @@
+a || (b ?? c);

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryCommaExpressionWithLeftBinaryQuestionQuestionExpression.js

@@ -0,0 +1 @@
+a ?? b, c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryCommaExpressionWithRightBinaryQuestionQuestionExpression.js

@@ -0,0 +1 @@
+a, b ?? c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryEqualsEqualsExpressionWithLeftBinaryQuestionQuestionExpression.js

@@ -0,0 +1 @@
+(a ?? b) == c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryEqualsEqualsExpressionWithRightBinaryQuestionQuestionExpression.js

@@ -0,0 +1 @@
+a == (b ?? c);

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryQuestionQuestionExpressionWithLeftBinaryAmpersandAmpersandExpression.js

@@ -0,0 +1 @@
+(a && b) ?? c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryQuestionQuestionExpressionWithLeftBinaryBarBarExpression.js

@@ -0,0 +1 @@
+(a || b) ?? c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryQuestionQuestionExpressionWithLeftBinaryCommaExpression.js

@@ -0,0 +1 @@
+(a, b) ?? c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryQuestionQuestionExpressionWithLeftBinaryEqualsEqualsExpression.js

@@ -0,0 +1 @@
+a == b ?? c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryQuestionQuestionExpressionWithLeftBinaryQuestionQuestionExpression.js

@@ -0,0 +1 @@
+a ?? b ?? c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryQuestionQuestionExpressionWithRightBinaryAmpersandAmpersandExpression.js

@@ -0,0 +1 @@
+a ?? (b && c);

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryQuestionQuestionExpressionWithRightBinaryBarBarExpression.js

@@ -0,0 +1 @@
+a ?? (b || c);

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryQuestionQuestionExpressionWithRightBinaryCommaExpression.js

@@ -0,0 +1 @@
+a ?? (b, c);

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryQuestionQuestionExpressionWithRightBinaryEqualsEqualsExpression.js

@@ -0,0 +1 @@
+a ?? b == c;

tests/baselines/reference/printerApi/printsNodeCorrectly.binaryQuestionQuestionExpressionWithRightBinaryQuestionQuestionExpression.js

@@ -0,0 +1 @@
+a ?? (b ?? c);