fix(parser): support valid characters in URLs (#417)

added a lot of missing characters, but excluded the `[` and `]` as they are used to pass arguments in external and relative links. Fixes #416: Signed-off-by: Xavier Coulon <[email protected]>
bytesparadise · Sep 19, 2019 · 98a84d4 · 98a84d4
1 parent cc4c79d
commit 98a84d4
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 92 deletions.
diff --git a/pkg/parser/file_inclusion_test.go b/pkg/parser/file_inclusion_test.go
@@ -1125,6 +1125,34 @@ include::../../test/includes/hello_world.go.txt[]
 			}
 			verifyPreflight("test.adoc", expected, source)
 		})
+
+		It("include go file with a simple range", func() {
+
+			source := `----
+include::../../test/includes/hello_world.go.txt[lines=1] 
+----`
+			expected := types.PreflightDocument{
+				Blocks: []interface{}{
+					types.DelimitedBlock{
+						Kind:       types.Listing,
+						Attributes: types.ElementAttributes{},
+						Elements: []interface{}{
+							types.Paragraph{
+								Attributes: types.ElementAttributes{},
+								Lines: []types.InlineElements{
+									{
+										types.StringElement{
+											Content: `package includes`,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			}
+			verifyPreflight("test.adoc", expected, source)
+		})
 	})
 })
 

diff --git a/pkg/parser/link_test.go b/pkg/parser/link_test.go
@@ -495,6 +495,33 @@ next lines`
 			verifyDocumentBlock(expected, source)
 		})
 
+		It("relative link with all valid characters", func() {
+			source := `a link to link:ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789~:/?#@!$&;=()*+,-_.[as expected]`
+			expected := types.Paragraph{
+				Attributes: types.ElementAttributes{},
+				Lines: []types.InlineElements{
+					{
+						types.StringElement{Content: "a link to "},
+						types.InlineLink{
+							Location: types.Location{
+								types.StringElement{
+									Content: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789~:/?#@!$&;=()*+,-_.",
+								},
+							},
+							Attributes: types.ElementAttributes{
+								types.AttrInlineLinkText: types.InlineElements{
+									types.StringElement{
+										Content: "as expected",
+									},
+								},
+							},
+						},
+					},
+				},
+			}
+			verifyDocumentBlock(expected, source)
+		})
+
 		Context("text attribute with comma", func() {
 
 			It("relative link only with text having comma", func() {