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
12 changes: 10 additions & 2 deletions pkg/visitor/formatter/formatter.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ func (formatter *formatter) newToken(tokenID token.ID, value []byte) *token.Toke
}

func (formatter *formatter) formatList(nodes []ast.Vertex, separator byte) []*token.Token {
if len(nodes) == 0 {
return nil
}

separatorTokens := make([]*token.Token, len(nodes)-1)
for i, node := range nodes {
node.Accept(formatter)
Expand Down Expand Up @@ -1146,7 +1150,9 @@ func (formatter *formatter) ExprArray(node *ast.ExprArray) {
func (formatter *formatter) ExprArrayDimFetch(node *ast.ExprArrayDimFetch) {
node.Var.Accept(formatter)
node.OpenBracketTkn = formatter.newToken('[', []byte("["))
node.Dim.Accept(formatter)
if node.Dim != nil {
node.Dim.Accept(formatter)
}
node.CloseBracketTkn = formatter.newToken(']', []byte("]"))
}

Expand All @@ -1162,7 +1168,9 @@ func (formatter *formatter) ExprArrayItem(node *ast.ExprArrayItem) {
formatter.addFreeFloating(token.T_WHITESPACE, []byte(" "))
}

node.Val.Accept(formatter)
if node.Val != nil {
node.Val.Accept(formatter)
}
}

func (formatter *formatter) ExprArrowFunction(node *ast.ExprArrowFunction) {
Expand Down
74 changes: 74 additions & 0 deletions pkg/visitor/formatter/formatter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3118,6 +3118,25 @@ func TestFormatter_ExprArray(test *testing.T) {
}
}

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

node := &ast.ExprArray{}

formatterValue := formatter.NewFormatter().WithState(formatter.FormatterStatePHP).WithIndent(1)
node.Accept(formatterValue)

printerValue := printer.NewPrinter(buffer).WithState(printer.PrinterStatePHP)
node.Accept(printerValue)

expected := `array()`
actual := buffer.String()

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

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

Expand Down Expand Up @@ -3148,6 +3167,31 @@ func TestFormatter_ExprArrayDimFetch(test *testing.T) {
}
}

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

node := &ast.ExprArrayDimFetch{
Var: &ast.ExprVariable{
Name: &ast.Identifier{
Value: []byte("$foo"),
},
},
}

formatterValue := formatter.NewFormatter().WithState(formatter.FormatterStatePHP).WithIndent(1)
node.Accept(formatterValue)

printerValue := printer.NewPrinter(buffer).WithState(printer.PrinterStatePHP)
node.Accept(printerValue)

expected := `$foo[]`
actual := buffer.String()

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

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

Expand Down Expand Up @@ -4045,6 +4089,36 @@ func TestFormatter_ExprList(test *testing.T) {
}
}

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

node := &ast.ExprList{
Items: []ast.Vertex{
&ast.ExprArrayItem{},
&ast.ExprArrayItem{
Val: &ast.ExprVariable{
Name: &ast.Identifier{
Value: []byte("$b"),
},
},
},
},
}

formatterValue := formatter.NewFormatter().WithState(formatter.FormatterStatePHP).WithIndent(1)
node.Accept(formatterValue)

printerValue := printer.NewPrinter(buffer).WithState(printer.PrinterStatePHP)
node.Accept(printerValue)

expected := `list(, $b)`
actual := buffer.String()

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

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

Expand Down