Skip to content

Replace most ID usage with pointers #3362

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
jakebailey wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Replace most ID usage with pointers #3362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7817811
Replace most ID usage with pointers
jakebailey Apr 8, 2026
a01b7f1
Merge branch 'main' into jabaile/less-ids
jakebailey Apr 13, 2026
b8052e0
Merge branch 'main' into jabaile/less-ids
jakebailey Jun 17, 2026
c9cd86c
Use node keys for class expression name tables
jakebailey Jun 17, 2026
34fbb72
Merge remote-tracking branch 'origin/main' into jabaile/less-ids
jakebailey Jul 2, 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
17 changes: 8 additions & 9 deletions internal/ast/utilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2304,7 +2304,7 @@ func GetModuleInstanceState(node *Node) ModuleInstanceState {
return getModuleInstanceState(node, nil, nil)
}

func getModuleInstanceState(node *Node, ancestors []*Node, visited map[NodeId]ModuleInstanceState) ModuleInstanceState {
func getModuleInstanceState(node *Node, ancestors []*Node, visited map[*Node]ModuleInstanceState) ModuleInstanceState {
module := node.AsModuleDeclaration()
if module.Body != nil {
return getModuleInstanceStateCached(module.Body, pushAncestor(ancestors, node), visited)
Expand All @@ -2313,24 +2313,23 @@ func getModuleInstanceState(node *Node, ancestors []*Node, visited map[NodeId]Mo
}
}

func getModuleInstanceStateCached(node *Node, ancestors []*Node, visited map[NodeId]ModuleInstanceState) ModuleInstanceState {
func getModuleInstanceStateCached(node *Node, ancestors []*Node, visited map[*Node]ModuleInstanceState) ModuleInstanceState {
if visited == nil {
visited = make(map[NodeId]ModuleInstanceState)
visited = make(map[*Node]ModuleInstanceState)
}
nodeId := GetNodeId(node)
if cached, ok := visited[nodeId]; ok {
if cached, ok := visited[node]; ok {
if cached != ModuleInstanceStateUnknown {
return cached
}
return ModuleInstanceStateNonInstantiated
}
visited[nodeId] = ModuleInstanceStateUnknown
visited[node] = ModuleInstanceStateUnknown
result := getModuleInstanceStateWorker(node, ancestors, visited)
visited[nodeId] = result
visited[node] = result
return result
}

func getModuleInstanceStateWorker(node *Node, ancestors []*Node, visited map[NodeId]ModuleInstanceState) ModuleInstanceState {
func getModuleInstanceStateWorker(node *Node, ancestors []*Node, visited map[*Node]ModuleInstanceState) ModuleInstanceState {
// A module is uninstantiated if it contains only
switch node.Kind {
case KindInterfaceDeclaration, KindTypeAliasDeclaration, KindJSTypeAliasDeclaration:
Expand Down Expand Up @@ -2384,7 +2383,7 @@ func getModuleInstanceStateWorker(node *Node, ancestors []*Node, visited map[Nod
return ModuleInstanceStateInstantiated
}

func getModuleInstanceStateForAliasTarget(node *Node, ancestors []*Node, visited map[NodeId]ModuleInstanceState) ModuleInstanceState {
func getModuleInstanceStateForAliasTarget(node *Node, ancestors []*Node, visited map[*Node]ModuleInstanceState) ModuleInstanceState {
name := node.PropertyNameOrName()
if name.Kind != KindIdentifier {
// Skip for invalid syntax like this: export { "x" }
Expand Down
Loading