Skip to content

Commit

Permalink
markup/goldmark: Trim space from blockquote render hook text
Browse files Browse the repository at this point in the history
Closes #13302
  • Loading branch information
jmooring authored and bep committed Jan 24, 2025
1 parent cd7dc7a commit e08d9af
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions markup/goldmark/blockquotes/blockquotes.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func (r *htmlRenderer) renderBlockquote(w util.BufWriter, src []byte, node ast.N
return ast.WalkContinue, nil
}

text := ctx.PopRenderedString()
text := strings.TrimSpace(ctx.PopRenderedString())

ordinal := ctx.GetAndIncrementOrdinal(ast.KindBlockquote)

Expand All @@ -90,7 +90,7 @@ func (r *htmlRenderer) renderBlockquote(w util.BufWriter, src []byte, node ast.N
// tag if the first line of the blockquote content does not have a
// closing p tag. At some point we might want to move this to the
// parser.
before, after, found := strings.Cut(strings.TrimSpace(text), "\n")
before, after, found := strings.Cut(text, "\n")
if found {
if strings.HasSuffix(before, "</p>") {
text = after
Expand Down
5 changes: 4 additions & 1 deletion markup/goldmark/blockquotes/blockquotes_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ title: "p1"
"Blockquote Alert: |<p>This is a note with some whitespace after the alert type.</p>|alert|",
"Blockquote Alert: |<p>This is a tip.</p>",
"Blockquote Alert: |<p>This is a caution with some whitespace before the alert type.</p>|alert|",
"Blockquote: |<p>A regular blockquote.</p>\n|regular|",
"Blockquote: |<p>A regular blockquote.</p>|regular|",
"Blockquote Alert Attributes: |<p>This is a tip with attributes.</p>|map[class:foo bar id:baz]|",
filepath.FromSlash("/content/p1.md:19:3"),
"Blockquote Alert Page: |<p>This is a tip with attributes.</p>|p1|p1|",
Expand Down Expand Up @@ -155,6 +155,7 @@ AlertType: {{ .AlertType }}|AlertTitle: {{ .AlertTitle }}|AlertSign: {{ .AlertSi

// Issue 12913
// Issue 13119
// Issue 13302
func TestBlockquoteRenderHookTextParsing(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -225,6 +226,7 @@ title: home
> [!sixteen] _title_
> line one
> seventeen
`

b := hugolib.Test(t, files)
Expand All @@ -246,5 +248,6 @@ title: home
"AlertType: fourteen|AlertTitle: title|Text: <p><img src=\"a.jpg\" alt=\"alt\"></p>|",
"AlertType: fifteen|AlertTitle: <em>title</em>|Text: |",
"AlertType: sixteen|AlertTitle: <em>title</em>|Text: <p>line one</p>|",
"AlertType: |AlertTitle: |Text: <p>seventeen</p>|",
)
}

0 comments on commit e08d9af

Please sign in to comment.