From b725253f9e3033e18bd45096c0622e6fb7b1ff79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sat, 20 Mar 2021 16:36:30 +0100
Subject: Attributes for code fences should be placed after the lang indicator
 only

Fixes #8313
---
 markup/goldmark/convert_test.go                              | 12 +++++++++++-
 markup/goldmark/internal/extensions/attributes/attributes.go | 12 +++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'markup')

diff --git a/markup/goldmark/convert_test.go b/markup/goldmark/convert_test.go
index c7367dd01..2b66a1910 100644
--- a/markup/goldmark/convert_test.go
+++ b/markup/goldmark/convert_test.go
@@ -242,9 +242,19 @@ func TestConvertAttributes(t *testing.T) {
 				withBlockAttributes(conf)
 				conf.Highlight.CodeFences = true
 			},
-			"```bash\necho 'foo';\n````\n{.myclass id=\"myid\"}",
+			"```bash {.myclass id=\"myid\"}\necho 'foo';\n````\n",
 			"<div class=\"highlight myclass\" id=\"myid\"><pre style",
 		},
+		{
+			"Code block, CodeFences=true,linenos=table",
+			func(conf *markup_config.Config) {
+				withBlockAttributes(conf)
+				conf.Highlight.CodeFences = true
+			},
+			"```bash {linenos=table .myclass id=\"myid\"}\necho 'foo';\n````\n{ .adfadf }",
+			[]string{"div class=\"highlight myclass\" id=\"myid\"><div s",
+				"table style"},
+		},
 		{
 			"Paragraph",
 			withBlockAttributes,
diff --git a/markup/goldmark/internal/extensions/attributes/attributes.go b/markup/goldmark/internal/extensions/attributes/attributes.go
index ce745295c..e10e7ba79 100644
--- a/markup/goldmark/internal/extensions/attributes/attributes.go
+++ b/markup/goldmark/internal/extensions/attributes/attributes.go
@@ -97,10 +97,16 @@ type transformer struct{}
 func (a *transformer) Transform(node *ast.Document, reader text.Reader, pc parser.Context) {
 	var attributes = make([]ast.Node, 0, 500)
 	ast.Walk(node, func(node ast.Node, entering bool) (ast.WalkStatus, error) {
-		if entering && node.Kind() == kindAttributesBlock && !node.HasBlankPreviousLines() {
-			attributes = append(attributes, node)
-			return ast.WalkSkipChildren, nil
+		if entering && node.Kind() == kindAttributesBlock {
+			// Attributes for fenced code blocks are handled in their own extension,
+			// but note that we currently only support code block attributes when
+			// CodeFences=true.
+			if node.PreviousSibling().Kind() != ast.KindFencedCodeBlock && !node.HasBlankPreviousLines() {
+				attributes = append(attributes, node)
+				return ast.WalkSkipChildren, nil
+			}
 		}
+
 		return ast.WalkContinue, nil
 	})
 
-- 
cgit v1.2.3