mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
Apply project wide go fmt
This commit is contained in:
parent
c274e21356
commit
72f14a8202
8 changed files with 28 additions and 29 deletions
|
@ -4,9 +4,9 @@ import (
|
|||
"bytes"
|
||||
"html"
|
||||
|
||||
"github.com/miekg/mmark"
|
||||
"github.com/russross/blackfriday"
|
||||
"github.com/spf13/viper"
|
||||
"github.com/miekg/mmark"
|
||||
)
|
||||
|
||||
// Wraps a blackfriday.Renderer, typically a blackfriday.Html
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
package helpers
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"github.com/spf13/viper"
|
||||
"bytes"
|
||||
"github.com/spf13/viper"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// Renders a codeblock using Blackfriday
|
||||
func render(input string) string {
|
||||
ctx := &RenderingContext{};
|
||||
render := GetHTMLRenderer(0, ctx);
|
||||
ctx := &RenderingContext{}
|
||||
render := GetHTMLRenderer(0, ctx)
|
||||
|
||||
buf := &bytes.Buffer{}
|
||||
render.BlockCode(buf, []byte(input), "html")
|
||||
|
@ -17,15 +18,14 @@ func render(input string) string {
|
|||
|
||||
// Renders a codeblock using Mmark
|
||||
func renderWithMmark(input string) string {
|
||||
ctx := &RenderingContext{};
|
||||
render := GetMmarkHtmlRenderer(0, ctx);
|
||||
ctx := &RenderingContext{}
|
||||
render := GetMmarkHtmlRenderer(0, ctx)
|
||||
|
||||
buf := &bytes.Buffer{}
|
||||
render.BlockCode(buf, []byte(input), "html", []byte(""), false, false)
|
||||
return buf.String()
|
||||
}
|
||||
|
||||
|
||||
func TestCodeFence(t *testing.T) {
|
||||
|
||||
if !HasPygments() {
|
||||
|
|
|
@ -98,7 +98,7 @@ func Highlight(code, lang, optsStr string) string {
|
|||
if lang == "" {
|
||||
langOpt = "-g" // Try guessing the language
|
||||
} else {
|
||||
langOpt = "-l"+lang
|
||||
langOpt = "-l" + lang
|
||||
}
|
||||
|
||||
cmd := exec.Command(pygmentsBin, langOpt, "-fhtml", "-O", options)
|
||||
|
|
|
@ -83,7 +83,7 @@ func Dictionary(values ...interface{}) (map[string]interface{}, error) {
|
|||
return nil, errors.New("invalid dict call")
|
||||
}
|
||||
dict := make(map[string]interface{}, len(values)/2)
|
||||
for i := 0; i < len(values); i+=2 {
|
||||
for i := 0; i < len(values); i += 2 {
|
||||
key, ok := values[i].(string)
|
||||
if !ok {
|
||||
return nil, errors.New("dict keys must be strings")
|
||||
|
|
|
@ -328,16 +328,16 @@ func TestDictionary(t *testing.T) {
|
|||
for i, this := range []struct {
|
||||
v1 []interface{}
|
||||
expecterr bool
|
||||
expectedValue map[string] interface{}
|
||||
expectedValue map[string]interface{}
|
||||
}{
|
||||
{[]interface{}{"a", "b"}, false, map[string]interface{}{"a":"b"}},
|
||||
{[]interface{}{5, "b"}, true,nil},
|
||||
{[]interface{}{"a", 12,"b",[]int{4}}, false,map[string]interface{}{"a":12,"b":[]int{4}}},
|
||||
{[]interface{}{"a", "b", "c"}, true,nil},
|
||||
{[]interface{}{"a", "b"}, false, map[string]interface{}{"a": "b"}},
|
||||
{[]interface{}{5, "b"}, true, nil},
|
||||
{[]interface{}{"a", 12, "b", []int{4}}, false, map[string]interface{}{"a": 12, "b": []int{4}}},
|
||||
{[]interface{}{"a", "b", "c"}, true, nil},
|
||||
} {
|
||||
r,e := Dictionary(this.v1...)
|
||||
r, e := Dictionary(this.v1...)
|
||||
|
||||
if (this.expecterr && e==nil) || (!this.expecterr && e!=nil) {
|
||||
if (this.expecterr && e == nil) || (!this.expecterr && e != nil) {
|
||||
t.Errorf("[%d] got an unexpected error", i, e, this.expecterr)
|
||||
} else if !this.expecterr {
|
||||
if !reflect.DeepEqual(r, this.expectedValue) {
|
||||
|
@ -347,7 +347,6 @@ func TestDictionary(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
func TestIn(t *testing.T) {
|
||||
for i, this := range []struct {
|
||||
v1 interface{}
|
||||
|
|
Loading…
Reference in a new issue