support format blank (#108)

Signed-off-by: Loong <loong.dai@intel.com>
daixiang0 · Sep 1, 2022 · edf2fd9 · edf2fd9
1 parent 4606d17
commit edf2fd9
Show file tree

Hide file tree

Showing 34 changed files with 56 additions and 7 deletions.
diff --git a/pkg/gci/gci.go b/pkg/gci/gci.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	goFormat "go/format"
 	"os"
 	"sync"
 
@@ -172,11 +173,6 @@ func LoadFormatGoFile(file io.FileObj, cfg config.Config) (src, dist []byte, err
 		}
 	}
 
-	// remove breakline in the end
-	for body[len(body)-1] == utils.Linebreak {
-		body = body[:len(body)-1]
-	}
-
 	if tail[0] != utils.Linebreak {
 		body = append(body, utils.Linebreak)
 	}
@@ -192,6 +188,11 @@ func LoadFormatGoFile(file io.FileObj, cfg config.Config) (src, dist []byte, err
 		i += copy(dist[i:], s)
 	}
 
+	dist, err = goFormat.Source(dist)
+	if err != nil {
+		return nil, nil, err
+	}
+
 	return src, dist, nil
 }
 

diff --git a/pkg/gci/internal/testdata/already-good.in.go b/pkg/gci/internal/testdata/already-good.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/already-good.out.go b/pkg/gci/internal/testdata/already-good.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/blank-format.cfg.yaml b/pkg/gci/internal/testdata/blank-format.cfg.yaml
@@ -0,0 +1 @@
+common.cfg.yaml
diff --git a/pkg/gci/internal/testdata/blank-format.in.go b/pkg/gci/internal/testdata/blank-format.in.go
@@ -0,0 +1,9 @@
+package main
+import (
+	"fmt"
+
+  // comment
+	g  "github.com/golang"    // comment
+
+	"github.com/daixiang0/gci"
+)
diff --git a/pkg/gci/internal/testdata/blank-format.out.go b/pkg/gci/internal/testdata/blank-format.out.go
@@ -0,0 +1,10 @@
+package main
+
+import (
+	"fmt"
+
+	// comment
+	g "github.com/golang" // comment
+
+	"github.com/daixiang0/gci"
+)
diff --git a/pkg/gci/internal/testdata/comment-in-the-tail.in.go b/pkg/gci/internal/testdata/comment-in-the-tail.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 
@@ -7,7 +8,6 @@ import (
 	"github.com/daixiang0/gci"
 )
 
-
 type test int
 
 // test
diff --git a/pkg/gci/internal/testdata/comment-in-the-tail.out.go b/pkg/gci/internal/testdata/comment-in-the-tail.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 
@@ -7,7 +8,6 @@ import (
 	"github.com/daixiang0/gci"
 )
 
-
 type test int
 
 // test
diff --git a/pkg/gci/internal/testdata/custom-order.in.go b/pkg/gci/internal/testdata/custom-order.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/custom-order.out.go b/pkg/gci/internal/testdata/custom-order.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"github.com/daixiang0/a"
 

diff --git a/pkg/gci/internal/testdata/default-order.in.go b/pkg/gci/internal/testdata/default-order.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/default-order.out.go b/pkg/gci/internal/testdata/default-order.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/dot-and-blank.in.go b/pkg/gci/internal/testdata/dot-and-blank.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/dot-and-blank.out.go b/pkg/gci/internal/testdata/dot-and-blank.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/duplicate-imports.in.go b/pkg/gci/internal/testdata/duplicate-imports.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/duplicate-imports.out.go b/pkg/gci/internal/testdata/duplicate-imports.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/linebreak-no-custom.in.go b/pkg/gci/internal/testdata/linebreak-no-custom.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	g "github.com/golang"
 

diff --git a/pkg/gci/internal/testdata/linebreak-no-custom.out.go b/pkg/gci/internal/testdata/linebreak-no-custom.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/linebreak.in.go b/pkg/gci/internal/testdata/linebreak.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	g "github.com/golang"
 

diff --git a/pkg/gci/internal/testdata/linebreak.out.go b/pkg/gci/internal/testdata/linebreak.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/mismatch-section.in.go b/pkg/gci/internal/testdata/mismatch-section.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/mismatch-section.out.go b/pkg/gci/internal/testdata/mismatch-section.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/multiple-custom.in.go b/pkg/gci/internal/testdata/multiple-custom.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/multiple-custom.out.go b/pkg/gci/internal/testdata/multiple-custom.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/number-in-alias.in.go b/pkg/gci/internal/testdata/number-in-alias.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/number-in-alias.out.go b/pkg/gci/internal/testdata/number-in-alias.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/same-prefix-custom.in.go b/pkg/gci/internal/testdata/same-prefix-custom.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/same-prefix-custom.out.go b/pkg/gci/internal/testdata/same-prefix-custom.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/simple-case.in.go b/pkg/gci/internal/testdata/simple-case.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"golang.org/x/tools"
 

diff --git a/pkg/gci/internal/testdata/simple-case.out.go b/pkg/gci/internal/testdata/simple-case.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/with-above-comment-and-alias.in.go b/pkg/gci/internal/testdata/with-above-comment-and-alias.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 	// golang

diff --git a/pkg/gci/internal/testdata/with-above-comment-and-alias.out.go b/pkg/gci/internal/testdata/with-above-comment-and-alias.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 

diff --git a/pkg/gci/internal/testdata/with-comment-and-alias.in.go b/pkg/gci/internal/testdata/with-comment-and-alias.in.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"
 	_ "github.com/golang" // golang

diff --git a/pkg/gci/internal/testdata/with-comment-and-alias.out.go b/pkg/gci/internal/testdata/with-comment-and-alias.out.go
@@ -1,4 +1,5 @@
 package main
+
 import (
 	"fmt"