fix: small issue in sorting by file location

norwoodj · Oct 6, 2020 · 3dd414c · 3dd414c
1 parent 4b2522d
commit 3dd414c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/pkg/document/model.go b/pkg/document/model.go
@@ -56,13 +56,11 @@ func getChartTemplateData(chartDocumentationInfo helm.ChartDocumentationInfo, he
 	sortOrder := viper.GetString("sort-values-order")
 	if sortOrder == FileSortOrder {
 		sort.Slice(valuesTableRows, func(i, j int) bool {
-			if valuesTableRows[i].LineNumber < valuesTableRows[j].LineNumber {
-				return true
-			} else if valuesTableRows[i].Column < valuesTableRows[j].Column {
-				return true
+			if valuesTableRows[i].LineNumber == valuesTableRows[j].LineNumber {
+				return valuesTableRows[i].Column < valuesTableRows[j].Column
 			}
 
-			return false
+			return valuesTableRows[i].LineNumber < valuesTableRows[i].LineNumber
 		})
 	} else if sortOrder == AlphaNumSortOrder {
 		sort.Slice(valuesTableRows, func(i, j int) bool {

diff --git a/pkg/helm/chart_info.go b/pkg/helm/chart_info.go
@@ -49,7 +49,6 @@ type ChartRequirements struct {
 }
 
 type ChartValueDescription struct {
-	Order       int
 	Description string
 	Default     string
 }