Minor cleanups - hugo - [fork] hugo port for 9front
(HTM) git clone git@git.drkhsh.at/hugo.git
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
(DIR) README
(DIR) LICENSE
---
(DIR) commit 20f351ee4cd40b3b53e33805fc6226c837290ed7
(DIR) parent bfb9613a14ab2d93a4474e5486d22e52a9d5e2b3
(HTM) Author: Cameron Moore <moorereason@gmail.com>
Date: Sat, 23 Nov 2019 08:45:04 -0600
Minor cleanups
Use fmt.Fprint were appropriate instead of Fprintf. Remove some unused
code.
Diffstat:
M markup/highlight/highlight.go | 11 ++++++-----
M markup/highlight/temphighlighting/… | 29 +----------------------------
2 files changed, 7 insertions(+), 33 deletions(-)
---
(DIR) diff --git a/markup/highlight/highlight.go b/markup/highlight/highlight.go
@@ -22,7 +22,6 @@ import (
"github.com/alecthomas/chroma/formatters/html"
"github.com/alecthomas/chroma/lexers"
"github.com/alecthomas/chroma/styles"
-
hl "github.com/gohugoio/hugo/markup/highlight/temphighlighting"
)
@@ -76,14 +75,15 @@ func highlight(code, lang string, cfg Config) (string, error) {
formatter := html.New(options...)
- fmt.Fprintf(w, `<div class="highlight">`)
+ fmt.Fprint(w, `<div class="highlight">`)
if err := formatter.Format(w, style, iterator); err != nil {
return "", err
}
- fmt.Fprintf(w, `</div>`)
+ fmt.Fprint(w, `</div>`)
return w.String(), nil
}
+
func GetCodeBlockOptions() func(ctx hl.CodeBlockContext) []html.Option {
return func(ctx hl.CodeBlockContext) []html.Option {
var language string
@@ -99,6 +99,7 @@ func GetCodeBlockOptions() func(ctx hl.CodeBlockContext) []html.Option {
func getPreWrapper(language string) preWrapper {
return preWrapper{language: language}
}
+
func getHtmlPreWrapper(language string) html.Option {
return html.WithPreWrapper(getPreWrapper(language))
}
@@ -121,8 +122,8 @@ func (p preWrapper) Start(code bool, styleAttr string) string {
func WriteCodeTag(w io.Writer, language string) {
fmt.Fprint(w, "<code")
if language != "" {
- fmt.Fprintf(w, " class=\"language-"+language+"\"")
- fmt.Fprintf(w, " data-lang=\""+language+"\"")
+ fmt.Fprint(w, ` class="language-`+language+`"`)
+ fmt.Fprint(w, ` data-lang="`+language+`"`)
}
fmt.Fprint(w, ">")
}
(DIR) diff --git a/markup/highlight/temphighlighting/highlighting_test.go b/markup/highlight/temphighlighting/highlighting_test.go
@@ -8,30 +8,11 @@ import (
"strings"
"testing"
- "github.com/yuin/goldmark/util"
-
chromahtml "github.com/alecthomas/chroma/formatters/html"
"github.com/yuin/goldmark"
+ "github.com/yuin/goldmark/util"
)
-type preWrapper struct {
- language string
-}
-
-func (p preWrapper) Start(code bool, styleAttr string) string {
- w := &strings.Builder{}
- fmt.Fprintf(w, "<pre%s><code", styleAttr)
- if p.language != "" {
- fmt.Fprintf(w, " class=\"language-"+p.language)
- }
- fmt.Fprint(w, ">")
- return w.String()
-}
-
-func (p preWrapper) End(code bool) string {
- return "</code></pre>"
-}
-
func TestHighlighting(t *testing.T) {
var css bytes.Buffer
markdown := goldmark.New(
@@ -156,7 +137,6 @@ Title
/* GenericSubheading */ .chroma .gu { color: #75715e }`) {
t.Error("failed to render CSS")
}
-
}
func TestHighlighting2(t *testing.T) {
@@ -240,9 +220,7 @@ func TestHighlightingHlLines(t *testing.T) {
{`hl_lines=["2-3",5],linenostart=5`, []int{2, 3, 5}},
{`hl_lines=["2-3"]`, []int{2, 3}},
} {
-
t.Run(fmt.Sprint(i), func(t *testing.T) {
-
var buffer bytes.Buffer
codeBlock := fmt.Sprintf(`bash {%s}
LINE1
@@ -269,11 +247,9 @@ LINE8
}
})
}
-
}
func TestHighlightingLinenos(t *testing.T) {
-
outputLineNumbersInTable := `<div class="chroma">
<table class="lntable"><tr><td class="lntd">
<span class="lnt">1
@@ -297,7 +273,6 @@ LINE1
{`linenos=foo`, false, false, `<span class="ln">1</span>LINE1`},
{`linenos=table`, false, false, outputLineNumbersInTable},
} {
-
t.Run(fmt.Sprint(i), func(t *testing.T) {
markdown := goldmark.New(
goldmark.WithExtensions(
@@ -328,8 +303,6 @@ LINE1
if s != test.expect {
t.Fatal("got\n", s, "\nexpected\n", test.expect)
}
-
})
}
-
}