feat(parser): support custom substitutions on literal blocks

also, fixes the default substitutions Fixes bytesparadise#770 Signed-off-by: Xavier Coulon <[email protected]>
xcoulon · Oct 13, 2020 · f455f72 · f455f72
1 parent 68a9843
commit f455f72
Show file tree

Hide file tree

Showing 5 changed files with 675 additions and 7 deletions.
diff --git a/pkg/parser/delimited_block_test.go b/pkg/parser/delimited_block_test.go
@@ -581,7 +581,7 @@ and <more text> on the +
 `
 
 			It("should apply the default substitution", func() {
-				s := strings.ReplaceAll(source, "[subs=\"$SUBS\"]", "")
+				s := strings.ReplaceAll(source, "[subs=\"$SUBS\"]\n", "")
 				expected := types.DraftDocument{
 					Attributes: types.Attributes{
 						"github-url": "https://github.com",
@@ -592,7 +592,6 @@ and <more text> on the +
 							Value: "https://github.com",
 						},
 						types.BlankLine{},
-						types.BlankLine{},
 						types.ExampleBlock{
 							Elements: []interface{}{
 								types.Paragraph{
@@ -2734,7 +2733,7 @@ another paragraph`
 			// share the same implementation
 
 			source := `:github-url: https://github.com
-				
+
 [subs="$SUBS"]
 ----
 a link to https://example.com[] <1>
@@ -2748,7 +2747,7 @@ and <more text> on the +
 `
 
 			It("should apply the default substitution", func() {
-				s := strings.ReplaceAll(source, "[subs=\"$SUBS\"]", "")
+				s := strings.ReplaceAll(source, "[subs=\"$SUBS\"]\n", "") // remove the 'subs' attribute
 				expected := types.DraftDocument{
 					Attributes: types.Attributes{
 						"github-url": "https://github.com",
@@ -2759,7 +2758,6 @@ and <more text> on the +
 							Value: "https://github.com",
 						},
 						types.BlankLine{},
-						types.BlankLine{},
 						types.ListingBlock{
 							Lines: [][]interface{}{
 								{
@@ -4176,7 +4174,7 @@ ____
 `
 
 				It("should apply the default substitution", func() {
-					s := strings.ReplaceAll(source, "[subs=\"$SUBS\"]", "")
+					s := strings.ReplaceAll(source, "[subs=\"$SUBS\"]\n", "")
 					expected := types.DraftDocument{
 						Attributes: types.Attributes{
 							"github-url": "https://github.com",
@@ -4187,7 +4185,6 @@ ____
 								Value: "https://github.com",
 							},
 							types.BlankLine{},
-							types.BlankLine{},
 							types.VerseBlock{
 								Attributes: types.Attributes{
 									types.AttrKind:        types.Verse,

diff --git a/pkg/parser/document_processing_apply_substitutions.go b/pkg/parser/document_processing_apply_substitutions.go
@@ -139,6 +139,7 @@ var defaultSubstitutionsForBlockLines = []elementsSubstitution{
 }
 var defaultFencedBlockSubstitutions = defaultSubstitutionsForBlockLines
 var defaultListingBlockSubstitutions = defaultSubstitutionsForBlockLines
+var defaultLiteralBlockSubstitutions = defaultSubstitutionsForBlockLines
 
 // other blocks
 var defaultPassthroughBlockSubstitutions = []elementsSubstitution{}
@@ -252,6 +253,8 @@ func defaultSubstitutionsFor(block interface{}) ([]elementsSubstitution, error)
 		return defaultListingBlockSubstitutions, nil
 	case types.VerseBlock:
 		return defaultVerseBlockSubstitutions, nil
+	case types.LiteralBlock:
+		return defaultLiteralBlockSubstitutions, nil
 	case types.PassthroughBlock:
 		return defaultPassthroughBlockSubstitutions, nil
 	case types.CommentBlock: