Skip to content

Port "Fix ASI after get/set keyword" #1055

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 1 commit into from
Jun 4, 2025
Merged

Port "Fix ASI after get/set keyword" #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 internal/parser/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3906,9 +3906,12 @@ func (p *Parser) nextTokenCanFollowModifier() bool {
return p.canFollowExportModifier()
case ast.KindDefaultKeyword:
return p.nextTokenCanFollowDefaultKeyword()
case ast.KindStaticKeyword, ast.KindGetKeyword, ast.KindSetKeyword:
case ast.KindStaticKeyword:
p.nextToken()
return p.canFollowModifier()
Copy link
Preview

Copilot AI Jun 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Consider adding a comment explaining why get and set keywords are handled separately from static, to improve clarity for future maintainers.

Suggested change
return p.canFollowModifier()
return p.canFollowModifier()
// `get` and `set` are contextual keywords that require specific validation logic
// to determine their role in the syntax (e.g., as accessors or other constructs).

Copilot uses AI. Check for mistakes.

case ast.KindGetKeyword, ast.KindSetKeyword:
p.nextToken()
return p.canFollowGetOrSetKeyword()
default:
return p.nextTokenIsOnSameLineAndCanFollowModifier()
}
Expand Down Expand Up @@ -3963,6 +3966,10 @@ func (p *Parser) canFollowModifier() bool {
return p.token == ast.KindOpenBracketToken || p.token == ast.KindOpenBraceToken || p.token == ast.KindAsteriskToken || p.token == ast.KindDotDotDotToken || p.isLiteralPropertyName()
}

func (p *Parser) canFollowGetOrSetKeyword() bool {
return p.token == ast.KindOpenBracketToken || p.isLiteralPropertyName()
}

func (p *Parser) nextTokenIsOnSameLineAndCanFollowModifier() bool {
p.nextToken()
if p.hasPrecedingLineBreak() {
Expand Down
20 changes: 10 additions & 10 deletions testdata/baselines/reference/submodule/conformance/canFollowGetSetKeyword.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
error TS2318: Cannot find global type 'IterableIterator'.
canFollowGetSetKeyword.ts(3,5): error TS1003: Identifier expected.
canFollowGetSetKeyword.ts(7,5): error TS1003: Identifier expected.
canFollowGetSetKeyword.ts(11,5): error TS1003: Identifier expected.
canFollowGetSetKeyword.ts(15,5): error TS1003: Identifier expected.
canFollowGetSetKeyword.ts(10,5): error TS18004: No value exists in scope for the shorthand property 'get'. Either declare one or provide an initializer.
canFollowGetSetKeyword.ts(11,5): error TS1005: ',' expected.
canFollowGetSetKeyword.ts(14,5): error TS18004: No value exists in scope for the shorthand property 'set'. Either declare one or provide an initializer.
canFollowGetSetKeyword.ts(15,5): error TS1005: ',' expected.


!!! error TS2318: Cannot find global type 'IterableIterator'.
==== canFollowGetSetKeyword.ts (4 errors) ====
class A {
get
*x() {}
~
!!! error TS1003: Identifier expected.
}
class B {
set
*x() {}
~
!!! error TS1003: Identifier expected.
}
const c = {
get
~~~
!!! error TS18004: No value exists in scope for the shorthand property 'get'. Either declare one or provide an initializer.
*x() {}
~
!!! error TS1003: Identifier expected.
!!! error TS1005: ',' expected.
};
const d = {
set
~~~
!!! error TS18004: No value exists in scope for the shorthand property 'set'. Either declare one or provide an initializer.
*x() {}
~
!!! error TS1003: Identifier expected.
!!! error TS1005: ',' expected.
};
46 changes: 0 additions & 46 deletions testdata/baselines/reference/submodule/conformance/canFollowGetSetKeyword.errors.txt.diff
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions testdata/baselines/reference/submodule/conformance/canFollowGetSetKeyword.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,18 @@ const d = {

//// [canFollowGetSetKeyword.js]
class A {
get;
*x() { }
}
class B {
set;
*x() { }
}
const c = {
get,
*x() { }
};
const d = {
set,
*x() { }
};
4 changes: 4 additions & 0 deletions testdata/baselines/reference/submodule/conformance/canFollowGetSetKeyword.js.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,18 @@
- return [2 /*return*/];
- }); }
+class A {
+ get;
+ *x() { }
+}
+class B {
+ set;
+ *x() { }
+}
+const c = {
+ get,
+ *x() { }
+};
+const d = {
+ set,
+ *x() { }
};