Apply project wide go fmt

diff --git a/commands/convert.go b/commands/convert.go
index 188ab7a723f246e411d7bbfa4461d03e2020190e..b9578a81d45308368f348cd8ce59ee025c2e82d6 100644 (file)
--- a/commands/convert.go
+++ b/commands/convert.go
@@ -33,10 +33,10 @@ var unsafe bool
 var convertCmd = &cobra.Command{
        Use:   "convert",
        Short: "Convert your content to different formats",
-       Long:  `Convert your content (e.g. front matter) to different formats.
+       Long: `Convert your content (e.g. front matter) to different formats.
 
 See convert's subcommands toJSON, toTOML and toYAML for more information.`,
-       Run:   nil,
+       Run: nil,
 }
 
 var toJSONCmd = &cobra.Command{

diff --git a/commands/list.go b/commands/list.go
index 7499080b106497cc781ee58c4202c72d8a72d216..64650f40c3686d203bec5ba510a62a626c227207 100644 (file)
--- a/commands/list.go
+++ b/commands/list.go
@@ -30,10 +30,10 @@ func init() {
 var listCmd = &cobra.Command{
        Use:   "list",
        Short: "Listing out various types of content",
-       Long:  `Listing out various types of content.
+       Long: `Listing out various types of content.
 
 List requires a subcommand, e.g. ` + "`hugo list drafts`.",
-       Run:   nil,
+       Run: nil,
 }
 
 var listDraftsCmd = &cobra.Command{
@@ -64,7 +64,7 @@ var listDraftsCmd = &cobra.Command{
 var listFutureCmd = &cobra.Command{
        Use:   "future",
        Short: "List all posts dated in the future",
-       Long:  `List all of the posts in your content directory which will be
+       Long: `List all of the posts in your content directory which will be
 posted in the future.`,
        Run: func(cmd *cobra.Command, args []string) {
 

diff --git a/commands/undraft.go b/commands/undraft.go
index f10728d82da41984f4664e25aa6e718570bd60e7..36184060c7714255104beae882372f305b1de148 100644 (file)
--- a/commands/undraft.go
+++ b/commands/undraft.go
@@ -26,10 +26,10 @@ import (
 var undraftCmd = &cobra.Command{
        Use:   "undraft path/to/content",
        Short: "Undraft changes the content's draft status from 'True' to 'False'",
-       Long:  `Undraft changes the content's draft status from 'True' to 'False'
+       Long: `Undraft changes the content's draft status from 'True' to 'False'
 and updates the date to the current date and time.
 If the content's draft status is 'False', nothing is done.`,
-       Run:   Undraft,
+       Run: Undraft,
 }
 
 // Publish publishes the specified content by setting its draft status

diff --git a/helpers/content_renderer.go b/helpers/content_renderer.go
index 77db6833c7726c648063e71980a36ed151e6aa1d..93556e7d3afe523bb2f7cc0eff07da1005c31f90 100644 (file)
--- a/helpers/content_renderer.go
+++ b/helpers/content_renderer.go
@@ -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

diff --git a/helpers/content_renderer_test.go b/helpers/content_renderer_test.go
index 1f520fd0e9e02cb90ac2af6e3d967763f54d0743..90b4c4939bcecfcdd6469ba60fbf0e797f98b402 100644 (file)
--- a/helpers/content_renderer_test.go
+++ b/helpers/content_renderer_test.go
@@ -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"},
        }
 

diff --git a/helpers/pygments.go b/helpers/pygments.go
index ecbdf99d0e64ba8af63ac43411ac77abe4e3cb66..29a5ec54f3a6aa3633d52db034fff6c139151f64 100644 (file)
--- a/helpers/pygments.go
+++ b/helpers/pygments.go
@@ -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)

diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go
index b1ac341f60c02305da5f6899e91cfb8fe49362fe..b92c2c955fc086886898494c6f9ee6b35ef5ce5f 100644 (file)
--- a/tpl/template_funcs.go
+++ b/tpl/template_funcs.go
@@ -83,12 +83,12 @@ 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")
                }
-       dict[key] = values[i+1]
+               dict[key] = values[i+1]
        }
        return dict, nil
 }

diff --git a/tpl/template_funcs_test.go b/tpl/template_funcs_test.go
index bc2515a4a2f598b5ca083543c4500913d7f6dd21..8ab68d8f10f30e0d8b204a86cc4946ead11a4a51 100644 (file)
--- a/tpl/template_funcs_test.go
+++ b/tpl/template_funcs_test.go
@@ -326,18 +326,18 @@ func TestAfter(t *testing.T) {
 
 func TestDictionary(t *testing.T) {
        for i, this := range []struct {
-               v1     []interface{}
-               expecterr bool
-               expectedValue map[string] interface{}
+               v1            []interface{}
+               expecterr     bool
+               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{}