github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

tpl/transform: Fix it when template.HTML is passes as option to Hightlight

Browse source 
Fixes #9591
This commit is contained in:
Bjørn Erik Pedersen 2022-03-02 10:44:29 +01:00
parent 9b8b6d34e2
commit 0327da050f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
markup/highlight/config.go
View file

@ -122,10 +122,13 @@ func applyOptions(opts interface{}, cfg *Config) error {
switch vv := opts.(type) { switch vv := opts.(type) {
case map[string]interface{}: case map[string]interface{}:
return applyOptionsFromMap(vv, cfg) return applyOptionsFromMap(vv, cfg)
case string: default:
return applyOptionsFromString(vv, cfg) s, err := cast.ToStringE(opts)
if err != nil {
return err
}
return applyOptionsFromString(s, cfg)
} }
return nil
} }
func applyOptionsFromString(opts string, cfg *Config) error { func applyOptionsFromString(opts string, cfg *Config) error {

3
tpl/transform/transform_test.go
View file

@ -15,6 +15,7 @@ package transform_test
import ( import (
"html/template" "html/template"
"strings"
"testing" "testing"
"github.com/gohugoio/hugo/common/loggers" "github.com/gohugoio/hugo/common/loggers"
@ -81,6 +82,8 @@ func TestHighlight(t *testing.T) {
// Issue #4179 // Issue #4179
{`<Foo attr=" &lt; "></Foo>`, "xml", "", `&amp;lt;`}, {`<Foo attr=" &lt; "></Foo>`, "xml", "", `&amp;lt;`},
{tstNoStringer{}, "go", "", false}, {tstNoStringer{}, "go", "", false},
// Issue #9591
{strings.Repeat("AAA \n", 10), "bash", template.HTML("linenos=true,noClasses=false"), "line"},
} { } {
result, err := ns.Highlight(test.s, test.lang, test.opts) result, err := ns.Highlight(test.s, test.lang, test.opts)