From f174cd0b7098588a92cb9a9b7f835e6f44f5622b Mon Sep 17 00:00:00 2001 From: Daniel Oliveira Date: Mon, 16 Nov 2026 20:30:39 +0100 Subject: [PATCH] Formatter: closure use list tokens The formatter wrote the use list's parentheses and separators to the parameter list's fields, so a closure with fewer parameters than uses printed a separator after its last parameter: function($a,) use($b, $c). --- pkg/visitor/formatter/formatter.go | 6 +-- pkg/visitor/formatter/formatter_test.go | 50 +++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/pkg/visitor/formatter/formatter.go b/pkg/visitor/formatter/formatter.go index c82a741..6ced666 100644 --- a/pkg/visitor/formatter/formatter.go +++ b/pkg/visitor/formatter/formatter.go @@ -1259,9 +1259,9 @@ func (formatter *formatter) ExprClosure(node *ast.ExprClosure) { if len(node.Uses) > 0 { formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) node.UseTkn = formatter.newToken(token.T_USE, []byte("use")) - node.OpenParenthesisTkn = formatter.newToken('(', []byte("(")) - node.SeparatorTkns = formatter.formatList(node.Uses, ',') - node.CloseParenthesisTkn = formatter.newToken(')', []byte(")")) + node.UseOpenParenthesisTkn = formatter.newToken('(', []byte("(")) + node.UseSeparatorTkns = formatter.formatList(node.Uses, ',') + node.UseCloseParenthesisTkn = formatter.newToken(')', []byte(")")) } node.ColonTkn = nil diff --git a/pkg/visitor/formatter/formatter_test.go b/pkg/visitor/formatter/formatter_test.go index 6e501bb..f7950f4 100644 --- a/pkg/visitor/formatter/formatter_test.go +++ b/pkg/visitor/formatter/formatter_test.go @@ -3639,6 +3639,56 @@ func TestFormatter_ExprClosure_Use(test *testing.T) { } } +func TestFormatter_ExprClosure_ParamsAndUses(test *testing.T) { + buffer := bytes.NewBufferString("") + + node := &ast.ExprClosure{ + Params: []ast.Vertex{ + &ast.Parameter{ + Var: &ast.ExprVariable{ + Name: &ast.Identifier{ + Value: []byte("$a"), + }, + }, + }, + }, + Uses: []ast.Vertex{ + &ast.ExprClosureUse{ + Var: &ast.ExprVariable{ + Name: &ast.Identifier{ + Value: []byte("$foo"), + }, + }, + }, + &ast.ExprClosureUse{ + Var: &ast.ExprVariable{ + Name: &ast.Identifier{ + Value: []byte("$bar"), + }, + }, + }, + }, + Stmts: []ast.Vertex{ + &ast.StmtNop{}, + }, + } + + formatterValue := formatter.NewFormatter().WithState(formatter.FormatterStatePHP).WithIndent(1) + node.Accept(formatterValue) + + printerValue := printer.NewPrinter(buffer).WithState(printer.PrinterStatePHP) + node.Accept(printerValue) + + expected := `function($a) use($foo, $bar) { + ; + }` + actual := buffer.String() + + if expected != actual { + test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual) + } +} + func TestFormatter_ExprClosureUse(test *testing.T) { buffer := bytes.NewBufferString("")