hugolib: Some more GoLint fixes - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit c2c73c2bd21090173135b9dbfdc89400450c4837
DIR parent 218fceac358ad3c76482ff009be7ccf4df6ce988
HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Thu, 24 Mar 2016 14:11:04 +0100
hugolib: Some more GoLint fixes
Diffstat:
M hugolib/pageCache_test.go | 4 ++--
M hugolib/shortcode.go | 16 +++++++++++-----
M hugolib/siteinfo_test.go | 4 ++--
3 files changed, 15 insertions(+), 9 deletions(-)
---
DIR diff --git a/hugolib/pageCache_test.go b/hugolib/pageCache_test.go
@@ -27,8 +27,8 @@ func TestPageCache(t *testing.T) {
p[0].Description = "changed"
}
- var o1 uint64 = 0
- var o2 uint64 = 0
+ var o1 uint64
+ var o2 uint64
var wg sync.WaitGroup
DIR diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
@@ -30,6 +30,7 @@ import (
jww "github.com/spf13/jwalterweatherman"
)
+// ShortcodeWithPage is the "." context in a shortcode template.
type ShortcodeWithPage struct {
Params interface{}
Inner template.HTML
@@ -39,18 +40,23 @@ type ShortcodeWithPage struct {
scratch *Scratch
}
+// Site returns information about the current site.
func (scp *ShortcodeWithPage) Site() *SiteInfo {
return scp.Page.Site
}
+// Ref is a shortcut to the Ref method on Page.
func (scp *ShortcodeWithPage) Ref(ref string) (string, error) {
return scp.Page.Ref(ref)
}
+// RelRef is a shortcut to the RelRef method on Page.
func (scp *ShortcodeWithPage) RelRef(ref string) (string, error) {
return scp.Page.RelRef(ref)
}
+// Scratch returns a scratch-pad scoped for this shortcode. This can be used
+// as a temporary storage for variables, counters etc.
func (scp *ShortcodeWithPage) Scratch() *Scratch {
if scp.scratch == nil {
scp.scratch = newScratch()
@@ -58,6 +64,7 @@ func (scp *ShortcodeWithPage) Scratch() *Scratch {
return scp.scratch
}
+// Get is a convenience method to look up shortcode parameters by its key.
func (scp *ShortcodeWithPage) Get(key interface{}) interface{} {
if reflect.ValueOf(scp.Params).Len() == 0 {
return nil
@@ -154,9 +161,8 @@ func HandleShortcodes(stringToParse string, page *Page, t tpl.Template) (string,
if err != nil {
return "", fmt.Errorf("Fail to replace short code tokens in %s:\n%s", page.BaseFileName(), err.Error())
- } else {
- return string(tmpContentWithTokensReplaced), nil
}
+ return string(tmpContentWithTokensReplaced), nil
}
return tmpContent, nil
@@ -303,7 +309,7 @@ func renderShortcodes(shortcodes map[string]shortcode, p *Page, t tpl.Template)
return renderedShortcodes
}
-var shortCodeIllegalState = errors.New("Illegal shortcode state")
+var errShortCodeIllegalState = errors.New("Illegal shortcode state")
// pageTokens state:
// - before: positioned just before the shortcode start
@@ -395,7 +401,7 @@ Loop:
if params, ok := sc.params.(map[string]string); ok {
params[currItem.val] = pt.next().val
} else {
- return sc, shortCodeIllegalState
+ return sc, errShortCodeIllegalState
}
}
@@ -410,7 +416,7 @@ Loop:
params = append(params, currItem.val)
sc.params = params
} else {
- return sc, shortCodeIllegalState
+ return sc, errShortCodeIllegalState
}
}
DIR diff --git a/hugolib/siteinfo_test.go b/hugolib/siteinfo_test.go
@@ -20,7 +20,7 @@ import (
"github.com/spf13/viper"
)
-const SITE_INFO_PARAM_TEMPLATE = `{{ .Site.Params.MyGlobalParam }}`
+const siteInfoParamTemplate = `{{ .Site.Params.MyGlobalParam }}`
func TestSiteInfoParams(t *testing.T) {
viper.Reset()
@@ -34,7 +34,7 @@ func TestSiteInfoParams(t *testing.T) {
t.Errorf("Unable to set site.Info.Param")
}
- s.prepTemplates("template", SITE_INFO_PARAM_TEMPLATE)
+ s.prepTemplates("template", siteInfoParamTemplate)
buf := new(bytes.Buffer)