refactor(parser): simplify InlineWord vs Word rules (#1080)

Signed-off-by: Xavier Coulon <[email protected]>
bytesparadise · Sep 4, 2022 · 4d151e0 · 4d151e0
1 parent eecd0bb
commit 4d151e0
Show file tree

Hide file tree

Showing 4 changed files with 8,537 additions and 8,525 deletions.
diff --git a/pkg/parser/document_processing_apply_substitutions.go b/pkg/parser/document_processing_apply_substitutions.go
@@ -269,17 +269,18 @@ func reparseAttributes(ctx *ParseContext, element types.WithAttributes, opts ...
 	for k, v := range attrs {
 		switch k {
 		case types.AttrTitle, types.AttrXRefLabel:
-			v, err := parseWithSubstitutions(v, attributeSubstitutions(), append(append(ctx.opts, Entrypoint("AttributeStructuredValue")), opts...)...)
+			subs := attributeSubstitutions()
+			// same as above, but do not allow for inline macros (eg: links)
+			if err := subs.append(Macros); err != nil {
+				return err
+			}
+			v, err := parseWithSubstitutions(v, subs, append(append(ctx.opts, Entrypoint("AttributeStructuredValue")), opts...)...)
 			if err != nil {
 				return err
 			}
 			attrs[k] = types.Reduce(v)
 		case types.AttrInlineLinkText:
 			subs := attributeSubstitutions()
-			// same as above, but do not allow for inline macros (eg: links)
-			if err := subs.remove(Macros); err != nil {
-				return err
-			}
 			v, err := parseWithSubstitutions(v, subs, append(append(ctx.opts, Entrypoint("AttributeStructuredValue")), opts...)...)
 			if err != nil {
 				return err

diff --git a/pkg/parser/document_substitutions.go b/pkg/parser/document_substitutions.go
@@ -64,7 +64,7 @@ func attributeSubstitutions() *substitutions {
 			AttributeRefs,
 			SpecialCharacters,
 			Quotes,
-			Macros,
+			// Macros,
 			Replacements,
 		},
 	}