mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
parent
577522bd45
commit
74ea81b885
2 changed files with 30 additions and 10 deletions
|
@ -1276,22 +1276,24 @@ func (p pairList) sort() interface{} {
|
|||
|
||||
// isSet returns whether a given array, channel, slice, or map has a key
|
||||
// defined.
|
||||
func isSet(a interface{}, key interface{}) bool {
|
||||
func isSet(a interface{}, key interface{}) (bool, error) {
|
||||
av := reflect.ValueOf(a)
|
||||
kv := reflect.ValueOf(key)
|
||||
|
||||
switch av.Kind() {
|
||||
case reflect.Array, reflect.Chan, reflect.Slice:
|
||||
if int64(av.Len()) > kv.Int() {
|
||||
return true
|
||||
return true, nil
|
||||
}
|
||||
case reflect.Map:
|
||||
if kv.Type() == av.Type().Key() {
|
||||
return av.MapIndex(kv).IsValid()
|
||||
return av.MapIndex(kv).IsValid(), nil
|
||||
}
|
||||
default:
|
||||
return false, fmt.Errorf("unsupported type %q", av.Kind())
|
||||
}
|
||||
|
||||
return false
|
||||
return false, nil
|
||||
}
|
||||
|
||||
// returnWhenSet returns a given value if it set. Otherwise, it returns an
|
||||
|
|
|
@ -1017,13 +1017,31 @@ func TestIntersect(t *testing.T) {
|
|||
|
||||
func TestIsSet(t *testing.T) {
|
||||
t.Parallel()
|
||||
aSlice := []interface{}{1, 2, 3, 5}
|
||||
aMap := map[string]interface{}{"a": 1, "b": 2}
|
||||
|
||||
assert.True(t, isSet(aSlice, 2))
|
||||
assert.True(t, isSet(aMap, "b"))
|
||||
assert.False(t, isSet(aSlice, 22))
|
||||
assert.False(t, isSet(aMap, "bc"))
|
||||
for _, test := range []struct {
|
||||
src interface{}
|
||||
key interface{}
|
||||
res bool
|
||||
isErr bool
|
||||
errStr string
|
||||
}{
|
||||
{[]interface{}{1, 2, 3, 5}, 2, true, false, ""},
|
||||
{[]interface{}{1, 2, 3, 5}, 22, false, false, ""},
|
||||
|
||||
{map[string]interface{}{"a": 1, "b": 2}, "b", true, false, ""},
|
||||
{map[string]interface{}{"a": 1, "b": 2}, "bc", false, false, ""},
|
||||
|
||||
{time.Now(), 1, false, true, `unsupported type "struct"`},
|
||||
} {
|
||||
res, err := isSet(test.src, test.key)
|
||||
if test.isErr {
|
||||
assert.EqualError(t, err, test.errStr)
|
||||
continue
|
||||
}
|
||||
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, test.res, res)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *TstX) TstRp() string {
|
||||
|
|
Loading…
Reference in a new issue