mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-28 22:50:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

markup/goldmark/codeblock: Fix attributes when no language identifier in CodeBlock

Browse source 
Fixes #10118
This commit is contained in:
piyo 2022-08-03 18:32:08 +09:00 • committed by GitHub
parent 3fefea06b8
commit cbdaff2135
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
markup/goldmark/codeblocks/render.go
View file

@ -16,6 +16,7 @@ package codeblocks
import (
"bytes"
"fmt"
"strings"
"sync"
"github.com/alecthomas/chroma/v2/lexers"
@ -69,7 +70,7 @@ func (r *htmlRenderer) renderCodeBlock(w util.BufWriter, src []byte, node ast.No
}
n := node.(*codeBlock)
lang := string(n.b.Language(src))
lang := getLang(n.b, src)
renderer := ctx.RenderContext().GetRenderer(hooks.CodeBlockRendererType, lang)
if renderer == nil {
return ast.WalkStop, fmt.Errorf("no code renderer found for %q", lang)
@ -174,6 +175,12 @@ func (c *codeBlockContext) Position() htext.Position {
return c.pos
}
func getLang(node *ast.FencedCodeBlock, src []byte) string {
langWithAttributes := string(node.Language(src))
lang, _, _ := strings.Cut(langWithAttributes, "{")
return lang
}
func getAttributes(node *ast.FencedCodeBlock, infostr []byte) []ast.Attribute {
if node.Attributes() != nil {
return node.Attributes()
@ -188,7 +195,7 @@ func getAttributes(node *ast.FencedCodeBlock, infostr []byte) []ast.Attribute {
}
}
if attrStartIdx > 0 {
if attrStartIdx != -1 {
n := ast.NewTextBlock() // dummy node for storing attributes
attrStr := infostr[attrStartIdx:]
if attrs, hasAttr := parser.ParseAttributes(text.NewReader(attrStr)); hasAttr {