fix(parser): rearranging lists with delimited blocks afterwards

refactor the logic to rearrange list items in list, using a 'listArranger' type (until we have a better name) Fixes #785 Signed-off-by: Xavier Coulon <[email protected]>
bytesparadise · Oct 25, 2020 · ece5702 · ece5702
1 parent ad8fee6
commit ece5702
Show file tree

Hide file tree

Showing 6 changed files with 895 additions and 166 deletions.
diff --git a/pkg/parser/delimited_block_source_test.go b/pkg/parser/delimited_block_source_test.go
@@ -8,6 +8,8 @@ import (
 	. "github.com/onsi/gomega" //nolint golint
 )
 
+const cookies = "life"
+
 var _ = Describe("source blocks", func() {
 
 	Context("draft documents", func() {
@@ -143,12 +145,77 @@ type Foo struct{
 				}
 				Expect(ParseDraftDocument(source)).To(MatchDraftDocument(expected))
 			})
+
+			It("with callout and admonition block afterwards", func() {
+				source := `[source]
+----
+const cookies = "cookies" <1>
+----
+<1> a constant
+
+[NOTE]
+====
+a note
+====`
+
+				expected := types.DraftDocument{
+					Elements: []interface{}{
+						types.ListingBlock{
+							Attributes: types.Attributes{
+								types.AttrBlockKind: types.Source,
+							},
+							Lines: [][]interface{}{
+								{
+									types.StringElement{
+										Content: `const cookies = "cookies" `,
+									},
+									types.Callout{
+										Ref: 1,
+									},
+								},
+							},
+						},
+						types.CalloutListItem{
+							Ref: 1,
+							Elements: []interface{}{
+								types.Paragraph{
+									Lines: [][]interface{}{
+										{
+											types.StringElement{
+												Content: "a constant",
+											},
+										},
+									},
+								},
+							},
+						},
+						types.BlankLine{},
+						types.ExampleBlock{
+							Attributes: types.Attributes{
+								types.AttrAdmonitionKind: types.Note,
+							},
+							Elements: []interface{}{
+								types.Paragraph{
+									Lines: [][]interface{}{
+										{
+											types.StringElement{
+												Content: "a note",
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				}
+				Expect(ParseDraftDocument(source)).To(MatchDraftDocument(expected))
+			})
 		})
 	})
 
 	Context("final documents", func() {
 
-		Context("source block", func() {
+		Context("delimited block", func() {
 
 			It("with source attribute only", func() {
 				source := `[source]
@@ -290,6 +357,74 @@ end
 				}
 				Expect(ParseDocument(source)).To(MatchDocument(expected))
 			})
+
+			It("with callout and admonition block afterwards", func() {
+				source := `[source]
+----
+const cookies = "cookies" <1>
+----
+<1> a constant
+
+[NOTE]
+====
+a note
+====`
+
+				expected := types.Document{
+					Elements: []interface{}{
+						types.ListingBlock{
+							Attributes: types.Attributes{
+								types.AttrBlockKind: types.Source,
+							},
+							Lines: [][]interface{}{
+								{
+									types.StringElement{
+										Content: `const cookies = "cookies" `,
+									},
+									types.Callout{
+										Ref: 1,
+									},
+								},
+							},
+						},
+						types.CalloutList{
+							Items: []types.CalloutListItem{
+								{
+									Ref: 1,
+									Elements: []interface{}{
+										types.Paragraph{
+											Lines: [][]interface{}{
+												{
+													types.StringElement{
+														Content: "a constant",
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+						types.ExampleBlock{
+							Attributes: types.Attributes{
+								types.AttrAdmonitionKind: types.Note,
+							},
+							Elements: []interface{}{
+								types.Paragraph{
+									Lines: [][]interface{}{
+										{
+											types.StringElement{
+												Content: "a note",
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				}
+				Expect(ParseDocument(source)).To(MatchDocument(expected))
+			})
 		})
 	})
 })