Skip to content

Commit

Permalink
fix same custom sections (#77)
Browse files Browse the repository at this point in the history
Signed-off-by: Loong Dai <loong.dai@intel.com>
  • Loading branch information
daixiang0 authored Jul 14, 2022
1 parent c0bd0a2 commit cb206ae
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/gci/gci.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/gci/internal/testdata/mutliple-custom.cfg.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
sections:
- Standard
- Default
- Prefix(github.com/daixiang0)
- Prefix(github.com/daixiang0/gci)
- Prefix(github.com/daixiang0/gci/subtest)
10 changes: 10 additions & 0 deletions pkg/gci/internal/testdata/mutliple-custom.in.go
Original file line number Diff line number Diff line change
@@ -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"
)
12 changes: 12 additions & 0 deletions pkg/gci/internal/testdata/mutliple-custom.out.go
Original file line number Diff line number Diff line change
@@ -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"
)
5 changes: 5 additions & 0 deletions pkg/gci/internal/testdata/same-prefix-custom.cfg.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
sections:
- Standard
- Default
- Prefix(github.com/daixiang0/gci)
- Prefix(github.com/daixiang0/gci/subtest)
9 changes: 9 additions & 0 deletions pkg/gci/internal/testdata/same-prefix-custom.in.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package main
import (
"fmt"

g "github.com/golang"

"github.com/daixiang0/gci"
"github.com/daixiang0/gci/subtest"
)
10 changes: 10 additions & 0 deletions pkg/gci/internal/testdata/same-prefix-custom.out.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package main
import (
"fmt"

g "github.com/golang"

"github.com/daixiang0/gci"

"github.com/daixiang0/gci/subtest"
)

0 comments on commit cb206ae

Please sign in to comment.