Skip to content

Fix missing parsingContext restore at return in parseDelimitedList #48999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 6, 2022
Merged

Fix missing parsingContext restore at return in parseDelimitedList #48999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0307455
Add test cases
jakebailey May 6, 2022
c7ea79c
Fix missing parsingContext restore at return in parseDelimitedList
jakebailey May 6, 2022
3a8ce70
Fix baseline
jakebailey May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/compiler/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2745,6 +2745,7 @@ namespace ts {
const startPos = scanner.getStartPos();
const result = parseListElement(kind, parseElement);
if (!result) {
parsingContext = saveParsingContext;
return undefined;
}
list.push(result as NonNullable<T>);
Expand Down
11 changes: 11 additions & 0 deletions tests/baselines/reference/parserUnparsedTokenCrash1.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
tests/cases/compiler/a.js(1,9): error TS1005: ')' expected.
tests/cases/compiler/a.js(1,13): error TS1005: ';' expected.


==== tests/cases/compiler/a.js (2 errors) ====
( y = 1 ; 2 )
~
!!! error TS1005: ')' expected.
~
!!! error TS1005: ';' expected.

7 changes: 7 additions & 0 deletions tests/baselines/reference/parserUnparsedTokenCrash1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//// [a.js]
( y = 1 ; 2 )


//// [a.js]
(y = 1);
2;
4 changes: 4 additions & 0 deletions tests/baselines/reference/parserUnparsedTokenCrash1.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
=== tests/cases/compiler/a.js ===
( y = 1 ; 2 )
No type information for this code.
No type information for this code.
8 changes: 8 additions & 0 deletions tests/baselines/reference/parserUnparsedTokenCrash1.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
=== tests/cases/compiler/a.js ===
( y = 1 ; 2 )
>( y = 1 : 1
>y = 1 : 1
>y : any
>1 : 1
>2 : 2

30 changes: 30 additions & 0 deletions tests/baselines/reference/parserUnparsedTokenCrash2.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
tests/cases/compiler/parserUnparsedTokenCrash2.ts(1,10): error TS1109: Expression expected.
tests/cases/compiler/parserUnparsedTokenCrash2.ts(1,12): error TS2304: Cannot find name 'x'.
tests/cases/compiler/parserUnparsedTokenCrash2.ts(1,16): error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
tests/cases/compiler/parserUnparsedTokenCrash2.ts(1,18): error TS2304: Cannot find name 'y'.
tests/cases/compiler/parserUnparsedTokenCrash2.ts(1,22): error TS2304: Cannot find name 'z'.
tests/cases/compiler/parserUnparsedTokenCrash2.ts(1,27): error TS1109: Expression expected.
tests/cases/compiler/parserUnparsedTokenCrash2.ts(1,39): error TS1005: ';' expected.
tests/cases/compiler/parserUnparsedTokenCrash2.ts(2,1): error TS1005: '}' expected.


==== tests/cases/compiler/parserUnparsedTokenCrash2.ts (8 errors) ====
export = } x = ( y = z ==== 'function') {
~
!!! error TS1109: Expression expected.
~
!!! error TS2304: Cannot find name 'x'.
~~~~~~~~~~~
!!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
~
!!! error TS2304: Cannot find name 'y'.
~
!!! error TS2304: Cannot find name 'z'.
~
!!! error TS1109: Expression expected.
~
!!! error TS1005: ';' expected.


!!! error TS1005: '}' expected.
!!! related TS1007 tests/cases/compiler/parserUnparsedTokenCrash2.ts:1:41: The parser expected to find a '}' to match the '{' token here.
10 changes: 10 additions & 0 deletions tests/baselines/reference/parserUnparsedTokenCrash2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//// [parserUnparsedTokenCrash2.ts]
export = } x = ( y = z ==== 'function') {


//// [parserUnparsedTokenCrash2.js]
"use strict";
x = (y = z === ) = 'function';
{
}
module.exports = ;
4 changes: 4 additions & 0 deletions tests/baselines/reference/parserUnparsedTokenCrash2.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
=== tests/cases/compiler/parserUnparsedTokenCrash2.ts ===
export = } x = ( y = z ==== 'function') {
No type information for this code.
No type information for this code.
14 changes: 14 additions & 0 deletions tests/baselines/reference/parserUnparsedTokenCrash2.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
=== tests/cases/compiler/parserUnparsedTokenCrash2.ts ===
export = } x = ( y = z ==== 'function') {
> : any
>x = ( y = z ==== 'function' : "function"
>x : any
>( y = z ==== 'function' : "function"
>( y = z === : boolean
>y = z === : boolean
>y : any
>z === : boolean
>z : any
> : any
>'function' : "function"

4 changes: 4 additions & 0 deletions tests/cases/compiler/parserUnparsedTokenCrash1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// @allowJs: true
// @outDir: ./out
// @filename: a.js
( y = 1 ; 2 )
1 change: 1 addition & 0 deletions tests/cases/compiler/parserUnparsedTokenCrash2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export = } x = ( y = z ==== 'function') {