var b strings.Builder
attributes := ctx.(hooks.AttributesOptionsSliceProvider).AttributesSlice()
+
options := ctx.Options()
if err := applyOptionsFromMap(options, &cfg); err != nil {
return HightlightResult{}, err
}
+ highlighted := b.String()
+ if high == 0 {
+ high = len(highlighted)
+ }
+
return HightlightResult{
- highlighted: template.HTML(b.String()),
+ highlighted: template.HTML(highlighted),
innerLow: low,
innerHigh: high,
}, nil
func (h chromaHighlighter) RenderCodeblock(w hugio.FlexiWriter, ctx hooks.CodeblockContext) error {
cfg := h.cfg
+
attributes := ctx.(hooks.AttributesOptionsSliceProvider).AttributesSlice()
if err := applyOptionsFromMap(ctx.Options(), &cfg); err != nil {
}
func highlight(fw hugio.FlexiWriter, code, lang string, attributes []attributes.Attribute, cfg Config) (int, int, error) {
- var low, high int
-
var lexer chroma.Lexer
if lang != "" {
lexer = lexers.Get(lang)
w := &byteCountFlexiWriter{delegate: fw}
if lexer == nil {
- wrapper := getPreWrapper(lang, w)
- fmt.Fprint(w, wrapper.Start(true, ""))
- fmt.Fprint(w, gohtml.EscapeString(code))
- fmt.Fprint(w, wrapper.End(true))
- return low, high, nil
+ if cfg.Hl_inline {
+ fmt.Fprint(w, fmt.Sprintf("<code%s>%s</code>", inlineCodeAttrs(lang), gohtml.EscapeString(code)))
+ } else {
+ preWrapper := getPreWrapper(lang, w)
+ fmt.Fprint(w, preWrapper.Start(true, ""))
+ fmt.Fprint(w, gohtml.EscapeString(code))
+ fmt.Fprint(w, preWrapper.End(true))
+ }
+ return 0, 0, nil
}
style := styles.Get(cfg.Style)
return 0, 0, err
}
+ if !cfg.Hl_inline {
+ writeDivStart(w, attributes)
+ }
+
options := cfg.ToHTMLOptions()
- preWrapper := getPreWrapper(lang, w)
- options = append(options, html.WithPreWrapper(preWrapper))
+ var wrapper html.PreWrapper
+
+ if cfg.Hl_inline {
+ wrapper = startEnd{
+ start: func(code bool, styleAttr string) string {
+ if code {
+ return fmt.Sprintf(`<code%s>`, inlineCodeAttrs(lang))
+ }
+ return ``
+ },
+ end: func(code bool) string {
+ if code {
+ return `</code>`
+ }
+
+ return ``
+ },
+ }
- formatter := html.New(options...)
+ } else {
+ wrapper = getPreWrapper(lang, w)
+ }
+
+ options = append(options, html.WithPreWrapper(wrapper))
- writeDivStart(w, attributes)
+ formatter := html.New(options...)
if err := formatter.Format(w, style, iterator); err != nil {
return 0, 0, err
}
- writeDivEnd(w)
- return preWrapper.low, preWrapper.high, nil
+ if !cfg.Hl_inline {
+ writeDivEnd(w)
+ }
+
+ if p, ok := wrapper.(*preWrapper); ok {
+ return p.low, p.high, nil
+ }
+
+ return 0, 0, nil
}
func getPreWrapper(language string, writeCounter *byteCountFlexiWriter) *preWrapper {
return w.String()
}
+func inlineCodeAttrs(lang string) string {
+ if lang == "" {
+ }
+ return fmt.Sprintf(` class="code-inline language-%s"`, lang)
+}
+
func WritePreStart(w io.Writer, language, styleAttr string) {
fmt.Fprintf(w, `<pre tabindex="0"%s>`, styleAttr)
fmt.Fprint(w, "<code")
return preEnd
}
+type startEnd struct {
+ start func(code bool, styleAttr string) string
+ end func(code bool) string
+}
+
+func (s startEnd) Start(code bool, styleAttr string) string {
+ return s.start(code, styleAttr)
+}
+
+func (s startEnd) End(code bool) string {
+ return s.end(code)
+}
+
func WritePreEnd(w io.Writer) {
fmt.Fprint(w, preEnd)
}
--- /dev/null
+// Copyright 2022 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package highlight_test
+
+import (
+ "testing"
+
+ "github.com/gohugoio/hugo/hugolib"
+)
+
+func TestHighlightInline(t *testing.T) {
+ t.Parallel()
+
+ files := `
+-- config.toml --
+[markup]
+[markup.highlight]
+codeFences = true
+noClasses = false
+-- content/p1.md --
+---
+title: "p1"
+---
+
+## Inline in Shortcode
+
+Inline:{{< highlight emacs "hl_inline=true" >}}(message "this highlight shortcode"){{< /highlight >}}:End.
+Inline Unknown:{{< highlight foo "hl_inline=true" >}}(message "this highlight shortcode"){{< /highlight >}}:End.
+
+## Inline in code block
+
+Not sure if this makes sense, but add a test for it:
+
+§§§bash {hl_inline=true}
+(message "highlight me")
+§§§
+
+## HighlightCodeBlock in hook
+
+§§§html
+(message "highlight me 2")
+§§§
+
+## Unknown lexer
+
+§§§foo {hl_inline=true}
+(message "highlight me 3")
+§§§
+
+
+-- layouts/_default/_markup/render-codeblock-html.html --
+{{ $opts := dict "hl_inline" true }}
+{{ $result := transform.HighlightCodeBlock . $opts }}
+HighlightCodeBlock: Wrapped:{{ $result.Wrapped }}|Inner:{{ $result.Inner }}
+-- layouts/_default/single.html --
+{{ .Content }}
+`
+
+ b := hugolib.NewIntegrationTestBuilder(
+ hugolib.IntegrationTestConfig{
+ T: t,
+ TxtarString: files,
+ NeedsOsFS: false,
+ },
+ ).Build()
+
+ b.AssertFileContent("public/p1/index.html",
+ "Inline:<code class=\"code-inline language-emacs\"><span class=\"p\">(</span><span class=\"nf\">message</span> <span class=\"s\">"this highlight shortcode"</span><span class=\"p\">)</span></code>:End.",
+ "Inline Unknown:<code class=\"code-inline language-foo\">(message "this highlight shortcode")</code>:End.",
+ "Not sure if this makes sense, but add a test for it:</p>\n<code class=\"code-inline language-bash\"><span class=\"o\">(</span>message <span class=\"s2\">"highlight me"</span><span class=\"o\">)</span>\n</code>",
+ "HighlightCodeBlock: Wrapped:<code class=\"code-inline language-html\">(message "highlight me 2")</code>|Inner:<code class=\"code-inline language-html\">(message "highlight me 2")</code>",
+ "<code class=\"code-inline language-foo\">(message "highlight me 3")\n</code>",
+ )
+}
projects / brevno-suite / hugo / commitdiff