fix ^M (#168)

Signed-off-by: Loong <long0dai@foxmail.com>
daixiang0 · Sep 6, 2023 · 50cd6b7 · 50cd6b7
1 parent 52e43a4
commit 50cd6b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/gci/gci.go b/pkg/gci/gci.go
@@ -201,6 +201,10 @@ func LoadFormatGoFile(file io.FileObj, cfg config.Config) (src, dist []byte, err
 	for _, s := range slices {
 		i += copy(dist[i:], s)
 	}
+
+	// remove ^M(\r\n) from Win to Unix
+	dist = bytes.ReplaceAll(dist, []byte{utils.WinLinebreak}, []byte{utils.Linebreak})
+
 	log.L().Debug(fmt.Sprintf("raw:\n%s", dist))
 	dist, err = goFormat.Source(dist)
 	if err != nil {

diff --git a/pkg/utils/constants.go b/pkg/utils/constants.go
@@ -1,8 +1,9 @@
 package utils
 
 const (
-	Indent    = '\t'
-	Linebreak = '\n'
+	Indent       = '\t'
+	Linebreak    = '\n'
+	WinLinebreak = '\r'
 
 	Colon = ":"