From: Baibhav Vatsa <baibhavvatsa@gmail.com>
Date: Fri, 11 Oct 2019 18:51:24 +0000 (-0500)
Subject: tpl: Modify error messages of after, first, and last
X-Git-Tag: v0.59.0~15
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=65b7d4221;p=brevno-suite%2Fhugo

tpl: Modify error messages of after, first, and last

Modified the messages functions after, first, and last threw on being passed invalid parameters (index or limit) to be more standardised and resemble what Go compiler would throw.

Fixes #6415
---

diff --git a/tpl/collections/collections.go b/tpl/collections/collections.go
index 95079436..df8aaa6c 100644
--- a/tpl/collections/collections.go
+++ b/tpl/collections/collections.go
@@ -61,7 +61,7 @@ func (ns *Namespace) After(index interface{}, seq interface{}) (interface{}, err
 	}
 
 	if indexv < 0 {
-		return nil, errors.New("can't return negative/empty count of items from sequence")
+		return nil, errors.New("sequence bounds out of range [" + cast.ToString(indexv) + ":]")
 	}
 
 	seqv := reflect.ValueOf(seq)
@@ -219,7 +219,7 @@ func (ns *Namespace) First(limit interface{}, seq interface{}) (interface{}, err
 	}
 
 	if limitv < 0 {
-		return nil, errors.New("can't return negative count of items from sequence")
+		return nil, errors.New("sequence length must be non-negative")
 	}
 
 	seqv := reflect.ValueOf(seq)
@@ -379,7 +379,7 @@ func (ns *Namespace) Last(limit interface{}, seq interface{}) (interface{}, erro
 	}
 
 	if limitv < 0 {
-		return nil, errors.New("can't return negative/empty count of items from sequence")
+		return nil, errors.New("sequence length must be non-negative")
 	}
 
 	seqv := reflect.ValueOf(seq)