Skip to content

fix(parser): correctly handle empty documents in multi-document yaml #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(parser): correctly handle empty documents in multi-document yaml #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions parser/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,20 @@ a:
b: &anchor null
c: &anchor2 null
d: e
`,
},
{
`
a: b
---
---
c: d
`,
`
a: b
---
---
c: d
`,
},
}
Expand Down Expand Up @@ -1789,6 +1803,9 @@ func (c *pathCapturer) Visit(node ast.Node) ast.Visitor {
type Visitor struct{}

func (v *Visitor) Visit(node ast.Node) ast.Visitor {
if node == nil {
return nil
}
tk := node.GetToken()
tk.Prev = nil
tk.Next = nil
Expand Down
18 changes: 5 additions & 13 deletions parser/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ func CreateGroupedTokens(tokens token.Tokens) ([]*Token, error) {
if err != nil {
return nil, err
}
tks, err = createDocumentTokens(tks)
tks, err = createDocumentTokens(tks, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -614,13 +614,13 @@ func createDirectiveTokenGroups(tokens []*Token) ([]*Token, error) {
return ret, nil
}

func createDocumentTokens(tokens []*Token) ([]*Token, error) {
func createDocumentTokens(tokens []*Token, ignoreHeaderIfAtFirst bool) ([]*Token, error) {
var ret []*Token
for i := 0; i < len(tokens); i++ {
tk := tokens[i]
switch tk.Type() {
case token.DocumentHeaderType:
if i != 0 {
if i != 0 || !ignoreHeaderIfAtFirst {
ret = append(ret, &Token{
Group: &TokenGroup{Tokens: tokens[:i]},
})
Expand All @@ -634,14 +634,6 @@ func createDocumentTokens(tokens []*Token) ([]*Token, error) {
},
}), nil
}
if tokens[i+1].Type() == token.DocumentHeaderType {
return append(ret, &Token{
Group: &TokenGroup{
Type: TokenGroupDocument,
Tokens: []*Token{tk},
},
}), nil
}
if tokens[i].Line() == tokens[i+1].Line() {
switch tokens[i+1].GroupType() {
case TokenGroupMapKey, TokenGroupMapKeyValue:
Expand All @@ -652,7 +644,7 @@ func createDocumentTokens(tokens []*Token) ([]*Token, error) {
return nil, errors.ErrSyntax("value cannot be placed after document separator", tokens[i+1].RawToken())
}
}
tks, err := createDocumentTokens(tokens[i+1:])
tks, err := createDocumentTokens(tokens[i+1:], false)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -683,7 +675,7 @@ func createDocumentTokens(tokens []*Token) ([]*Token, error) {
return nil, errors.ErrSyntax("unexpected end content", tokens[i+1].RawToken())
}

tks, err := createDocumentTokens(tokens[i+1:])
tks, err := createDocumentTokens(tokens[i+1:], true)
if err != nil {
return nil, err
}
Expand Down