phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-07 09:36:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

helpers: Use pointer receiver for ContentSpec

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2019-11-04 10:57:11 +01:00
parent ad4c56b551
commit 9abd396789
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
helpers/content.go
View file

@ -354,7 +354,7 @@ func getMarkdownExtensions(ctx *RenderingContext) int {
return flags return flags
} }
func (c ContentSpec) markdownRender(ctx *RenderingContext) []byte { func (c *ContentSpec) markdownRender(ctx *RenderingContext) []byte {
if ctx.RenderTOC { if ctx.RenderTOC {
return blackfriday.Markdown(ctx.Content, return blackfriday.Markdown(ctx.Content,
c.getHTMLRenderer(blackfriday.HTML_TOC, ctx), c.getHTMLRenderer(blackfriday.HTML_TOC, ctx),
@ -420,7 +420,7 @@ func getMmarkExtensions(ctx *RenderingContext) int {
return flags return flags
} }
func (c ContentSpec) mmarkRender(ctx *RenderingContext) []byte { func (c *ContentSpec) mmarkRender(ctx *RenderingContext) []byte {
return mmark.Parse(ctx.Content, c.getMmarkHTMLRenderer(0, ctx), return mmark.Parse(ctx.Content, c.getMmarkHTMLRenderer(0, ctx),
getMmarkExtensions(ctx)).Bytes() getMmarkExtensions(ctx)).Bytes()
} }
@ -479,7 +479,7 @@ type RenderingContext struct {
} }
// RenderBytes renders a []byte. // RenderBytes renders a []byte.
func (c ContentSpec) RenderBytes(ctx *RenderingContext) []byte { func (c *ContentSpec) RenderBytes(ctx *RenderingContext) []byte {
switch ctx.PageFmt { switch ctx.PageFmt {
default: default:
return c.markdownRender(ctx) return c.markdownRender(ctx)
@ -752,7 +752,7 @@ func getPandocContent(ctx *RenderingContext) []byte {
return externallyRenderContent(ctx, path, args) return externallyRenderContent(ctx, path, args)
} }
func orgRender(ctx *RenderingContext, c ContentSpec) []byte { func orgRender(ctx *RenderingContext, c *ContentSpec) []byte {
config := org.New() config := org.New()
config.Log = jww.WARN config.Log = jww.WARN
config.ReadFile = func(filename string) ([]byte, error) { config.ReadFile = func(filename string) ([]byte, error) {

4
helpers/content_renderer_test.go
View file

@ -23,7 +23,7 @@ import (
) )
// Renders a codeblock using Blackfriday // Renders a codeblock using Blackfriday
func (c ContentSpec) render(input string) string { func (c *ContentSpec) render(input string) string {
ctx := &RenderingContext{Cfg: c.Cfg, Config: c.BlackFriday} ctx := &RenderingContext{Cfg: c.Cfg, Config: c.BlackFriday}
render := c.getHTMLRenderer(0, ctx) render := c.getHTMLRenderer(0, ctx)
@ -33,7 +33,7 @@ func (c ContentSpec) render(input string) string {
} }
// Renders a codeblock using Mmark // Renders a codeblock using Mmark
func (c ContentSpec) renderWithMmark(input string) string { func (c *ContentSpec) renderWithMmark(input string) string {
ctx := &RenderingContext{Cfg: c.Cfg, Config: c.BlackFriday} ctx := &RenderingContext{Cfg: c.Cfg, Config: c.BlackFriday}
render := c.getMmarkHTMLRenderer(0, ctx) render := c.getMmarkHTMLRenderer(0, ctx)