From 43c6d13c33f2dc314d2b7f13ed1ca8616be93db6 Mon Sep 17 00:00:00 2001
From: Charlie Vieth <charlie.vieth@gmail.com>
Date: Wed, 15 May 2019 19:35:07 -0400
Subject: [PATCH] Refactor templateSpec less method (#5840)

---
 internal/templating/template.go      | 17 ++++++-----------
 internal/templating/template_test.go | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 internal/templating/template_test.go

diff --git a/internal/templating/template.go b/internal/templating/template.go
index 472bd2686..235d2f2a5 100644
--- a/internal/templating/template.go
+++ b/internal/templating/template.go
@@ -124,21 +124,16 @@ type templateSpecs []templateSpec
 // Less reports whether the element with
 // index j should sort before the element with index k.
 func (e templateSpecs) Less(j, k int) bool {
-	if len(e[j].filter) == 0 && len(e[k].filter) == 0 {
-		jlength := len(strings.Split(e[j].template, e[j].separator))
-		klength := len(strings.Split(e[k].template, e[k].separator))
-		return jlength < klength
-	}
-	if len(e[j].filter) == 0 {
+	jlen := len(e[j].filter)
+	klen := len(e[k].filter)
+	if jlen == 0 && klen != 0 {
 		return true
 	}
-	if len(e[k].filter) == 0 {
+	if klen == 0 && jlen != 0 {
 		return false
 	}
-
-	jlength := len(strings.Split(e[j].template, e[j].separator))
-	klength := len(strings.Split(e[k].template, e[k].separator))
-	return jlength < klength
+	return strings.Count(e[j].template, e[j].separator) <
+		strings.Count(e[k].template, e[k].separator)
 }
 
 // Swap swaps the elements with indexes i and j.
diff --git a/internal/templating/template_test.go b/internal/templating/template_test.go
new file mode 100644
index 000000000..0a1aae5bc
--- /dev/null
+++ b/internal/templating/template_test.go
@@ -0,0 +1,14 @@
+package templating
+
+import "testing"
+
+func BenchmarkTemplateLess(b *testing.B) {
+	a := templateSpec{
+		template:  "aa|bb|cc|dd|ee|ff",
+		separator: "|",
+	}
+	specs := templateSpecs{a, a}
+	for i := 0; i < b.N; i++ {
+		specs.Less(0, 1)
+	}
+}