fix things

Author: Andarist

internal/ast/precedence.go

@@ -47,15 +47,6 @@ const (
 	//     LogicalANDExpression
 	//     LogicalORExpression `||` LogicalANDExpression
 	OperatorPrecedenceLogicalOR
-	// ShortCircuitExpression:
-	//     LogicalORExpression
-	//     CoalesceExpression
-	// CoalesceExpression:
-	//     CoalesceExpressionHead `??` BitwiseORExpression
-	// CoalesceExpressionHead:
-	//     CoalesceExpression
-	//     BitwiseORExpression
-	OperatorPrecedenceCoalesce
 	// LogicalANDExpression:
 	//     BitwiseORExpression
 	//     LogicalANDExprerssion `&&` BitwiseORExpression
@@ -181,6 +172,15 @@ const (
 	OperatorPrecedenceLowest        = OperatorPrecedenceComma
 	OperatorPrecedenceHighest       = OperatorPrecedenceParentheses
 	OperatorPrecedenceDisallowComma = OperatorPrecedenceYield
+	// ShortCircuitExpression:
+	//     LogicalORExpression
+	//     CoalesceExpression
+	// CoalesceExpression:
+	//     CoalesceExpressionHead `??` BitwiseORExpression
+	// CoalesceExpressionHead:
+	//     CoalesceExpression
+	//     BitwiseORExpression
+	OperatorPrecedenceCoalesce = OperatorPrecedenceLogicalOR
 	// -1 is lower than all other precedences. Returning it will cause binary expression
 	// parsing to stop.
 	OperatorPrecedenceInvalid OperatorPrecedence = -1

internal/printer/printer.go

@@ -2716,14 +2716,6 @@ func (p *Printer) getBinaryExpressionPrecedence(node *ast.BinaryExpression) (lef
 	case ast.OperatorPrecedenceAssignment:
 		// assignment is right-associative
 		leftPrec = ast.OperatorPrecedenceLeftHandSide
-	case ast.OperatorPrecedenceCoalesce:
-		// allow coalesce on the left, but short circuit to BitwiseOR
-		if isBinaryOperation(node.Left, ast.KindQuestionQuestionToken) {
-			leftPrec = ast.OperatorPrecedenceCoalesce
-		} else {
-			leftPrec = ast.OperatorPrecedenceBitwiseOR
-		}
-		rightPrec = ast.OperatorPrecedenceBitwiseOR
 	case ast.OperatorPrecedenceLogicalOR:
 		rightPrec = ast.OperatorPrecedenceLogicalAND
 	case ast.OperatorPrecedenceLogicalAND:

testdata/baselines/reference/submodule/conformance/nullishCoalescingOperator5.errors.txt

@@ -1,6 +1,6 @@
-nullishCoalescingOperator5.ts(6,6): error TS5076: '||' and '??' operations cannot be mixed without parentheses.
+nullishCoalescingOperator5.ts(6,1): error TS5076: '??' and '||' operations cannot be mixed without parentheses.
 nullishCoalescingOperator5.ts(9,1): error TS5076: '||' and '??' operations cannot be mixed without parentheses.
-nullishCoalescingOperator5.ts(12,6): error TS5076: '&&' and '??' operations cannot be mixed without parentheses.
+nullishCoalescingOperator5.ts(12,6): error TS5076: '??' and '&&' operations cannot be mixed without parentheses.
 nullishCoalescingOperator5.ts(15,1): error TS5076: '&&' and '??' operations cannot be mixed without parentheses.
 
 
@@ -11,8 +11,8 @@ nullishCoalescingOperator5.ts(15,1): error TS5076: '&&' and '??' operations cann
 
     // should be a syntax error
     a ?? b || c;
-         ~~~~~~
-!!! error TS5076: '||' and '??' operations cannot be mixed without parentheses.
+    ~~~~~~
+!!! error TS5076: '??' and '||' operations cannot be mixed without parentheses.
 
     // should be a syntax error
     a || b ?? c;
@@ -22,7 +22,7 @@ nullishCoalescingOperator5.ts(15,1): error TS5076: '&&' and '??' operations cann
     // should be a syntax error
     a ?? b && c;
          ~~~~~~
-!!! error TS5076: '&&' and '??' operations cannot be mixed without parentheses.
+!!! error TS5076: '??' and '&&' operations cannot be mixed without parentheses.
 
     // should be a syntax error
     a && b ?? c;

testdata/baselines/reference/submodule/conformance/nullishCoalescingOperator5.errors.txt.diff

@@ -45,7 +45,7 @@ a && (b ?? c);
 //// [nullishCoalescingOperator5.js]
 var _a, _b, _c, _d;
 // should be a syntax error
-a !== null && a !== void 0 ? a : b || c;
+(a !== null && a !== void 0 ? a : b) || c;
 // should be a syntax error
 (_a = a || b) !== null && _a !== void 0 ? _a : c;
 // should be a syntax error

testdata/baselines/reference/submodule/conformance/nullishCoalescingOperator5.js

@@ -7,8 +7,4 @@
 -"use strict";
  var _a, _b, _c, _d;
  // should be a syntax error
--(a !== null && a !== void 0 ? a : b) || c;
-+a !== null && a !== void 0 ? a : b || c;
- // should be a syntax error
- (_a = a || b) !== null && _a !== void 0 ? _a : c;
- // should be a syntax error
+ (a !== null && a !== void 0 ? a : b) || c;

testdata/baselines/reference/submodule/conformance/nullishCoalescingOperator5.js.diff

@@ -13,8 +13,8 @@ declare const c: string | undefined
 // should be a syntax error
 a ?? b || c;
 >a ?? b || c : string | undefined
+>a ?? b : string | undefined
 >a : string | undefined
->b || c : string | undefined
 >b : string | undefined
 >c : string | undefined
 

testdata/baselines/reference/submodule/conformance/nullishCoalescingOperator5.types

@@ -58,7 +58,7 @@ plainJSGrammarErrors.js(92,33): error TS2566: A rest element cannot have a prope
 plainJSGrammarErrors.js(93,42): error TS1186: A rest element cannot have an initializer.
 plainJSGrammarErrors.js(96,4): error TS1123: Variable declaration list cannot be empty.
 plainJSGrammarErrors.js(97,9): error TS5076: '||' and '??' operations cannot be mixed without parentheses.
-plainJSGrammarErrors.js(98,14): error TS5076: '||' and '??' operations cannot be mixed without parentheses.
+plainJSGrammarErrors.js(98,9): error TS5076: '??' and '||' operations cannot be mixed without parentheses.
 plainJSGrammarErrors.js(100,3): error TS1200: Line terminator not permitted before arrow.
 plainJSGrammarErrors.js(102,4): error TS1358: Tagged template expressions are not permitted in an optional chain.
 plainJSGrammarErrors.js(104,6): error TS1171: A comma expression is not allowed in a computed property name.
@@ -320,8 +320,8 @@ plainJSGrammarErrors.js(205,36): error TS1325: Argument of dynamic import cannot
             ~~~~~~
 !!! error TS5076: '||' and '??' operations cannot be mixed without parentheses.
     var x = 2 ?? 3 || 4
-                 ~~~~~~
-!!! error TS5076: '||' and '??' operations cannot be mixed without parentheses.
+            ~~~~~~
+!!! error TS5076: '??' and '||' operations cannot be mixed without parentheses.
     const arr = x
       => x + 1
       ~~

testdata/baselines/reference/submodule/conformance/nullishCoalescingOperator5.types.diff

@@ -303,8 +303,8 @@ const { e: eep, m: em, ...rest: noRestAllowed } = doom;
 const { e: erp, m: erm, ...noInitialiser = true } = doom;
 // left-over parsing
 var ;
-var x = (1 || 2) ?? 3;
-var x = 2 ?? (3 || 4);
+var x = 1 || 2 ?? 3;
+var x = 2 ?? 3 || 4;
 const arr = x => x + 1;
 var a = [1, 2];
 a `length`;