Fix NodeBuilder.ctxStack management (#1252)

benjaminjkraft · web-flow · commit 0c36c62f9c37 · 2025-06-21T01:37:51.000Z
diff --git a/internal/checker/nodebuilder.go b/internal/checker/nodebuilder.go
@@ -18,6 +18,7 @@ func (b *NodeBuilder) EmitContext() *printer.EmitContext {
 }
 
 func (b *NodeBuilder) enterContext(enclosingDeclaration *ast.Node, flags nodebuilder.Flags, internalFlags nodebuilder.InternalFlags, tracker nodebuilder.SymbolTracker) {
+	b.ctxStack = append(b.ctxStack, b.impl.ctx)
 	b.impl.ctx = &NodeBuilderContext{
 		tracker:                  tracker,
 		flags:                    flags,
@@ -36,7 +37,6 @@ func (b *NodeBuilder) enterContext(enclosingDeclaration *ast.Node, flags nodebui
 		tracker = NewSymbolTrackerImpl(b.impl.ctx, nil, b.host)
 		b.impl.ctx.tracker = tracker
 	}
-	b.ctxStack = append(b.ctxStack, b.impl.ctx)
 }
 
 func (b *NodeBuilder) popContext() {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ func (b NodeBuilder) EmitContext() printer.EmitContext {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`func (b NodeBuilder) enterContext(enclosingDeclaration ast.Node, flags nodebuilder.Flags, internalFlags nodebuilder.InternalFlags, tracker nodebuilder.SymbolTracker) {`
	`21`	`+ b.ctxStack = append(b.ctxStack, b.impl.ctx)`
`21`	`22`	`b.impl.ctx = &NodeBuilderContext{`
`22`	`23`	`tracker: tracker,`
`23`	`24`	`flags: flags,`
`@@ -36,7 +37,6 @@ func (b NodeBuilder) enterContext(enclosingDeclaration ast.Node, flags nodebui`
`36`	`37`	`tracker = NewSymbolTrackerImpl(b.impl.ctx, nil, b.host)`
`37`	`38`	`b.impl.ctx.tracker = tracker`
`38`	`39`	`}`
`39`		`- b.ctxStack = append(b.ctxStack, b.impl.ctx)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func (b *NodeBuilder) popContext() {`