Fix some missed cases passing the boolean around

jakebailey · jakebailey · commit 4d44f0727200 · 2022-01-28T11:16:47.000-08:00
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -4175,7 +4175,7 @@ namespace ts {
             // If we do successfully parse arrow-function, we must *not* recurse for productions 1, 2 or 3. An ArrowFunction is
             // not a LeftHandSideExpression, nor does it start a ConditionalExpression.  So we are done
             // with AssignmentExpression if we see one.
-            const arrowExpression = tryParseParenthesizedArrowFunctionExpression(parsingConditionalExpression) || tryParseAsyncSimpleArrowFunctionExpression();
+            const arrowExpression = tryParseParenthesizedArrowFunctionExpression(parsingConditionalExpression) || tryParseAsyncSimpleArrowFunctionExpression(parsingConditionalExpression);
             if (arrowExpression) {
                 return arrowExpression;
             }
@@ -4206,7 +4206,7 @@ namespace ts {
             // Note: we call reScanGreaterToken so that we get an appropriately merged token
             // for cases like `> > =` becoming `>>=`
             if (isLeftHandSideExpression(expr) && isAssignmentOperator(reScanGreaterToken())) {
-                return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher(), pos);
+                return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher(parsingConditionalExpression), pos);
             }
 
             // It wasn't an assignment or a lambda.  This is a conditional expression:
@@ -4574,7 +4574,7 @@ namespace ts {
             const lastToken = token();
             const equalsGreaterThanToken = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken);
             const body = (lastToken === SyntaxKind.EqualsGreaterThanToken || lastToken === SyntaxKind.OpenBraceToken)
-                ? parseArrowFunctionExpressionBody(some(modifiers, isAsyncModifier))
+                ? parseArrowFunctionExpressionBody(some(modifiers, isAsyncModifier), parsingConditionalExpression)
                 : parseIdentifier();
 
             const node = factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body);
diff --git a/tests/baselines/reference/parserArrowFunctionExpression12.errors.txt b/tests/baselines/reference/parserArrowFunctionExpression12.errors.txt
@@ -1,17 +1,14 @@
 tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts(1,1): error TS2304: Cannot find name 'a'.
-tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts(1,17): error TS2304: Cannot find name 'd'.
+tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts(1,13): error TS2304: Cannot find name 'c'.
 tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts(1,22): error TS2304: Cannot find name 'e'.
-tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts(2,1): error TS1005: ':' expected.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts (4 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts (3 errors) ====
     a ? (b) => (c): d => e
     ~
 !!! error TS2304: Cannot find name 'a'.
-                    ~
-!!! error TS2304: Cannot find name 'd'.
+                ~
+!!! error TS2304: Cannot find name 'c'.
                          ~
 !!! error TS2304: Cannot find name 'e'.
-    
-    
-!!! error TS1005: ':' expected.
+    
diff --git a/tests/baselines/reference/parserArrowFunctionExpression12.js b/tests/baselines/reference/parserArrowFunctionExpression12.js
@@ -3,6 +3,4 @@ a ? (b) => (c): d => e
 
 
 //// [parserArrowFunctionExpression12.js]
-a ? function (b) { return function (c) { return e; }; }
-    :
-;
+a ? function (b) { return (c); } : function (d) { return e; };
diff --git a/tests/baselines/reference/parserArrowFunctionExpression12.symbols b/tests/baselines/reference/parserArrowFunctionExpression12.symbols
@@ -1,6 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts ===
 a ? (b) => (c): d => e
 >b : Symbol(b, Decl(parserArrowFunctionExpression12.ts, 0, 5))
->c : Symbol(c, Decl(parserArrowFunctionExpression12.ts, 0, 12))
->d : Symbol(d)
+>d : Symbol(d, Decl(parserArrowFunctionExpression12.ts, 0, 15))
 
diff --git a/tests/baselines/reference/parserArrowFunctionExpression12.types b/tests/baselines/reference/parserArrowFunctionExpression12.types
@@ -1,12 +1,12 @@
 === tests/cases/conformance/parser/ecmascript5/ArrowFunctionExpressions/parserArrowFunctionExpression12.ts ===
 a ? (b) => (c): d => e
->a ? (b) => (c): d => e : any
+>a ? (b) => (c): d => e : (b: any) => any
 >a : any
->(b) => (c): d => e : (b: any) => (c: any) => d
+>(b) => (c) : (b: any) => any
 >b : any
->(c): d => e : (c: any) => d
+>(c) : any
 >c : any
+>d => e : (d: any) => any
+>d : any
 >e : any
 
-> : any
-
