tpl/collections: Allow pointer receiver in Group

See #4865

diff --git a/tpl/collections/collections.go b/tpl/collections/collections.go
index 2ccee43d48ca1a9d41fb367e645c798d177cac34..98d62a62c036ac72765720a613ec3083c407dad9 100644 (file)
--- a/tpl/collections/collections.go
+++ b/tpl/collections/collections.go
@@ -326,7 +326,7 @@ func (ns *Namespace) Group(key interface{}, items interface{}) (interface{}, err
                if tp.Kind() == reflect.Ptr {
                        tp = tp.Elem()
                }
-               in := reflect.Zero(tp).Interface()
+               in := reflect.New(tp).Interface()
                switch vv := in.(type) {
                case collections.Grouper:
                        return vv.Group(key, items)

diff --git a/tpl/collections/collections_test.go b/tpl/collections/collections_test.go
index cbcf819c7afd154b69636bbd81602ac13b7746d3..07fc4afe6e6760cb7fe23d96de630a48bc185a76 100644 (file)
--- a/tpl/collections/collections_test.go
+++ b/tpl/collections/collections_test.go
@@ -85,6 +85,14 @@ func (g tstGrouper) Group(key interface{}, items interface{}) (interface{}, erro
        return fmt.Sprintf("%v(%d)", key, ilen), nil
 }
 
+type tstGrouper2 struct {
+}
+
+func (g *tstGrouper2) Group(key interface{}, items interface{}) (interface{}, error) {
+       ilen := reflect.ValueOf(items).Len()
+       return fmt.Sprintf("%v(%d)", key, ilen), nil
+}
+
 func TestGroup(t *testing.T) {
        t.Parallel()
 
@@ -98,6 +106,8 @@ func TestGroup(t *testing.T) {
                {"a", []*tstGrouper{&tstGrouper{}, &tstGrouper{}}, "a(2)"},
                {"b", tstGroupers{&tstGrouper{}, &tstGrouper{}}, "b(2)"},
                {"a", []tstGrouper{tstGrouper{}, tstGrouper{}}, "a(2)"},
+               {"a", []*tstGrouper2{&tstGrouper2{}, &tstGrouper2{}}, "a(2)"},
+               {"b", []tstGrouper2{tstGrouper2{}, tstGrouper2{}}, "b(2)"},
                {"a", []*tstGrouper{}, "a(0)"},
                {"a", []string{"a", "b"}, false},
                {nil, []*tstGrouper{&tstGrouper{}, &tstGrouper{}}, false},