summaryrefslogtreecommitdiffstats
path: root/markup
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-06-04 17:39:34 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-06-04 17:47:20 +0200
commit311b8008bfba3411741ef8ebe4b094adb92ce041 (patch)
treeb79e2023069fd48f5023f0b03b820542ee26dd65 /markup
parentc7d5f9f067fd6a37ac6b75cb1c02259debd3ff21 (diff)
helpers: Fix panic with invalid defaultMarkdownHandler
Fixes #9968
Diffstat (limited to 'markup')
-rw-r--r--markup/markup.go14
1 files changed, 13 insertions, 1 deletions
diff --git a/markup/markup.go b/markup/markup.go
index f5e46ad90..1345867f9 100644
--- a/markup/markup.go
+++ b/markup/markup.go
@@ -14,6 +14,7 @@
package markup
import (
+ "fmt"
"strings"
"github.com/gohugoio/hugo/markup/highlight"
@@ -43,6 +44,8 @@ func NewConverterProvider(cfg converter.ProviderConfig) (ConverterProvider, erro
}
cfg.MarkupConfig = markupConfig
+ defaultHandler := cfg.MarkupConfig.DefaultMarkdownHandler
+ var defaultFound bool
add := func(p converter.ProviderProvider, aliases ...string) error {
c, err := p.New(cfg)
@@ -54,8 +57,9 @@ func NewConverterProvider(cfg converter.ProviderConfig) (ConverterProvider, erro
aliases = append(aliases, name)
- if strings.EqualFold(name, cfg.MarkupConfig.DefaultMarkdownHandler) {
+ if strings.EqualFold(name, defaultHandler) {
aliases = append(aliases, "markdown")
+ defaultFound = true
}
addConverter(converters, c, aliases...)
@@ -78,6 +82,14 @@ func NewConverterProvider(cfg converter.ProviderConfig) (ConverterProvider, erro
return nil, err
}
+ if !defaultFound {
+ msg := "markup: Configured defaultMarkdownHandler %q not found."
+ if defaultHandler == "blackfriday" {
+ msg += " Did you mean to use goldmark? Blackfriday was removed in Hugo v0.100.0."
+ }
+ return nil, fmt.Errorf(msg, defaultHandler)
+ }
+
return &converterRegistry{
config: cfg,
converters: converters,