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
7 changes: 6 additions & 1 deletion pkg/visitor/formatter/formatter.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,14 @@ func (formatter *formatter) getFreeFloating() []*token.Token {
defer formatter.resetFreeFloating()

if formatter.state == FormatterStateHTML {
// The tag needs whitespace after it: a newline that follows will do.
value := []byte("<?php ")
if len(formatter.freeFloating) > 0 && formatter.freeFloating[0].ID == token.T_WHITESPACE && bytes.HasPrefix(formatter.freeFloating[0].Value, []byte("\n")) {
value = []byte("<?php")
}
openTagToken := &token.Token{
ID: token.T_OPEN_TAG,
Value: []byte("<?php "),
Value: value,
}
formatter.freeFloating = append([]*token.Token{openTagToken}, formatter.freeFloating...)

Expand Down
10 changes: 5 additions & 5 deletions pkg/visitor/formatter/formatter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestFormatter_Root(test *testing.T) {
printerValue := printer.NewPrinter(buffer)
node.Accept(printerValue)

expected := `<?php
expected := `<?php

;`
actual := buffer.String()
Expand Down Expand Up @@ -1766,11 +1766,11 @@ func TestFormatter_StmtInlineHtml(test *testing.T) {
printerValue := printer.NewPrinter(buffer)
node.Accept(printerValue)

expected := `<?php
expected := `<?php

{
;?><div></div><?php
echo $foo;?><div></div><?php
;?><div></div><?php
echo $foo;?><div></div><?php
;
}`
actual := buffer.String()
Expand Down Expand Up @@ -2249,7 +2249,7 @@ func TestFormatter_StmtStmtList(test *testing.T) {
printerValue := printer.NewPrinter(buffer)
node.Accept(printerValue)

expected := `<?php
expected := `<?php

{
{
Expand Down