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

Fixes #9591

diff --git a/markup/highlight/config.go b/markup/highlight/config.go
index 3204ce195dc4026c19119988b5e04a8daefeadf5..1142c5e11476022dbba6fabda3b5a2d836f4d37c 100644 (file)
--- a/markup/highlight/config.go
+++ b/markup/highlight/config.go
@@ -122,10 +122,13 @@ func applyOptions(opts interface{}, cfg *Config) error {
        switch vv := opts.(type) {
        case map[string]interface{}:
                return applyOptionsFromMap(vv, cfg)
-       case string:
-               return applyOptionsFromString(vv, cfg)
+       default:
+               s, err := cast.ToStringE(opts)
+               if err != nil {
+                       return err
+               }
+               return applyOptionsFromString(s, cfg)
        }
-       return nil
 }
 
 func applyOptionsFromString(opts string, cfg *Config) error {

diff --git a/tpl/transform/transform_test.go b/tpl/transform/transform_test.go
index 289674bf17691590b811ee09af6fdc3d9d23d522..e52e0046dfbe4b5e45b9099c0bbdaf5d280af141 100644 (file)
--- a/tpl/transform/transform_test.go
+++ b/tpl/transform/transform_test.go
@@ -15,6 +15,7 @@ package transform_test
 
 import (
        "html/template"
+       "strings"
        "testing"
 
        "github.com/gohugoio/hugo/common/loggers"
@@ -81,6 +82,8 @@ func TestHighlight(t *testing.T) {
                // Issue #4179
                {`<Foo attr=" &lt; "></Foo>`, "xml", "", `&amp;lt;`},
                {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)