refactor(types): use Kind field for quoted text kind (bytesparadise#277)

Fixes bytesparadise#275 Signed-off-by: Xavier Coulon <[email protected]>
xcoulon · Jan 20, 2019 · 4e1c15d · 4e1c15d
1 parent 4c29467
commit 4e1c15d
Show file tree

Hide file tree

Showing 13 changed files with 107 additions and 306 deletions.
diff --git a/pkg/parser/delimited_block_test.go b/pkg/parser/delimited_block_test.go
@@ -495,9 +495,7 @@ with *bold content*
 									Content: "with ",
 								},
 								types.QuotedText{
-									Attributes: types.ElementAttributes{
-										types.AttrKind: types.Bold,
-									},
+									Kind: types.Bold,
 									Elements: types.InlineElements{
 										types.StringElement{
 											Content: "bold content",
@@ -691,9 +689,7 @@ ____`
 									Content: "some ",
 								},
 								types.QuotedText{
-									Attributes: types.ElementAttributes{
-										types.AttrKind: types.Bold,
-									},
+									Kind: types.Bold,
 									Elements: types.InlineElements{
 										types.StringElement{
 											Content: "quote",
@@ -1055,9 +1051,7 @@ ____`
 									Content: "some ",
 								},
 								types.QuotedText{
-									Attributes: types.ElementAttributes{
-										types.AttrKind: types.Bold,
-									},
+									Kind: types.Bold,
 									Elements: types.InlineElements{
 										types.StringElement{
 											Content: "verse",
@@ -1340,7 +1334,7 @@ end
 ----`
 			expectedResult := types.DelimitedBlock{
 				Attributes: types.ElementAttributes{
-					types.AttrKind:        types.Source,
+					types.AttrKind:     types.Source,
 					types.AttrLanguage: "ruby",
 				},
 				Kind: types.Source,
@@ -1389,7 +1383,7 @@ end
 ----`
 			expectedResult := types.DelimitedBlock{
 				Attributes: types.ElementAttributes{
-					types.AttrKind:        types.Source,
+					types.AttrKind:     types.Source,
 					types.AttrLanguage: "ruby",
 					types.AttrID:       "id-for-source-block",
 					types.AttrTitle:    "app.rb",
@@ -1446,9 +1440,7 @@ some *verse* content
 									Content: "some ",
 								},
 								types.QuotedText{
-									Attributes: types.ElementAttributes{
-										types.AttrKind: types.Bold,
-									},
+									Kind: types.Bold,
 									Elements: types.InlineElements{
 										types.StringElement{
 											Content: "verse",
@@ -1489,9 +1481,7 @@ bar
 									Content: "some ",
 								},
 								types.QuotedText{
-									Attributes: types.ElementAttributes{
-										types.AttrKind: types.Bold,
-									},
+									Kind: types.Bold,
 									Elements: types.InlineElements{
 										types.StringElement{
 											Content: "verse",

diff --git a/pkg/parser/document_attributes_test.go b/pkg/parser/document_attributes_test.go
@@ -810,9 +810,7 @@ a paragraph with *bold content*`
 									{
 										types.StringElement{Content: "a paragraph with "},
 										types.QuotedText{
-											Attributes: types.ElementAttributes{
-												types.AttrKind: types.Bold,
-											},
+											Kind: types.Bold,
 											Elements: types.InlineElements{
 												types.StringElement{Content: "bold content"},
 											},

diff --git a/pkg/parser/footnote_test.go b/pkg/parser/footnote_test.go
@@ -59,9 +59,7 @@ var _ = Describe("footnotes", func() {
 						Content: "some ",
 					},
 					types.QuotedText{
-						Attributes: types.ElementAttributes{
-							types.AttrKind: types.Bold,
-						},
+						Kind: types.Bold,
 						Elements: types.InlineElements{
 							types.StringElement{
 								Content: "rich",

diff --git a/pkg/parser/inline_elements_test.go b/pkg/parser/inline_elements_test.go
@@ -12,9 +12,7 @@ var _ = Describe("inline elements", func() {
 		actualContent := "*some bold content*"
 		expectedResult := types.InlineElements{
 			types.QuotedText{
-				Attributes: types.ElementAttributes{
-					types.AttrKind: types.Bold,
-				},
+				Kind: types.Bold,
 				Elements: types.InlineElements{
 					types.StringElement{Content: "some bold content"},
 				},
@@ -29,9 +27,7 @@ var _ = Describe("inline elements", func() {
 		expectedResult := types.InlineElements{
 			types.StringElement{Content: "("},
 			types.QuotedText{
-				Attributes: types.ElementAttributes{
-					types.AttrKind: types.Bold,
-				},
+				Kind: types.Bold,
 				Elements: types.InlineElements{
 					types.StringElement{Content: "some bold content"},
 				},
@@ -62,9 +58,7 @@ var _ = Describe("inline elements", func() {
 		actualContent := "**foo**bar"
 		expectedResult := types.InlineElements{
 			types.QuotedText{
-				Attributes: types.ElementAttributes{
-					types.AttrKind: types.Bold,
-				},
+				Kind: types.Bold,
 				Elements: types.InlineElements{
 					types.StringElement{Content: "foo"},
 				},

diff --git a/pkg/parser/list_test.go b/pkg/parser/list_test.go
@@ -1502,9 +1502,7 @@ another fenced block
 										{
 											types.StringElement{Content: "a second item with "},
 											types.QuotedText{
-												Attributes: types.ElementAttributes{
-													types.AttrKind: types.Bold,
-												},
+												Kind: types.Bold,
 												Elements: types.InlineElements{
 													types.StringElement{Content: "bold content"},
 												},
@@ -1716,9 +1714,7 @@ another fenced block
 										{
 											types.StringElement{Content: "a second item with "},
 											types.QuotedText{
-												Attributes: types.ElementAttributes{
-													types.AttrKind: types.Bold,
-												},
+												Kind: types.Bold,
 												Elements: types.InlineElements{
 													types.StringElement{Content: "bold content"},
 												},
@@ -1878,9 +1874,7 @@ another fenced block
 										{
 											types.StringElement{Content: "a second item with "},
 											types.QuotedText{
-												Attributes: types.ElementAttributes{
-													types.AttrKind: types.Bold,
-												},
+												Kind: types.Bold,
 												Elements: types.InlineElements{
 													types.StringElement{Content: "bold content"},
 												},

diff --git a/pkg/parser/paragraph_test.go b/pkg/parser/paragraph_test.go
@@ -44,9 +44,7 @@ var _ = Describe("paragraphs", func() {
 					{
 						types.StringElement{Content: "a paragraph with "},
 						types.QuotedText{
-							Attributes: types.ElementAttributes{
-								types.AttrKind: types.Bold,
-							},
+							Kind: types.Bold,
 							Elements: types.InlineElements{
 								types.StringElement{Content: "some bold content"},
 							},
@@ -288,9 +286,7 @@ this is a
 					},
 					{
 						types.QuotedText{
-							Attributes: types.ElementAttributes{
-								types.AttrKind: types.Bold,
-							},
+							Kind: types.Bold,
 							Elements: types.InlineElements{
 								types.StringElement{
 									Content: "caution",

diff --git a/pkg/parser/passthrough_test.go b/pkg/parser/passthrough_test.go
@@ -323,9 +323,7 @@ var _ = Describe("passthroughs", func() {
 								Kind: types.PassthroughMacro,
 								Elements: types.InlineElements{
 									types.QuotedText{
-										Attributes: types.ElementAttributes{
-											types.AttrKind: types.Bold,
-										},
+										Kind: types.Bold,
 										Elements: types.InlineElements{
 											types.StringElement{
 												Content: "hello",
@@ -353,9 +351,7 @@ var _ = Describe("passthroughs", func() {
 										Content: " a ",
 									},
 									types.QuotedText{
-										Attributes: types.ElementAttributes{
-											types.AttrKind: types.Bold,
-										},
+										Kind: types.Bold,
 										Elements: types.InlineElements{
 											types.StringElement{
 												Content: "hello",