Fix "unknown shortcode token" when calling shortcode within fenced code block

bep · bep · commit e7148f335fab · 2023-03-12T11:39:38.000+01:00
Fixes #10819
diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
@@ -186,7 +186,7 @@ func (scp *ShortcodeWithPage) page() page.Page {
 const shortcodePlaceholderPrefix = "HAHAHUGOSHORTCODE"
 
 func createShortcodePlaceholder(id string, ordinal int) string {
-	return shortcodePlaceholderPrefix + "-" + id + strconv.Itoa(ordinal) + "-HBHB"
+	return shortcodePlaceholderPrefix + id + strconv.Itoa(ordinal) + "HBHB"
 }
 
 type shortcode struct {
diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
@@ -1276,3 +1276,40 @@ Inner: {{ .Get 0 }}: {{ len .Inner }}
 	b.Assert(err, qt.Not(qt.IsNil))
 	b.Assert(err.Error(), qt.Contains, `p1.md:5:1": failed to extract shortcode: shortcode "sc" must be closed or self-closed`)
 }
+
+// Issue 10819.
+func TestShortcodeInCodeFenceHyphen(t *testing.T) {
+	t.Parallel()
+
+	files := `
+-- config.toml --
+disableKinds = ["home", "taxonomy", "term"]
+-- content/p1.md --
+---
+title: "p1"
+---
+
+§§§go
+{{< sc >}}
+§§§
+
+Text.
+
+-- layouts/shortcodes/sc.html --
+Hello.
+-- layouts/_default/single.html --
+{{ .Content }}
+`
+
+	b := NewIntegrationTestBuilder(
+		IntegrationTestConfig{
+			T:           t,
+			TxtarString: files,
+			Running:     true,
+			Verbose:     true,
+		},
+	).Build()
+
+	b.AssertFileContent("public/p1/index.html", "<span style=\"color:#a6e22e\">Hello.</span>")
+
+}

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ func (scp *ShortcodeWithPage) page() page.Page {`
`186`	`186`	`const shortcodePlaceholderPrefix = "HAHAHUGOSHORTCODE"`
`187`	`187`
`188`	`188`	`func createShortcodePlaceholder(id string, ordinal int) string {`
`189`		`- return shortcodePlaceholderPrefix + "-" + id + strconv.Itoa(ordinal) + "-HBHB"`
	`189`	`+ return shortcodePlaceholderPrefix + id + strconv.Itoa(ordinal) + "HBHB"`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`type shortcode struct {`