🤖 Pick PR #53666 (Disable JSX recovery hack when in u...) into releas…

…e-5.0 (#53676) Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
microsoft · Apr 5, 2023 · b2d5d9b · b2d5d9b
1 parent 0e198c2
commit b2d5d9b
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 3 deletions.
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -5684,7 +5684,7 @@ namespace Parser {
                 // Just like in parseUpdateExpression, we need to avoid parsing type assertions when
                 // in JSX and we see an expression like "+ <foo> bar".
                 if (languageVariant === LanguageVariant.JSX) {
-                    return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true);
+                    return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true, /*topInvalidNodePosition*/ undefined, /*openingTag*/ undefined, /*mustBeUnary*/ true);
                 }
                 // This is modified UnaryExpression grammar in TypeScript
                 //  UnaryExpression (modified):
@@ -5911,7 +5911,7 @@ namespace Parser {
         return finishNode(factoryCreatePropertyAccessExpression(expression, parseRightSideOfDot(/*allowIdentifierNames*/ true, /*allowPrivateIdentifiers*/ true)), pos);
     }
 
-    function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext: boolean, topInvalidNodePosition?: number, openingTag?: JsxOpeningElement | JsxOpeningFragment): JsxElement | JsxSelfClosingElement | JsxFragment {
+    function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext: boolean, topInvalidNodePosition?: number, openingTag?: JsxOpeningElement | JsxOpeningFragment, mustBeUnary = false): JsxElement | JsxSelfClosingElement | JsxFragment {
         const pos = getNodePos();
         const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
         let result: JsxElement | JsxSelfClosingElement | JsxFragment;
@@ -5968,7 +5968,9 @@ namespace Parser {
         // does less damage and we can report a better error.
         // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios
         // of one sort or another.
-        if (inExpressionContext && token() === SyntaxKind.LessThanToken) {
+        // If we are in a unary context, we can't do this recovery; the binary expression we return here is not
+        // a valid UnaryExpression and will cause problems later.
+        if (!mustBeUnary && inExpressionContext && token() === SyntaxKind.LessThanToken) {
             const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
             const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true, topBadPos));
             if (invalidElement) {

diff --git a/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash1.errors.txt b/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash1.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/compiler/a.js(1,4): error TS1003: Identifier expected.
+tests/cases/compiler/a.js(1,5): error TS1109: Expression expected.
+
+
+==== tests/cases/compiler/a.js (2 errors) ====
+    ~< <
+       ~
+!!! error TS1003: Identifier expected.
+
+!!! error TS1109: Expression expected.
+
diff --git a/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash1.js b/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash1.js
@@ -0,0 +1,7 @@
+//// [a.js]
+~< <
+
+
+//// [a.js]
+~< /> <
+;
diff --git a/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash1.symbols b/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash1.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/a.js ===
+
+~< <
+
diff --git a/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash1.types b/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash1.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/a.js ===
+~< <
+>~< < : boolean
+>~< : number
+>< : any
+> : any
+
+> : any
+
diff --git a/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash2.errors.txt b/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash2.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/compiler/a.js(1,9): error TS1109: Expression expected.
+
+
+==== tests/cases/compiler/a.js (1 errors) ====
+    ~<></> <
+
+!!! error TS1109: Expression expected.
+
diff --git a/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash2.js b/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash2.js
@@ -0,0 +1,7 @@
+//// [a.js]
+~<></> <
+
+
+//// [a.js]
+~<></> <
+;
diff --git a/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash2.symbols b/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash2.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/a.js ===
+
+~<></> <
+
diff --git a/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash2.types b/tests/baselines/reference/parseJsxElementInUnaryExpressionNoCrash2.types
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/a.js ===
+~<></> <
+>~<></> < : boolean
+>~<></> : number
+><></> : any
+
+> : any
+
diff --git a/tests/cases/compiler/parseJsxElementInUnaryExpressionNoCrash1.ts b/tests/cases/compiler/parseJsxElementInUnaryExpressionNoCrash1.ts
@@ -0,0 +1,4 @@
+// @allowJs: true
+// @outDir: ./out
+// @filename: a.js
+~< <
diff --git a/tests/cases/compiler/parseJsxElementInUnaryExpressionNoCrash2.ts b/tests/cases/compiler/parseJsxElementInUnaryExpressionNoCrash2.ts
@@ -0,0 +1,4 @@
+// @allowJs: true
+// @outDir: ./out
+// @filename: a.js
+~<></> <