Apply project wide go fmt

This commit is contained in:
Bjørn Erik Pedersen
2015-10-12 20:47:06 +02:00
parent c274e21356
commit 72f14a8202
8 changed files with 28 additions and 29 deletions

View File

@@ -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

View File

@@ -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() {
@@ -38,7 +38,7 @@ func TestCodeFence(t *testing.T) {
input, expected string
}
data := []test{
{true, "<html></html>", "<div class=\"highlight\"><pre><span class=\"nt\">&lt;html&gt;&lt;/html&gt;</span>\n</pre></div>\n"},
{true, "<html></html>", "<div class=\"highlight\"><pre><span class=\"nt\">&lt;html&gt;&lt;/html&gt;</span>\n</pre></div>\n"},
{false, "<html></html>", "<pre><code class=\"language-html\">&lt;html&gt;&lt;/html&gt;</code></pre>\n"},
}

View File

@@ -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)