shithub: hugo

Info  •  Files  •  Log  •  Branches

tpl/collections: Allow pointer receiver in Group

See #4865

--- a/tpl/collections/collections.go

+++ b/tpl/collections/collections.go

@@ -326,7 +326,7 @@

 		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)

--- a/tpl/collections/collections_test.go

+++ b/tpl/collections/collections_test.go

@@ -85,6 +85,14 @@

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

 		{"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},