fix same custom sections (#77)

Signed-off-by: Loong Dai <[email protected]>

Author: daixiang0

pkg/gci/gci.go

@@ -174,13 +174,13 @@ func LoadFormatGoFile(file io.FileObj, cfg config.Config) (src, dist []byte, err
 	}
 
 	if len(customKeys) > 0 {
-		sort.Sort(sort.Reverse(sort.StringSlice(customKeys)))
-		for _, k := range customKeys {
+		sort.Sort(sort.StringSlice(customKeys))
+		for i, k := range customKeys {
 			for _, d := range result[k] {
 				AddIndent(&body, &firstWithIndex)
 				body = append(body, src[d.Start:d.End]...)
 			}
-			if body[len(body)-1] != utils.Linebreak {
+			if i+1 < len(customKeys) {
 				body = append(body, utils.Linebreak)
 			}
 		}

pkg/gci/internal/testdata/mutliple-custom.cfg.yaml

@@ -0,0 +1,6 @@
+sections:
+  - Standard
+  - Default
+  - Prefix(github.com/daixiang0)
+  - Prefix(github.com/daixiang0/gci)
+  - Prefix(github.com/daixiang0/gci/subtest)

pkg/gci/internal/testdata/mutliple-custom.in.go

@@ -0,0 +1,10 @@
+package main
+import (
+	"fmt"
+
+	g "github.com/golang"
+
+	"github.com/daixiang0/a"
+	"github.com/daixiang0/gci"
+	"github.com/daixiang0/gci/subtest"
+)

pkg/gci/internal/testdata/mutliple-custom.out.go

@@ -0,0 +1,12 @@
+package main
+import (
+	"fmt"
+
+	g "github.com/golang"
+
+	"github.com/daixiang0/a"
+
+	"github.com/daixiang0/gci"
+
+	"github.com/daixiang0/gci/subtest"
+)

pkg/gci/internal/testdata/same-prefix-custom.cfg.yaml

@@ -0,0 +1,5 @@
+sections:
+  - Standard
+  - Default
+  - Prefix(github.com/daixiang0/gci)
+  - Prefix(github.com/daixiang0/gci/subtest)

pkg/gci/internal/testdata/same-prefix-custom.in.go

@@ -0,0 +1,9 @@
+package main
+import (
+	"fmt"
+
+	g "github.com/golang"
+
+	"github.com/daixiang0/gci"
+	"github.com/daixiang0/gci/subtest"
+)

pkg/gci/internal/testdata/same-prefix-custom.out.go

@@ -0,0 +1,10 @@
+package main
+import (
+	"fmt"
+
+	g "github.com/golang"
+
+	"github.com/daixiang0/gci"
+
+	"github.com/daixiang0/gci/subtest"
+)