Disable JSX recovery hack when in unary expression context (#53666)

This commit is contained in:
Jake Bailey 2023-04-05 13:04:37 -07:00 committed by GitHub
parent a720ba921f
commit bebb6d0086
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 71 additions and 3 deletions

View File

@ -5694,7 +5694,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):
@ -5921,7 +5921,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;
@ -5978,7 +5978,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) {

View File

@ -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.

View File

@ -0,0 +1,7 @@
//// [a.js]
~< <
//// [a.js]
~< /> <
;

View File

@ -0,0 +1,4 @@
=== tests/cases/compiler/a.js ===
~< <

View File

@ -0,0 +1,9 @@
=== tests/cases/compiler/a.js ===
~< <
>~< < : boolean
>~< : number
>< : any
> : any
> : any

View File

@ -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.

View File

@ -0,0 +1,7 @@
//// [a.js]
~<></> <
//// [a.js]
~<></> <
;

View File

@ -0,0 +1,4 @@
=== tests/cases/compiler/a.js ===
~<></> <

View File

@ -0,0 +1,8 @@
=== tests/cases/compiler/a.js ===
~<></> <
>~<></> < : boolean
>~<></> : number
><></> : any
> : any

View File

@ -0,0 +1,4 @@
// @allowJs: true
// @outDir: ./out
// @filename: a.js
~< <

View File

@ -0,0 +1,4 @@
// @allowJs: true
// @outDir: ./out
// @filename: a.js
~<></> <