feat(parser): support link macros in titles (#999)

Fixes #956 Signed-off-by: Xavier Coulon <[email protected]>
bytesparadise · Apr 30, 2022 · 25ab040 · 25ab040
1 parent 0329b9d
commit 25ab040
Show file tree

Hide file tree

Showing 12 changed files with 16,181 additions and 102,254 deletions.
diff --git a/pkg/parser/context.go b/pkg/parser/context.go
@@ -25,7 +25,7 @@ func NewParseContext(config *configuration.Configuration, opts ...Option) *Parse
 	opts = append(opts, Entrypoint("DocumentFragment"))
 	opts = append(opts, GlobalStore(frontMatterKey, true))
 	opts = append(opts, GlobalStore(documentHeaderKey, true))
-	opts = append(opts, GlobalStore(enabledSubstitutions, []string{Attributes}))
+	opts = append(opts, GlobalStore(enabledSubstitutions, []string{AttributeRefs}))
 	opts = append(opts, GlobalStore(usermacrosKey, config.Macros))
 	return &ParseContext{
 		filename:     config.Filename,

diff --git a/pkg/parser/delimited_block_listing_test.go b/pkg/parser/delimited_block_listing_test.go
@@ -406,6 +406,53 @@ import <a>
 				Expect(ParseDocument(source)).To(MatchDocument(expected))
 			})
 
+			It("with quoted text and link in title", func() {
+				source := `.a *link* to https://github.com[GitHub]
+----
+content
+----`
+				expected := &types.Document{
+					Elements: []interface{}{
+						&types.DelimitedBlock{
+							Kind: types.Listing,
+							Attributes: types.Attributes{
+								types.AttrTitle: []interface{}{
+									&types.StringElement{
+										Content: "a ",
+									},
+									&types.QuotedText{
+										Kind: types.SingleQuoteBold,
+										Elements: []interface{}{
+											&types.StringElement{
+												Content: "link",
+											},
+										},
+									},
+									&types.StringElement{
+										Content: " to ",
+									},
+									&types.InlineLink{
+										Attributes: types.Attributes{
+											types.AttrInlineLinkText: "GitHub",
+										},
+										Location: &types.Location{
+											Scheme: "https://",
+											Path:   "github.com",
+										},
+									},
+								},
+							},
+							Elements: []interface{}{
+								&types.StringElement{
+									Content: "content",
+								},
+							},
+						},
+					},
+				}
+				Expect(ParseDocument(source)).To(MatchDocument(expected))
+			})
+
 			Context("with custom substitutions", func() {
 
 				// testing custom substitutions on listing blocks only, as

diff --git a/pkg/parser/document_preprocessing.go b/pkg/parser/document_preprocessing.go
@@ -91,7 +91,7 @@ func preprocess(ctx *ParseContext, source io.Reader) (string, error) {
 func includeFile(ctx *ParseContext, incl *types.FileInclusion) (string, error) {
 	ctx.Opts = append(ctx.Opts, GlobalStore(documentHeaderKey, false))
 	if l, ok := incl.GetLocation().Path.([]interface{}); ok {
-		l, _, err := replaceAttributeRefsInSlice(ctx, l)
+		l, _, err := replaceAttributeRefsInSlice(ctx, l, noneSubstitutions())
 		if err != nil {
 			return "", errors.Errorf("Unresolved directive in %s - %s", ctx.filename, incl.RawText)
 		}