diff --git a/pkg/visitor/formatter/formatter.go b/pkg/visitor/formatter/formatter.go index c82a741..e811e2c 100644 --- a/pkg/visitor/formatter/formatter.go +++ b/pkg/visitor/formatter/formatter.go @@ -318,8 +318,10 @@ func (formatter *formatter) StmtClass(node *ast.StmtClass) { node.ClassTkn = formatter.newToken(token.T_CLASS, []byte("class")) - formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) - node.Name.Accept(formatter) + if node.Name != nil { + formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) + node.Name.Accept(formatter) + } node.OpenParenthesisTkn = nil node.CloseParenthesisTkn = nil diff --git a/pkg/visitor/formatter/formatter_test.go b/pkg/visitor/formatter/formatter_test.go index 6e501bb..ff6419e 100644 --- a/pkg/visitor/formatter/formatter_test.go +++ b/pkg/visitor/formatter/formatter_test.go @@ -6800,3 +6800,67 @@ func TestFormatter_NameNamePart(test *testing.T) { test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual) } } + +func TestFormatter_ExprNew_AnonymousClass(test *testing.T) { + buffer := bytes.NewBufferString("") + + node := &ast.ExprNew{ + Class: &ast.StmtClass{ + Args: []ast.Vertex{ + &ast.Argument{ + Expr: &ast.ExprVariable{ + Name: &ast.Identifier{ + Value: []byte("$a"), + }, + }, + }, + }, + Extends: &ast.Name{ + Parts: []ast.Vertex{ + &ast.NamePart{ + 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 := `new class($a) extends bar { + ; + }` + actual := buffer.String() + + if expected != actual { + test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual) + } +} + +func TestFormatter_ExprNew_EmptyAnonymousClass(test *testing.T) { + buffer := bytes.NewBufferString("") + + node := &ast.ExprNew{ + Class: &ast.StmtClass{}, + } + + formatterValue := formatter.NewFormatter().WithState(formatter.FormatterStatePHP).WithIndent(1) + node.Accept(formatterValue) + + printerValue := printer.NewPrinter(buffer).WithState(printer.PrinterStatePHP) + node.Accept(printerValue) + + expected := `new class {}` + actual := buffer.String() + + if expected != actual { + test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual) + } +}