phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-06-30 21:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

markup: Fix typo in function and struct names

Browse source
This commit is contained in:
Oleksandr Redko 2023-05-23 16:31:36 +03:00 committed by Bjørn Erik Pedersen
parent 4c46f9400b
commit 382c726e63
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
markup/highlight/config.go
View file

@ -136,7 +136,7 @@ func applyOptions(opts any, cfg *Config) error {
}
func applyOptionsFromString(opts string, cfg *Config) error {
optsm, err := parseHightlightOptions(opts)
optsm, err := parseHighlightOptions(opts)
if err != nil {
return err
}
@ -188,7 +188,7 @@ func ApplyLegacyConfig(cfg config.Provider, conf *Config) error {
return nil
}
func parseHightlightOptions(in string) (map[string]any, error) {
func parseHighlightOptions(in string) (map[string]any, error) {
in = strings.Trim(in, " ")
opts := make(map[string]any)

30
markup/highlight/highlight.go
View file

@ -33,8 +33,8 @@ import (
"github.com/gohugoio/hugo/markup/internal/attributes"
)
// Markdown attributes used by the Chroma hightlighter.
var chromaHightlightProcessingAttributes = map[string]bool{
// Markdown attributes used by the Chroma highlighter.
var chromaHighlightProcessingAttributes = map[string]bool{
"anchorLineNos": true,
"guessSyntax": true,
"hl_Lines": true,
@ -48,8 +48,8 @@ var chromaHightlightProcessingAttributes = map[string]bool{
}
func init() {
for k, v := range chromaHightlightProcessingAttributes {
chromaHightlightProcessingAttributes[strings.ToLower(k)] = v
for k, v := range chromaHighlightProcessingAttributes {
chromaHighlightProcessingAttributes[strings.ToLower(k)] = v
}
}
@ -61,7 +61,7 @@ func New(cfg Config) Highlighter {
type Highlighter interface {
Highlight(code, lang string, opts any) (string, error)
HighlightCodeBlock(ctx hooks.CodeblockContext, opts any) (HightlightResult, error)
HighlightCodeBlock(ctx hooks.CodeblockContext, opts any) (HighlightResult, error)
hooks.CodeBlockRenderer
hooks.IsDefaultCodeBlockRendererProvider
}
@ -84,7 +84,7 @@ func (h chromaHighlighter) Highlight(code, lang string, opts any) (string, error
return b.String(), nil
}
func (h chromaHighlighter) HighlightCodeBlock(ctx hooks.CodeblockContext, opts any) (HightlightResult, error) {
func (h chromaHighlighter) HighlightCodeBlock(ctx hooks.CodeblockContext, opts any) (HighlightResult, error) {
cfg := h.cfg
var b strings.Builder
@ -94,21 +94,21 @@ func (h chromaHighlighter) HighlightCodeBlock(ctx hooks.CodeblockContext, opts a
options := ctx.Options()
if err := applyOptionsFromMap(options, &cfg); err != nil {
return HightlightResult{}, err
return HighlightResult{}, err
}
// Apply these last so the user can override them.
if err := applyOptions(opts, &cfg); err != nil {
return HightlightResult{}, err
return HighlightResult{}, err
}
if err := applyOptionsFromCodeBlockContext(ctx, &cfg); err != nil {
return HightlightResult{}, err
return HighlightResult{}, err
}
low, high, err := highlight(&b, ctx.Inner(), ctx.Type(), attributes, cfg)
if err != nil {
return HightlightResult{}, err
return HighlightResult{}, err
}
highlighted := b.String()
@ -116,7 +116,7 @@ func (h chromaHighlighter) HighlightCodeBlock(ctx hooks.CodeblockContext, opts a
high = len(highlighted)
}
return HightlightResult{
return HighlightResult{
highlighted: template.HTML(highlighted),
innerLow: low,
innerHigh: high,
@ -153,20 +153,20 @@ func (h chromaHighlighter) GetIdentity() identity.Identity {
return id
}
// HightlightResult holds the result of an highlighting operation.
type HightlightResult struct {
// HighlightResult holds the result of an highlighting operation.
type HighlightResult struct {
innerLow int
innerHigh int
highlighted template.HTML
}
// Wrapped returns the highlighted code wrapped in a <div>, <pre> and <code> tag.
func (h HightlightResult) Wrapped() template.HTML {
func (h HighlightResult) Wrapped() template.HTML {
return h.highlighted
}
// Inner returns the highlighted code without the wrapping <div>, <pre> and <code> tag, suitable for inline use.
func (h HightlightResult) Inner() template.HTML {
func (h HighlightResult) Inner() template.HTML {
return h.highlighted[h.innerLow:h.innerHigh]
}

8
markup/internal/attributes/attributes.go
View file

@ -26,7 +26,7 @@ import (
)
// Markdown attributes used as options by the Chroma highlighter.
var chromaHightlightProcessingAttributes = map[string]bool{
var chromaHighlightProcessingAttributes = map[string]bool{
"anchorLineNos": true,
"guessSyntax": true,
"hl_Lines": true,
@ -42,8 +42,8 @@ var chromaHightlightProcessingAttributes = map[string]bool{
}
func init() {
for k, v := range chromaHightlightProcessingAttributes {
chromaHightlightProcessingAttributes[strings.ToLower(k)] = v
for k, v := range chromaHighlightProcessingAttributes {
chromaHighlightProcessingAttributes[strings.ToLower(k)] = v
}
}
@ -101,7 +101,7 @@ func New(astAttributes []ast.Attribute, ownerType AttributesOwnerType) *Attribut
panic(fmt.Sprintf("not implemented: %T", vvv))
}
if ownerType == AttributesOwnerCodeBlockChroma && chromaHightlightProcessingAttributes[nameLower] {
if ownerType == AttributesOwnerCodeBlockChroma && chromaHighlightProcessingAttributes[nameLower] {
attr := Attribute{Name: string(v.Name), Value: vv}
opts = append(opts, attr)
} else {

2
tpl/transform/transform.go
View file

@ -81,7 +81,7 @@ func (ns *Namespace) Highlight(s any, lang string, opts ...any) (template.HTML,
}
// HighlightCodeBlock highlights a code block on the form received in the codeblock render hooks.
func (ns *Namespace) HighlightCodeBlock(ctx hooks.CodeblockContext, opts ...any) (highlight.HightlightResult, error) {
func (ns *Namespace) HighlightCodeBlock(ctx hooks.CodeblockContext, opts ...any) (highlight.HighlightResult, error) {
var optsv any
if len(opts) > 0 {
optsv = opts[0]