Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions pkg/visitor/formatter/formatter.go
Original file line number Diff line number Diff line change
Expand Up @@ -334,12 +334,14 @@ func (formatter *formatter) StmtClass(node *ast.StmtClass) {
formatter.addFreeFloating(token.T_WHITESPACE, []byte(" "))
if node.Extends != nil {
node.ExtendsTkn = formatter.newToken(token.T_EXTENDS, []byte("extends"))
formatter.addFreeFloating(token.T_WHITESPACE, []byte(" "))
node.Extends.Accept(formatter)
formatter.addFreeFloating(token.T_WHITESPACE, []byte(" "))
}

if node.Implements != nil {
node.ImplementsTkn = formatter.newToken(token.T_IMPLEMENTS, []byte("implements"))
formatter.addFreeFloating(token.T_WHITESPACE, []byte(" "))
node.ImplementsSeparatorTkns = formatter.formatList(node.Implements, ',')
formatter.addFreeFloating(token.T_WHITESPACE, []byte(" "))
}
Expand Down Expand Up @@ -728,6 +730,7 @@ func (formatter *formatter) StmtEnum(node *ast.StmtEnum) {

if node.Implements != nil {
node.ImplementsTkn = formatter.newToken(token.T_IMPLEMENTS, []byte("implements"))
formatter.addFreeFloating(token.T_WHITESPACE, []byte(" "))
node.ImplementsSeparatorTkns = formatter.formatList(node.Implements, ',')
formatter.addFreeFloating(token.T_WHITESPACE, []byte(" "))
}
Expand Down Expand Up @@ -771,6 +774,7 @@ func (formatter *formatter) StmtInterface(node *ast.StmtInterface) {

if node.Extends != nil {
node.ExtendsTkn = formatter.newToken(token.T_EXTENDS, []byte("extends"))
formatter.addFreeFloating(token.T_WHITESPACE, []byte(" "))
node.ExtendsSeparatorTkns = formatter.formatList(node.Extends, ',')
formatter.addFreeFloating(token.T_WHITESPACE, []byte(" "))
}
Expand Down
118 changes: 118 additions & 0 deletions pkg/visitor/formatter/formatter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6800,3 +6800,121 @@ func TestFormatter_NameNamePart(test *testing.T) {
test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
}
}

func TestFormatter_Class_FullyQualifiedParents(test *testing.T) {
buffer := bytes.NewBufferString("")

node := &ast.StmtClass{
Name: &ast.Identifier{
Value: []byte("foo"),
},
Extends: &ast.NameFullyQualified{
Parts: []ast.Vertex{
&ast.NamePart{
Value: []byte("bar"),
},
},
},
Implements: []ast.Vertex{
&ast.NameFullyQualified{
Parts: []ast.Vertex{
&ast.NamePart{
Value: []byte("baz"),
},
},
},
},
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 := `class foo extends \bar implements \baz {
;
}`
actual := buffer.String()

if expected != actual {
test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
}
}

func TestFormatter_StmtInterface_FullyQualifiedExtends(test *testing.T) {
buffer := bytes.NewBufferString("")

node := &ast.StmtInterface{
Name: &ast.Identifier{
Value: []byte("foo"),
},
Extends: []ast.Vertex{
&ast.NameFullyQualified{
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 := `interface foo extends \bar {
;
}`
actual := buffer.String()

if expected != actual {
test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
}
}

func TestFormatter_StmtEnum_FullyQualifiedImplements(test *testing.T) {
buffer := bytes.NewBufferString("")

node := &ast.StmtEnum{
Name: &ast.Identifier{
Value: []byte("foo"),
},
Implements: []ast.Vertex{
&ast.NameFullyQualified{
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 := `enum foo implements \bar {
;
}`
actual := buffer.String()

if expected != actual {
test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
}
}