Replace regexp based Chomp with builtin TrimRight

diff --git a/tpl/template.go b/tpl/template.go
index b448355e7bba6fe9cce2e9cb6071fa00459538a1..ac203af8902b2a08521ead3960da647b7fe3f773 100644 (file)
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -29,7 +29,6 @@ import (
        "os"
        "path/filepath"
        "reflect"
-       "regexp"
        "sort"
        "strconv"
        "strings"
@@ -38,7 +37,6 @@ import (
 var localTemplates *template.Template
 var tmpl Template
 var funcMap template.FuncMap
-var chompRegexp *regexp.Regexp
 
 type Template interface {
        ExecuteTemplate(wr io.Writer, name string, data interface{}) error
@@ -877,7 +875,7 @@ func Chomp(text interface{}) (string, error) {
                return "", err
        }
 
-       return chompRegexp.ReplaceAllString(s, ""), nil
+       return strings.TrimRight(s, "\r\n"), nil
 }
 
 // Trim leading/trailing characters defined by b from a
@@ -1245,44 +1243,43 @@ func (t *GoHtmlTemplate) LoadTemplates(absPath string) {
 
 func init() {
        funcMap = template.FuncMap{
-               "urlize":       helpers.Urlize,
-               "sanitizeurl":  helpers.SanitizeUrl,
-               "eq":           Eq,
-               "ne":           Ne,
-               "gt":           Gt,
-               "ge":           Ge,
-               "lt":           Lt,
-               "le":           Le,
-               "in":           In,
-               "intersect":    Intersect,
-               "isset":        IsSet,
-               "echoParam":    ReturnWhenSet,
-               "safeHtml":     SafeHtml,
-               "safeCss":      SafeCss,
-               "safeUrl":      SafeUrl,
-               "markdownify":  Markdownify,
-               "first":        First,
-               "where":        Where,
-               "delimit":      Delimit,
-               "sort":         Sort,
-               "highlight":    Highlight,
-               "add":          func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '+') },
-               "sub":          func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '-') },
-               "div":          func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '/') },
-               "mod":          Mod,
-               "mul":          func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '*') },
-               "modBool":      ModBool,
-               "lower":        func(a string) string { return strings.ToLower(a) },
-               "upper":        func(a string) string { return strings.ToUpper(a) },
-               "title":        func(a string) string { return strings.Title(a) },
-               "partial":      Partial,
-               "ref":          Ref,
-               "relref":       RelRef,
-               "apply":        Apply,
-               "chomp":        Chomp,
-               "replace":      Replace,
-               "trim":         Trim,
-       }
-
-       chompRegexp = regexp.MustCompile("[\r\n]+$")
+               "urlize":      helpers.Urlize,
+               "sanitizeurl": helpers.SanitizeUrl,
+               "eq":          Eq,
+               "ne":          Ne,
+               "gt":          Gt,
+               "ge":          Ge,
+               "lt":          Lt,
+               "le":          Le,
+               "in":          In,
+               "intersect":   Intersect,
+               "isset":       IsSet,
+               "echoParam":   ReturnWhenSet,
+               "safeHtml":    SafeHtml,
+               "safeCss":     SafeCss,
+               "safeUrl":     SafeUrl,
+               "markdownify": Markdownify,
+               "first":       First,
+               "where":       Where,
+               "delimit":     Delimit,
+               "sort":        Sort,
+               "highlight":   Highlight,
+               "add":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '+') },
+               "sub":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '-') },
+               "div":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '/') },
+               "mod":         Mod,
+               "mul":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '*') },
+               "modBool":     ModBool,
+               "lower":       func(a string) string { return strings.ToLower(a) },
+               "upper":       func(a string) string { return strings.ToUpper(a) },
+               "title":       func(a string) string { return strings.Title(a) },
+               "partial":     Partial,
+               "ref":         Ref,
+               "relref":      RelRef,
+               "apply":       Apply,
+               "chomp":       Chomp,
+               "replace":     Replace,
+               "trim":        Trim,
+       }
+
 }

diff --git a/tpl/template_test.go b/tpl/template_test.go
index 8a07474350dd2db3d27688993b2ae60538843278..d1a8bbdbb67cba0c7c62ba50ae6bc6607f223eb1 100644 (file)
--- a/tpl/template_test.go
+++ b/tpl/template_test.go
@@ -835,9 +835,9 @@ func TestMarkdownify(t *testing.T) {
 func TestChomp(t *testing.T) {
        base := "\n This is\na story "
        for i, item := range []string{
-               "\n",
-               "\r",
-               "\r\n",
+               "\n", "\n\n",
+               "\r", "\r\r",
+               "\r\n", "\r\n\r\n",
        } {
                chomped, _ := Chomp(base + item)