Skip to content

Port TypeScript PR #62950: Ignore computed name parents when looking up containing functions #2461

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

Draft
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Port TypeScript PR #62950: Ignore computed name parents when looking up containing functions #2461

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22cd50f
Initial plan
Copilot Jan 9, 2026
0e9fa90
Port TypeScript PR #62950: Ignore computed name parents when looking …
Copilot Jan 9, 2026
18afbac
Add nil checks for Parent pointers in computed property name handling
Copilot Jan 9, 2026
c0af02c
Remove unused getContainingClassStaticBlock and add tests from upstre…
Copilot Jan 15, 2026
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
16 changes: 15 additions & 1 deletion internal/ast/utilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3885,7 +3885,21 @@ func IsExpandoInitializer(initializer *Node) bool {
}

func GetContainingFunction(node *Node) *Node {
return FindAncestor(node.Parent, IsFunctionLike)
node = node.Parent
for node != nil {
if node.Kind == KindComputedPropertyName {
if node.Parent != nil && node.Parent.Parent != nil {
node = node.Parent.Parent
continue
}
return nil
}
if IsFunctionLike(node) {
return node
}
node = node.Parent
}
return nil
}

func IsImplicitlyExportedJSTypeAlias(node *Node) bool {
Expand Down
37 changes: 36 additions & 1 deletion internal/checker/utilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,42 @@ func (s *orderedSet[T]) add(value T) {
}

func getContainingFunctionOrClassStaticBlock(node *ast.Node) *ast.Node {
return ast.FindAncestor(node.Parent, ast.IsFunctionLikeOrClassStaticBlockDeclaration)
node = node.Parent
for node != nil {
if node.Kind == ast.KindComputedPropertyName {
if node.Parent != nil && node.Parent.Parent != nil {
node = node.Parent.Parent
continue
}
return nil
}
if ast.IsFunctionLikeOrClassStaticBlockDeclaration(node) {
return node
}
node = node.Parent
}
return nil
}

func getContainingClassStaticBlock(node *ast.Node) *ast.Node {
Copy link
Member

@jakebailey jakebailey Jan 15, 2026

Choose a reason for hiding this comment

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

It's suspect that this is ported but the func is unused

Copy link
Contributor Author

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

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

Removed in c0af02c. It was unused since the equivalent TypeScript logic (in addInheritedMembers) isn't in the Go codebase.

node = node.Parent
for node != nil {
if node.Kind == ast.KindComputedPropertyName {
if node.Parent != nil && node.Parent.Parent != nil {
node = node.Parent.Parent
continue
}
return nil
}
if ast.IsClassLike(node) || ast.IsFunctionLike(node) {
return nil
}
if ast.IsClassStaticBlockDeclaration(node) {
return node
}
node = node.Parent
}
return nil
}

func isNodeDescendantOf(node *ast.Node, ancestor *ast.Node) bool {
Expand Down