mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
481924b34d
As per the referenced issue, if the task list in Markdown has nothing before it, it will be rendered wrongly: ``` --- title: "My First Post" date: 2017-07-29T20:21:57+02:00 draft: true --- * [ ] TaskList ``` is rendered as: ``` <ul> class="task-list" <li><input type="checkbox" disabled class="task-list-item"> TaskList</li> </ul> ``` The problem lies in the `List` function of `HugoHTMLRenderer`, it had a hardocded index of `4` for the first `>` of the list, it is used to insert the class into the text before the closing bracket, but that hardcoded index is only right when there is a newline before the opening bracket, which is the case when there is anything in the document before the task list, but if there is nothing, then there is no newline, and the correct index of the first `>` will be `3`. To fix that we're changing the hardcoded index to be dynamic by using `bytes.Index` to find it properly. We're also adding a test case to make sure this is tested against. Fixes #3710
131 lines
4.6 KiB
Go
131 lines
4.6 KiB
Go
// Copyright 2016 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package helpers
|
|
|
|
import (
|
|
"bytes"
|
|
"html"
|
|
|
|
"github.com/gohugoio/hugo/config"
|
|
"github.com/miekg/mmark"
|
|
"github.com/russross/blackfriday"
|
|
jww "github.com/spf13/jwalterweatherman"
|
|
)
|
|
|
|
type LinkResolverFunc func(ref string) (string, error)
|
|
type FileResolverFunc func(ref string) (string, error)
|
|
|
|
// HugoHTMLRenderer wraps a blackfriday.Renderer, typically a blackfriday.Html
|
|
// Enabling Hugo to customise the rendering experience
|
|
type HugoHTMLRenderer struct {
|
|
*RenderingContext
|
|
blackfriday.Renderer
|
|
}
|
|
|
|
func (r *HugoHTMLRenderer) BlockCode(out *bytes.Buffer, text []byte, lang string) {
|
|
if r.Cfg.GetBool("pygmentsCodeFences") && (lang != "" || r.Cfg.GetBool("pygmentsCodeFencesGuessSyntax")) {
|
|
opts := r.Cfg.GetString("pygmentsOptions")
|
|
str := html.UnescapeString(string(text))
|
|
out.WriteString(Highlight(r.RenderingContext.Cfg, str, lang, opts))
|
|
} else {
|
|
r.Renderer.BlockCode(out, text, lang)
|
|
}
|
|
}
|
|
|
|
func (r *HugoHTMLRenderer) Link(out *bytes.Buffer, link []byte, title []byte, content []byte) {
|
|
if r.LinkResolver == nil || bytes.HasPrefix(link, []byte("HAHAHUGOSHORTCODE")) {
|
|
// Use the blackfriday built in Link handler
|
|
r.Renderer.Link(out, link, title, content)
|
|
} else {
|
|
// set by SourceRelativeLinksEval
|
|
newLink, err := r.LinkResolver(string(link))
|
|
if err != nil {
|
|
newLink = string(link)
|
|
jww.ERROR.Printf("LinkResolver: %s", err)
|
|
}
|
|
r.Renderer.Link(out, []byte(newLink), title, content)
|
|
}
|
|
}
|
|
func (r *HugoHTMLRenderer) Image(out *bytes.Buffer, link []byte, title []byte, alt []byte) {
|
|
if r.FileResolver == nil || bytes.HasPrefix(link, []byte("HAHAHUGOSHORTCODE")) {
|
|
// Use the blackfriday built in Image handler
|
|
r.Renderer.Image(out, link, title, alt)
|
|
} else {
|
|
// set by SourceRelativeLinksEval
|
|
newLink, err := r.FileResolver(string(link))
|
|
if err != nil {
|
|
newLink = string(link)
|
|
jww.ERROR.Printf("FileResolver: %s", err)
|
|
}
|
|
r.Renderer.Image(out, []byte(newLink), title, alt)
|
|
}
|
|
}
|
|
|
|
// ListItem adds task list support to the Blackfriday renderer.
|
|
func (r *HugoHTMLRenderer) ListItem(out *bytes.Buffer, text []byte, flags int) {
|
|
if !r.Config.TaskLists {
|
|
r.Renderer.ListItem(out, text, flags)
|
|
return
|
|
}
|
|
|
|
switch {
|
|
case bytes.HasPrefix(text, []byte("[ ] ")):
|
|
text = append([]byte(`<input type="checkbox" disabled class="task-list-item">`), text[3:]...)
|
|
|
|
case bytes.HasPrefix(text, []byte("[x] ")) || bytes.HasPrefix(text, []byte("[X] ")):
|
|
text = append([]byte(`<input type="checkbox" checked disabled class="task-list-item">`), text[3:]...)
|
|
}
|
|
|
|
r.Renderer.ListItem(out, text, flags)
|
|
}
|
|
|
|
// List adds task list support to the Blackfriday renderer.
|
|
func (r *HugoHTMLRenderer) List(out *bytes.Buffer, text func() bool, flags int) {
|
|
if !r.Config.TaskLists {
|
|
r.Renderer.List(out, text, flags)
|
|
return
|
|
}
|
|
marker := out.Len()
|
|
r.Renderer.List(out, text, flags)
|
|
if out.Len() > marker {
|
|
list := out.Bytes()[marker:]
|
|
if bytes.Contains(list, []byte("task-list-item")) {
|
|
// Find the index of the first >, it might be 3 or 4 depending on whether
|
|
// there is a new line at the start, but this is safer than just hardcoding it.
|
|
closingBracketIndex := bytes.Index(list, []byte(">"))
|
|
// Rewrite the buffer from the marker
|
|
out.Truncate(marker)
|
|
// Safely assuming closingBracketIndex won't be -1 since there is a list
|
|
// May be either dl, ul or ol
|
|
list := append(list[:closingBracketIndex], append([]byte(` class="task-list"`), list[closingBracketIndex:]...)...)
|
|
out.Write(list)
|
|
}
|
|
}
|
|
}
|
|
|
|
// HugoMmarkHTMLRenderer wraps a mmark.Renderer, typically a mmark.html
|
|
// Enabling Hugo to customise the rendering experience
|
|
type HugoMmarkHTMLRenderer struct {
|
|
mmark.Renderer
|
|
Cfg config.Provider
|
|
}
|
|
|
|
func (r *HugoMmarkHTMLRenderer) BlockCode(out *bytes.Buffer, text []byte, lang string, caption []byte, subfigure bool, callouts bool) {
|
|
if r.Cfg.GetBool("pygmentsCodeFences") && (lang != "" || r.Cfg.GetBool("pygmentsCodeFencesGuessSyntax")) {
|
|
str := html.UnescapeString(string(text))
|
|
out.WriteString(Highlight(r.Cfg, str, lang, ""))
|
|
} else {
|
|
r.Renderer.BlockCode(out, text, lang, caption, subfigure, callouts)
|
|
}
|
|
}
|