fix comment before import blocks

Signed-off-by: Loong <long0dai@foxmail.com>
daixiang0 · Mar 6, 2023 · dbd47a5 · dbd47a5
1 parent 4b78992
commit dbd47a5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/pkg/gci/gci.go b/pkg/gci/gci.go
@@ -146,7 +146,7 @@ func LoadFormatGoFile(file io.FileObj, cfg config.Config) (src, dist []byte, err
 	// order by section list
 	for _, s := range cfg.Sections {
 		if len(result[s.String()]) > 0 {
-			if body != nil && len(body) > 0 {
+			if len(body) > 0 {
 				body = append(body, utils.Linebreak)
 			}
 			for _, d := range result[s.String()] {
@@ -161,7 +161,6 @@ func LoadFormatGoFile(file io.FileObj, cfg config.Config) (src, dist []byte, err
 	tail := make([]byte, len(src)-tailStart)
 	copy(tail, src[tailStart:])
 
-	head = append(head, utils.Linebreak)
 	// ensure C
 	if cStart != 0 {
 		head = append(head, src[cStart:cEnd]...)

diff --git a/pkg/gci/internal/testdata/comment-before-import.cfg.yaml b/pkg/gci/internal/testdata/comment-before-import.cfg.yaml
@@ -0,0 +1 @@
+common.cfg.yaml
diff --git a/pkg/gci/internal/testdata/comment-before-import.in.go b/pkg/gci/internal/testdata/comment-before-import.in.go
@@ -0,0 +1,9 @@
+package main
+
+// comment
+import (
+	"fmt"
+	"os"
+
+	"github.com/daixiang0/gci"
+)
diff --git a/pkg/gci/internal/testdata/comment-before-import.out.go b/pkg/gci/internal/testdata/comment-before-import.out.go
@@ -0,0 +1,9 @@
+package main
+
+// comment
+import (
+	"fmt"
+	"os"
+
+	"github.com/daixiang0/gci"
+)