Skip to content

fix(61747): for (using of = is incorrectly parsed #61764

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
jakebailey merged 3 commits into from
Jun 5, 2025
Merged

fix(61747): for (using of = is incorrectly parsed #61764

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5068c2e
fix(61747): fix parsing of 'using of' in for loops to follow spec
a-tarasyuk May 25, 2025
3ef51f5
handle colon token
a-tarasyuk May 26, 2025
6abde76
update helper name
a-tarasyuk May 27, 2025
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
9 changes: 8 additions & 1 deletion src/compiler/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7328,9 +7328,16 @@ namespace Parser {
return nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLine(/*disallowOf*/ true);
}

function nextTokenIsEqualsOrSemicolonToken() {
Comment thread
a-tarasyuk marked this conversation as resolved.
Outdated
nextToken();
return token() === SyntaxKind.EqualsToken || token() === SyntaxKind.SemicolonToken || token() === SyntaxKind.ColonToken;
}

function nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLine(disallowOf?: boolean) {
nextToken();
if (disallowOf && token() === SyntaxKind.OfKeyword) return false;
if (disallowOf && token() === SyntaxKind.OfKeyword) {
return lookAhead(nextTokenIsEqualsOrSemicolonToken);
Comment thread
a-tarasyuk marked this conversation as resolved.
Outdated
}
return (isBindingIdentifier() || token() === SyntaxKind.OpenBraceToken) && !scanner.hasPrecedingLineBreak();
}

Expand Down
10 changes: 10 additions & 0 deletions tests/baselines/reference/usingDeclarationsInForOf.4.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
usingDeclarationsInForOf.4.ts(3,12): error TS1155: 'using' declarations must be initialized.


==== usingDeclarationsInForOf.4.ts (1 errors) ====
for (using of = null;;) break;
for (using of: null = null;;) break;
for (using of;;) break;
~~
!!! error TS1155: 'using' declarations must be initialized.

15 changes: 15 additions & 0 deletions tests/baselines/reference/usingDeclarationsInForOf.4.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//// [tests/cases/conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.4.ts] ////

//// [usingDeclarationsInForOf.4.ts]
for (using of = null;;) break;
for (using of: null = null;;) break;
for (using of;;) break;


//// [usingDeclarationsInForOf.4.js]
for (using of = null;;)
break;
for (using of = null;;)
break;
for (using of;;)
break;
8 changes: 8 additions & 0 deletions ...conformance/statements/VariableStatements/usingDeclarations/usingDeclarationsInForOf.4.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// @target: esnext
// @module: esnext
// @lib: esnext
// @noTypesAndSymbols: true

for (using of = null;;) break;
for (using of: null = null;;) break;
for (using of;;) break;