fix(parser): ignore standalone attributes at the end of doc

the draft document contains the attributes, but they are filtered out when processing it. Fixes bytesparadise#605 - Error when parsing doc containing only an attribute Signed-off-by: Xavier Coulon <[email protected]>
xcoulon · Jun 14, 2020 · 8678385 · 8678385
1 parent 90b4f2d
commit 8678385
Show file tree

Hide file tree

Showing 5 changed files with 3,587 additions and 3,648 deletions.
diff --git a/pkg/parser/document_processing_filter_blocks.go b/pkg/parser/document_processing_filter_blocks.go
@@ -10,6 +10,7 @@ import (
 // - all document attribute declaration/substitution/reset
 // - empty preambles
 // - single line comments and comment blocks
+// - standalone attributes
 func filter(elements []interface{}, matchers ...filterMatcher) []interface{} {
 	result := make([]interface{}, 0, len(elements))
 elements:
@@ -70,7 +71,7 @@ elements:
 }
 
 // AllMatchers all the matchers needed to remove the unneeded blocks/elements from the final document
-var allMatchers = []filterMatcher{emptyPreambleMatcher, documentAttributeMatcher, singleLineCommentMatcher, commentBlockMatcher}
+var allMatchers = []filterMatcher{emptyPreambleMatcher, attributeMatcher, singleLineCommentMatcher, commentBlockMatcher}
 
 // filterMatcher returns true if the given element is to be filtered out
 type filterMatcher func(element interface{}) bool
@@ -85,11 +86,11 @@ var emptyPreambleMatcher filterMatcher = func(element interface{}) bool {
 	return result
 }
 
-// documentAttributeMatcher filters the element if it is a AttributeDeclaration,
-// a AttributeSubstitution or a AttributeReset
-var documentAttributeMatcher filterMatcher = func(element interface{}) bool {
+// attributeMatcher filters the element if it is a AttributeDeclaration,
+// a AttributeSubstitution, a AttributeReset or a standalone Attribute
+var attributeMatcher filterMatcher = func(element interface{}) bool {
 	switch element.(type) {
-	case types.AttributeDeclaration, types.AttributeSubstitution, types.AttributeReset:
+	case types.AttributeDeclaration, types.AttributeSubstitution, types.AttributeReset, types.Attributes:
 		return true
 	default:
 		return false

diff --git a/pkg/parser/document_test.go b/pkg/parser/document_test.go
@@ -12,7 +12,7 @@ var _ = Describe("documents", func() {
 
 	Context("draft document", func() {
 
-		It("empty docunment", func() {
+		It("empty document", func() {
 			source := ``
 			expected := types.DraftDocument{
 				Blocks: []interface{}{},