refactor(parser): simplify grammar rules for list elements (#1033)

Signed-off-by: Xavier Coulon <xcoulon@redhat.com>
bytesparadise · Jun 3, 2022 · cd41d73 · cd41d73
1 parent dbd31ea
commit cd41d73
Show file tree

Hide file tree

Showing 4 changed files with 51,232 additions and 62,323 deletions.
diff --git a/pkg/parser/labeled_list_test.go b/pkg/parser/labeled_list_test.go
@@ -1416,6 +1416,45 @@ a description`
 			Expect(ParseDocument(source)).To(MatchDocument(expected))
 		})
 
+		It("with 2 descritptions as single line comment after blanklines", func() {
+			source := `term 1::
+
+
+// a comment
+
+term 2::
+
+
+// another comment`
+
+			expected := &types.Document{
+				Elements: []interface{}{
+					&types.List{
+						Kind: types.LabeledListKind,
+						Elements: []types.ListElement{
+							&types.LabeledListElement{
+								Style: types.DoubleColons,
+								Term: []interface{}{
+									&types.StringElement{
+										Content: "term 1",
+									},
+								},
+							},
+							&types.LabeledListElement{
+								Style: types.DoubleColons,
+								Term: []interface{}{
+									&types.StringElement{
+										Content: "term 2",
+									},
+								},
+							},
+						},
+					},
+				},
+			}
+			Expect(ParseDocument(source)).To(MatchDocument(expected))
+		})
+
 		It("with descritption as comment block attached", func() {
 			source := `term::
 ////
@@ -1442,6 +1481,49 @@ a comment
 			Expect(ParseDocument(source)).To(MatchDocument(expected))
 		})
 
+		It("distinct lists with descritption as comment block attached", func() {
+			source := `term 1::
+////
+a comment
+////
+term 2::
+////
+another comment
+////`
+
+			expected := &types.Document{
+				Elements: []interface{}{
+					&types.List{
+						Kind: types.LabeledListKind,
+						Elements: []types.ListElement{
+							&types.LabeledListElement{
+								Style: types.DoubleColons,
+								Term: []interface{}{
+									&types.StringElement{
+										Content: "term 1",
+									},
+								},
+							},
+						},
+					},
+					&types.List{
+						Kind: types.LabeledListKind,
+						Elements: []types.ListElement{
+							&types.LabeledListElement{
+								Style: types.DoubleColons,
+								Term: []interface{}{
+									&types.StringElement{
+										Content: "term 2",
+									},
+								},
+							},
+						},
+					},
+				},
+			}
+			Expect(ParseDocument(source)).To(MatchDocument(expected))
+		})
+
 		It("with descritption as comment block after blanklines", func() {
 			source := `term::
 
@@ -1470,6 +1552,54 @@ a comment
 			Expect(ParseDocument(source)).To(MatchDocument(expected))
 		})
 
+		It("distinct lists with descritption as comment block after blanklines", func() {
+			source := `term 1::
+
+
+////
+a comment
+////
+
+term 2::
+
+
+////
+a comment
+////`
+
+			expected := &types.Document{
+				Elements: []interface{}{
+					&types.List{
+						Kind: types.LabeledListKind,
+						Elements: []types.ListElement{
+							&types.LabeledListElement{
+								Style: types.DoubleColons,
+								Term: []interface{}{
+									&types.StringElement{
+										Content: "term 1",
+									},
+								},
+							},
+						},
+					},
+					&types.List{
+						Kind: types.LabeledListKind,
+						Elements: []types.ListElement{
+							&types.LabeledListElement{
+								Style: types.DoubleColons,
+								Term: []interface{}{
+									&types.StringElement{
+										Content: "term 2",
+									},
+								},
+							},
+						},
+					},
+				},
+			}
+			Expect(ParseDocument(source)).To(MatchDocument(expected))
+		})
+
 	})
 
 })