maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add some boundary checks so the formatter panics less often

Browse Source
This commit is contained in:
Laytan Laats 2023-04-10 02:17:36 +02:00
parent 68ac672368
commit 6a5a06a206
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/visitor/formatter/formatter.go
View File

@ -22,6 +22,9 @@ type formatter struct {
lastSemiColon *token.Token lastSemiColon *token.Token
} }
// NewFormatter returns a new formatter. This formatter is not great, it can not be customized,
// but most importantly, loses a lot of doc comments and regular comments, so don't use on code
// that wants to keep all comments in tact.
func NewFormatter() *formatter { func NewFormatter() *formatter {
return &formatter{} return &formatter{}
} }
@ -83,6 +86,10 @@ func (f *formatter) newToken(id token.ID, val []byte) *token.Token {
} }
func (f *formatter) formatList(nodes []ast.Vertex, separator byte) []*token.Token { func (f *formatter) formatList(nodes []ast.Vertex, separator byte) []*token.Token {
if len(nodes) == 0 {
return nil
}
separatorTkns := make([]*token.Token, len(nodes)-1) separatorTkns := make([]*token.Token, len(nodes)-1)
for i, v := range nodes { for i, v := range nodes {
v.Accept(f) v.Accept(f)
@ -844,7 +851,6 @@ func (f *formatter) StmtNamespace(n *ast.StmtNamespace) {
} else { } else {
n.SemiColonTkn = f.newSemicolonTkn() n.SemiColonTkn = f.newSemicolonTkn()
} }
} }
func (f *formatter) StmtNop(n *ast.StmtNop) { func (f *formatter) StmtNop(n *ast.StmtNop) {
@ -1189,7 +1195,9 @@ func (f *formatter) ExprArrayItem(n *ast.ExprArrayItem) {
f.addFreeFloating(token.T_WHITESPACE, []byte(" ")) f.addFreeFloating(token.T_WHITESPACE, []byte(" "))
} }
n.Val.Accept(f) if n.Val != nil {
n.Val.Accept(f)
}
} }
func (f *formatter) ExprArrowFunction(n *ast.ExprArrowFunction) { func (f *formatter) ExprArrowFunction(n *ast.ExprArrowFunction) {