From 0c5154c085db547929a32e3f7c9d63aa54119aaf Mon Sep 17 00:00:00 2001 From: Loong Date: Mon, 18 Sep 2023 12:59:11 +0800 Subject: [PATCH 1/2] fix blank in the config and convert test data as string Signed-off-by: Loong --- pkg/config/config.go | 12 +- pkg/config/config_test.go | 22 - pkg/gci/gci.go | 8 +- pkg/gci/gci_test.go | 90 +- pkg/gci/internal/skipTest/generated_code.go | 14 - .../internal/skipTest/import-unclosed.testgo | 8 - pkg/gci/internal/skipTest/no-import.testgo | 4 - pkg/gci/internal/skipTest/valid.testgo | 8 - .../internal/testdata/already-good.cfg.yaml | 1 - pkg/gci/internal/testdata/already-good.in.go | 9 - pkg/gci/internal/testdata/already-good.out.go | 9 - .../internal/testdata/blank-format.cfg.yaml | 1 - pkg/gci/internal/testdata/blank-format.in.go | 9 - pkg/gci/internal/testdata/blank-format.out.go | 10 - .../testdata/cgo-block-after-import.cfg.yaml | 1 - .../testdata/cgo-block-after-import.in.go | 14 - .../testdata/cgo-block-after-import.out.go | 15 - .../testdata/cgo-block-before-import.cfg.yaml | 1 - .../testdata/cgo-block-before-import.in.go | 15 - .../testdata/cgo-block-before-import.out.go | 15 - .../cgo-block-mixed-with-content.cfg.yaml | 1 - .../cgo-block-mixed-with-content.in.go | 6 - .../cgo-block-mixed-with-content.out.go | 6 - .../testdata/cgo-block-mixed.cfg.yaml | 1 - .../internal/testdata/cgo-block-mixed.in.go | 6 - .../internal/testdata/cgo-block-mixed.out.go | 6 - .../testdata/cgo-block-prefix.cfg.yaml | 1 - .../internal/testdata/cgo-block-prefix.in.go | 5 - .../internal/testdata/cgo-block-prefix.out.go | 5 - .../testdata/cgo-block-single-line.cfg.yaml | 1 - .../testdata/cgo-block-single-line.in.go | 6 - .../testdata/cgo-block-single-line.out.go | 6 - pkg/gci/internal/testdata/cgo-block.cfg.yaml | 1 - pkg/gci/internal/testdata/cgo-block.in.go | 8 - pkg/gci/internal/testdata/cgo-block.out.go | 8 - pkg/gci/internal/testdata/cgo-line.cfg.yaml | 1 - pkg/gci/internal/testdata/cgo-line.in.go | 6 - pkg/gci/internal/testdata/cgo-line.out.go | 6 - .../internal/testdata/cgo-multiline.cfg.yaml | 1 - pkg/gci/internal/testdata/cgo-multiline.in.go | 7 - .../internal/testdata/cgo-multiline.out.go | 7 - pkg/gci/internal/testdata/cgo-single.cfg.yaml | 1 - pkg/gci/internal/testdata/cgo-single.in.go | 15 - pkg/gci/internal/testdata/cgo-single.out.go | 11 - .../testdata/comment-before-import.cfg.yaml | 1 - .../testdata/comment-before-import.in.go | 9 - .../testdata/comment-before-import.out.go | 9 - .../testdata/comment-in-the-tail.cfg.yaml | 4 - .../testdata/comment-in-the-tail.in.go | 13 - .../testdata/comment-in-the-tail.out.go | 13 - .../internal/testdata/comment-top.cfg.yaml | 1 - pkg/gci/internal/testdata/comment-top.in.go | 7 - pkg/gci/internal/testdata/comment-top.out.go | 7 - .../comment-whithout-whitespace.cfg.yaml | 1 - .../comment-whithout-whitespace.in.go | 5 - .../comment-whithout-whitespace.out.go | 5 - .../testdata/comment-with-slashslash.cfg.yaml | 1 - .../testdata/comment-with-slashslash.in.go | 5 - .../testdata/comment-with-slashslash.out.go | 5 - pkg/gci/internal/testdata/comment.cfg.yaml | 1 - pkg/gci/internal/testdata/comment.in.go | 5 - pkg/gci/internal/testdata/comment.out.go | 5 - pkg/gci/internal/testdata/common.cfg.yaml | 4 - pkg/gci/internal/testdata/configTest.cfg.yaml | 3 - .../internal/testdata/custom-order.cfg.yaml | 5 - pkg/gci/internal/testdata/custom-order.in.go | 9 - pkg/gci/internal/testdata/custom-order.out.go | 9 - .../internal/testdata/default-order.cfg.yaml | 4 - pkg/gci/internal/testdata/default-order.in.go | 9 - .../internal/testdata/default-order.out.go | 9 - .../internal/testdata/defaultValues.cfg.yaml | 0 .../internal/testdata/dot-and-blank.cfg.yaml | 6 - pkg/gci/internal/testdata/dot-and-blank.in.go | 15 - .../internal/testdata/dot-and-blank.out.go | 17 - .../testdata/duplicate-imports.cfg.yaml | 4 - .../internal/testdata/duplicate-imports.in.go | 10 - .../testdata/duplicate-imports.out.go | 10 - .../testdata/grouped-multiple-custom.cfg.yaml | 4 - .../testdata/grouped-multiple-custom.in.go | 10 - .../testdata/grouped-multiple-custom.out.go | 12 - .../testdata/leading-comment.cfg.yaml | 1 - .../internal/testdata/leading-comment.in.go | 6 - .../internal/testdata/leading-comment.out.go | 6 - .../testdata/linebreak-no-custom.cfg.yaml | 4 - .../testdata/linebreak-no-custom.in.go | 8 - .../testdata/linebreak-no-custom.out.go | 7 - pkg/gci/internal/testdata/linebreak.cfg.yaml | 4 - pkg/gci/internal/testdata/linebreak.in.go | 10 - pkg/gci/internal/testdata/linebreak.out.go | 9 - .../testdata/mismatch-section.cfg.yaml | 5 - .../internal/testdata/mismatch-section.in.go | 9 - .../internal/testdata/mismatch-section.out.go | 9 - .../testdata/multiple-custom.cfg.yaml | 6 - .../internal/testdata/multiple-custom.in.go | 11 - .../internal/testdata/multiple-custom.out.go | 13 - .../testdata/multiple-imports.cfg.yaml | 1 - .../internal/testdata/multiple-imports.in.go | 18 - .../internal/testdata/multiple-imports.out.go | 14 - .../testdata/multiple-line-comment.cfg.yaml | 1 - .../testdata/multiple-line-comment.in.go | 15 - .../testdata/multiple-line-comment.out.go | 14 - pkg/gci/internal/testdata/no-format.cfg.yaml | 1 - pkg/gci/internal/testdata/no-format.in.go | 9 - pkg/gci/internal/testdata/no-format.out.go | 9 - .../testdata/nochar-after-import.cfg.yaml | 1 - .../testdata/nochar-after-import.in.go | 5 - .../testdata/nochar-after-import.out.go | 5 - pkg/gci/internal/testdata/nolint.cfg.yaml | 1 - pkg/gci/internal/testdata/nolint.in.go | 9 - pkg/gci/internal/testdata/nolint.out.go | 9 - pkg/gci/internal/testdata/not.a.go.file | 0 .../testdata/number-in-alias.cfg.yaml | 1 - .../internal/testdata/number-in-alias.in.go | 9 - .../internal/testdata/number-in-alias.out.go | 9 - .../testdata/one-import-one-line.cfg.yaml | 1 - .../testdata/one-import-one-line.in.go | 6 - .../testdata/one-import-one-line.out.go | 6 - pkg/gci/internal/testdata/one-import.cfg.yaml | 1 - pkg/gci/internal/testdata/one-import.in.go | 7 - pkg/gci/internal/testdata/one-import.out.go | 7 - .../one-line-import-after-import.cfg.yaml | 4 - .../one-line-import-after-import.in.go | 10 - .../one-line-import-after-import.out.go | 9 - .../testdata/same-prefix-custom.cfg.yaml | 5 - .../testdata/same-prefix-custom.in.go | 10 - .../testdata/same-prefix-custom.out.go | 11 - .../internal/testdata/simple-case.cfg.yaml | 1 - pkg/gci/internal/testdata/simple-case.in.go | 9 - pkg/gci/internal/testdata/simple-case.out.go | 9 - .../testdata/whitespace-test.cfg.yaml | 1 - .../internal/testdata/whitespace-test.in.go | 7 - .../internal/testdata/whitespace-test.out.go | 9 - .../with-above-comment-and-alias.cfg.yaml | 1 - .../with-above-comment-and-alias.in.go | 8 - .../with-above-comment-and-alias.out.go | 10 - .../testdata/with-comment-and-alias.cfg.yaml | 1 - .../testdata/with-comment-and-alias.in.go | 7 - .../testdata/with-comment-and-alias.out.go | 9 - pkg/gci/testdata.go | 1200 +++++++++++++++++ pkg/section/prefix.go | 1 + 140 files changed, 1224 insertions(+), 990 deletions(-) delete mode 100644 pkg/gci/internal/skipTest/generated_code.go delete mode 100644 pkg/gci/internal/skipTest/import-unclosed.testgo delete mode 100644 pkg/gci/internal/skipTest/no-import.testgo delete mode 100644 pkg/gci/internal/skipTest/valid.testgo delete mode 120000 pkg/gci/internal/testdata/already-good.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/already-good.in.go delete mode 100644 pkg/gci/internal/testdata/already-good.out.go delete mode 120000 pkg/gci/internal/testdata/blank-format.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/blank-format.in.go delete mode 100644 pkg/gci/internal/testdata/blank-format.out.go delete mode 120000 pkg/gci/internal/testdata/cgo-block-after-import.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/cgo-block-after-import.in.go delete mode 100644 pkg/gci/internal/testdata/cgo-block-after-import.out.go delete mode 120000 pkg/gci/internal/testdata/cgo-block-before-import.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/cgo-block-before-import.in.go delete mode 100644 pkg/gci/internal/testdata/cgo-block-before-import.out.go delete mode 120000 pkg/gci/internal/testdata/cgo-block-mixed-with-content.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/cgo-block-mixed-with-content.in.go delete mode 100644 pkg/gci/internal/testdata/cgo-block-mixed-with-content.out.go delete mode 120000 pkg/gci/internal/testdata/cgo-block-mixed.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/cgo-block-mixed.in.go delete mode 100644 pkg/gci/internal/testdata/cgo-block-mixed.out.go delete mode 120000 pkg/gci/internal/testdata/cgo-block-prefix.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/cgo-block-prefix.in.go delete mode 100644 pkg/gci/internal/testdata/cgo-block-prefix.out.go delete mode 120000 pkg/gci/internal/testdata/cgo-block-single-line.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/cgo-block-single-line.in.go delete mode 100644 pkg/gci/internal/testdata/cgo-block-single-line.out.go delete mode 120000 pkg/gci/internal/testdata/cgo-block.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/cgo-block.in.go delete mode 100644 pkg/gci/internal/testdata/cgo-block.out.go delete mode 120000 pkg/gci/internal/testdata/cgo-line.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/cgo-line.in.go delete mode 100644 pkg/gci/internal/testdata/cgo-line.out.go delete mode 120000 pkg/gci/internal/testdata/cgo-multiline.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/cgo-multiline.in.go delete mode 100644 pkg/gci/internal/testdata/cgo-multiline.out.go delete mode 120000 pkg/gci/internal/testdata/cgo-single.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/cgo-single.in.go delete mode 100644 pkg/gci/internal/testdata/cgo-single.out.go delete mode 120000 pkg/gci/internal/testdata/comment-before-import.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/comment-before-import.in.go delete mode 100644 pkg/gci/internal/testdata/comment-before-import.out.go delete mode 100644 pkg/gci/internal/testdata/comment-in-the-tail.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/comment-in-the-tail.in.go delete mode 100644 pkg/gci/internal/testdata/comment-in-the-tail.out.go delete mode 120000 pkg/gci/internal/testdata/comment-top.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/comment-top.in.go delete mode 100644 pkg/gci/internal/testdata/comment-top.out.go delete mode 120000 pkg/gci/internal/testdata/comment-whithout-whitespace.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/comment-whithout-whitespace.in.go delete mode 100644 pkg/gci/internal/testdata/comment-whithout-whitespace.out.go delete mode 120000 pkg/gci/internal/testdata/comment-with-slashslash.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/comment-with-slashslash.in.go delete mode 100644 pkg/gci/internal/testdata/comment-with-slashslash.out.go delete mode 120000 pkg/gci/internal/testdata/comment.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/comment.in.go delete mode 100644 pkg/gci/internal/testdata/comment.out.go delete mode 100644 pkg/gci/internal/testdata/common.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/configTest.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/custom-order.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/custom-order.in.go delete mode 100644 pkg/gci/internal/testdata/custom-order.out.go delete mode 100644 pkg/gci/internal/testdata/default-order.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/default-order.in.go delete mode 100644 pkg/gci/internal/testdata/default-order.out.go delete mode 100644 pkg/gci/internal/testdata/defaultValues.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/dot-and-blank.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/dot-and-blank.in.go delete mode 100644 pkg/gci/internal/testdata/dot-and-blank.out.go delete mode 100644 pkg/gci/internal/testdata/duplicate-imports.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/duplicate-imports.in.go delete mode 100644 pkg/gci/internal/testdata/duplicate-imports.out.go delete mode 100644 pkg/gci/internal/testdata/grouped-multiple-custom.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/grouped-multiple-custom.in.go delete mode 100644 pkg/gci/internal/testdata/grouped-multiple-custom.out.go delete mode 120000 pkg/gci/internal/testdata/leading-comment.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/leading-comment.in.go delete mode 100644 pkg/gci/internal/testdata/leading-comment.out.go delete mode 100644 pkg/gci/internal/testdata/linebreak-no-custom.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/linebreak-no-custom.in.go delete mode 100644 pkg/gci/internal/testdata/linebreak-no-custom.out.go delete mode 100644 pkg/gci/internal/testdata/linebreak.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/linebreak.in.go delete mode 100644 pkg/gci/internal/testdata/linebreak.out.go delete mode 100644 pkg/gci/internal/testdata/mismatch-section.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/mismatch-section.in.go delete mode 100644 pkg/gci/internal/testdata/mismatch-section.out.go delete mode 100644 pkg/gci/internal/testdata/multiple-custom.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/multiple-custom.in.go delete mode 100644 pkg/gci/internal/testdata/multiple-custom.out.go delete mode 120000 pkg/gci/internal/testdata/multiple-imports.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/multiple-imports.in.go delete mode 100644 pkg/gci/internal/testdata/multiple-imports.out.go delete mode 120000 pkg/gci/internal/testdata/multiple-line-comment.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/multiple-line-comment.in.go delete mode 100644 pkg/gci/internal/testdata/multiple-line-comment.out.go delete mode 120000 pkg/gci/internal/testdata/no-format.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/no-format.in.go delete mode 100644 pkg/gci/internal/testdata/no-format.out.go delete mode 120000 pkg/gci/internal/testdata/nochar-after-import.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/nochar-after-import.in.go delete mode 100644 pkg/gci/internal/testdata/nochar-after-import.out.go delete mode 120000 pkg/gci/internal/testdata/nolint.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/nolint.in.go delete mode 100644 pkg/gci/internal/testdata/nolint.out.go delete mode 100644 pkg/gci/internal/testdata/not.a.go.file delete mode 120000 pkg/gci/internal/testdata/number-in-alias.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/number-in-alias.in.go delete mode 100644 pkg/gci/internal/testdata/number-in-alias.out.go delete mode 120000 pkg/gci/internal/testdata/one-import-one-line.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/one-import-one-line.in.go delete mode 100644 pkg/gci/internal/testdata/one-import-one-line.out.go delete mode 120000 pkg/gci/internal/testdata/one-import.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/one-import.in.go delete mode 100644 pkg/gci/internal/testdata/one-import.out.go delete mode 100644 pkg/gci/internal/testdata/one-line-import-after-import.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/one-line-import-after-import.in.go delete mode 100644 pkg/gci/internal/testdata/one-line-import-after-import.out.go delete mode 100644 pkg/gci/internal/testdata/same-prefix-custom.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/same-prefix-custom.in.go delete mode 100644 pkg/gci/internal/testdata/same-prefix-custom.out.go delete mode 120000 pkg/gci/internal/testdata/simple-case.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/simple-case.in.go delete mode 100644 pkg/gci/internal/testdata/simple-case.out.go delete mode 120000 pkg/gci/internal/testdata/whitespace-test.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/whitespace-test.in.go delete mode 100644 pkg/gci/internal/testdata/whitespace-test.out.go delete mode 120000 pkg/gci/internal/testdata/with-above-comment-and-alias.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/with-above-comment-and-alias.in.go delete mode 100644 pkg/gci/internal/testdata/with-above-comment-and-alias.out.go delete mode 120000 pkg/gci/internal/testdata/with-comment-and-alias.cfg.yaml delete mode 100644 pkg/gci/internal/testdata/with-comment-and-alias.in.go delete mode 100644 pkg/gci/internal/testdata/with-comment-and-alias.out.go create mode 100644 pkg/gci/testdata.go diff --git a/pkg/config/config.go b/pkg/config/config.go index 120e787..98513c0 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -1,7 +1,6 @@ package config import ( - "io/ioutil" "sort" "strings" @@ -73,19 +72,18 @@ func (g YamlConfig) Parse() (*Config, error) { return &Config{g.Cfg, sections, sectionSeparators}, nil } -func InitializeGciConfigFromYAML(filePath string) (*Config, error) { +func ParseConfig(in string) (*Config, error) { config := YamlConfig{} - yamlData, err := ioutil.ReadFile(filePath) - if err != nil { - return nil, err - } - err = yaml.Unmarshal(yamlData, &config) + + err := yaml.Unmarshal([]byte(in), &config) if err != nil { return nil, err } + gciCfg, err := config.Parse() if err != nil { return nil, err } + return gciCfg, nil } diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 46de31c..7a29949 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -1,7 +1,6 @@ package config import ( - "path" "testing" "github.com/stretchr/testify/assert" @@ -9,27 +8,6 @@ import ( "github.com/daixiang0/gci/pkg/section" ) -var testFilesPath = "../gci/internal/testdata" - -func TestInitGciConfigFromEmptyYAML(t *testing.T) { - gciCfg, err := InitializeGciConfigFromYAML(path.Join(testFilesPath, "defaultValues.cfg.yaml")) - assert.NoError(t, err) - assert.Equal(t, section.DefaultSections(), gciCfg.Sections) - assert.Equal(t, section.DefaultSectionSeparators(), gciCfg.SectionSeparators) - assert.False(t, gciCfg.Debug) - assert.False(t, gciCfg.NoInlineComments) - assert.False(t, gciCfg.NoPrefixComments) -} - -func TestInitGciConfigFromYAML(t *testing.T) { - gciCfg, err := InitializeGciConfigFromYAML(path.Join(testFilesPath, "configTest.cfg.yaml")) - assert.NoError(t, err) - assert.Equal(t, section.SectionList{section.Default{}}, gciCfg.Sections) - assert.False(t, gciCfg.Debug) - assert.True(t, gciCfg.SkipGenerated) - assert.False(t, gciCfg.CustomOrder) -} - // the custom sections sort alphabetically as default. func TestParseOrder(t *testing.T) { cfg := YamlConfig{ diff --git a/pkg/gci/gci.go b/pkg/gci/gci.go index fcef6c4..163e95a 100644 --- a/pkg/gci/gci.go +++ b/pkg/gci/gci.go @@ -127,11 +127,17 @@ func LoadFormatGoFile(file io.FileObj, cfg config.Config) (src, dist []byte, err return nil, nil, err } + return LoadFormat(src, file.Path(), cfg) +} + +func LoadFormat(in []byte, path string, cfg config.Config) (src, dist []byte, err error) { + src = in + if cfg.SkipGenerated && parse.IsGeneratedFileByComment(string(src)) { return src, src, nil } - imports, headEnd, tailStart, cStart, cEnd, err := parse.ParseFile(src, file.Path()) + imports, headEnd, tailStart, cStart, cEnd, err := parse.ParseFile(src, path) if err != nil { if errors.Is(err, parse.NoImportError{}) { return src, src, nil diff --git a/pkg/gci/gci_test.go b/pkg/gci/gci_test.go index 608cdb0..90559e8 100644 --- a/pkg/gci/gci_test.go +++ b/pkg/gci/gci_test.go @@ -1,16 +1,12 @@ package gci import ( - "os" - "runtime" - "strings" + "fmt" "testing" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "github.com/daixiang0/gci/pkg/config" - "github.com/daixiang0/gci/pkg/io" "github.com/daixiang0/gci/pkg/log" ) @@ -19,91 +15,27 @@ func init() { defer log.L().Sync() } -var testFilesPath = "internal/testdata" - -func isTestInputFile(_ string, file os.FileInfo) bool { - return !file.IsDir() && strings.HasSuffix(file.Name(), ".in.go") -} - func TestRun(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("Skipping test on Windows") - } - - testFiles, err := io.FindFilesForPath(testFilesPath, isTestInputFile) - if err != nil { - t.Fatal(err) - } - for _, testFile := range testFiles { - fileBaseName := strings.TrimSuffix(testFile, ".in.go") - t.Run("pkg/gci/"+testFile, func(t *testing.T) { - t.Parallel() + // if runtime.GOOS == "windows" { + // t.Skip("Skipping test on Windows") + // } - gciCfg, err := config.InitializeGciConfigFromYAML(fileBaseName + ".cfg.yaml") + for i := range testCases { + t.Run(fmt.Sprintf("run case: %s", testCases[i].name), func(t *testing.T) { + config, err := config.ParseConfig(testCases[i].config) if err != nil { t.Fatal(err) } - inputSrcFile := io.File{FilePath: fileBaseName + ".in.go"} - inputSrc, err := inputSrcFile.Load() - require.NoError(t, err) - - unmodifiedFile, formattedFile, err := LoadFormatGoFile(inputSrcFile, *gciCfg) + old, new, err := LoadFormat([]byte(testCases[i].in), "", *config) if err != nil { t.Fatal(err) } - assert.Equal(t, inputSrc, unmodifiedFile) - expectedOutput, err := os.ReadFile(fileBaseName + ".out.go") - if err != nil { - t.Fatal(err) - } - assert.Equal(t, string(expectedOutput), string(formattedFile), "output") assert.NoError(t, err) + assert.Equal(t, testCases[i].in, string(old)) + assert.Equal(t, testCases[i].out, string(new)) }) } -} - -// func TestSkippingOverIncorrectlyFormattedFiles(t *testing.T) { -// cfg, err := config.YamlConfig{}.Parse() -// assert.NoError(t, err) - -// var importUnclosedCtr, noImportCtr, validCtr int -// var files []io.FileObj -// files = append(files, TestFile{io.File{FilePath: "internal/skipTest/import-unclosed.testgo"}, &importUnclosedCtr}) -// files = append(files, TestFile{io.File{FilePath: "internal/skipTest/no-import.testgo"}, &noImportCtr}) -// files = append(files, TestFile{io.File{FilePath: "internal/skipTest/valid.testgo"}, &validCtr}) - -// validFileProcessedChan := make(chan bool, len(files)) - -// generatorFunc := func() ([]io.FileObj, error) { -// return files, nil -// } -// fileAccessTestFunc := func(filePath string, unmodifiedFile, formattedFile []byte) error { -// validFileProcessedChan <- true -// return nil -// } -// err = ProcessFiles(generatorFunc, *cfg, fileAccessTestFunc) -// assert.NoError(t, err) -// // check all files have been accessed -// assert.Equal(t, importUnclosedCtr, 1) -// assert.Equal(t, noImportCtr, 1) -// assert.Equal(t, validCtr, 1) -// // check that processing for the valid file was called -// assert.True(t, <-validFileProcessedChan) -// } - -// type TestFile struct { -// wrappedFile io.File -// accessCounter *int -// } - -// func (t TestFile) Load() ([]byte, error) { -// *t.accessCounter++ -// return t.wrappedFile.Load() -// } - -// func (t TestFile) Path() string { -// return t.wrappedFile.Path() -// } +} diff --git a/pkg/gci/internal/skipTest/generated_code.go b/pkg/gci/internal/skipTest/generated_code.go deleted file mode 100644 index 8a8f980..0000000 --- a/pkg/gci/internal/skipTest/generated_code.go +++ /dev/null @@ -1,14 +0,0 @@ -package testdata - -// DO NOT EDIT - -import ( - "testing" - - "fmt" -) - -// nolint -func Test(t *testing.T) { - fmt.Println("test") -} diff --git a/pkg/gci/internal/skipTest/import-unclosed.testgo b/pkg/gci/internal/skipTest/import-unclosed.testgo deleted file mode 100644 index 289dd46..0000000 --- a/pkg/gci/internal/skipTest/import-unclosed.testgo +++ /dev/null @@ -1,8 +0,0 @@ -package main -import ( - "golang.org/x/tools" - - "fmt" - - "github.com/daixiang0/gci" - diff --git a/pkg/gci/internal/skipTest/no-import.testgo b/pkg/gci/internal/skipTest/no-import.testgo deleted file mode 100644 index c6146b4..0000000 --- a/pkg/gci/internal/skipTest/no-import.testgo +++ /dev/null @@ -1,4 +0,0 @@ -package main - -func X() { -} \ No newline at end of file diff --git a/pkg/gci/internal/skipTest/valid.testgo b/pkg/gci/internal/skipTest/valid.testgo deleted file mode 100644 index 52cc6c0..0000000 --- a/pkg/gci/internal/skipTest/valid.testgo +++ /dev/null @@ -1,8 +0,0 @@ -package main -import ( - "golang.org/x/tools" - - "fmt" - - "github.com/daixiang0/gci" -) \ No newline at end of file diff --git a/pkg/gci/internal/testdata/already-good.cfg.yaml b/pkg/gci/internal/testdata/already-good.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/already-good.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/already-good.in.go b/pkg/gci/internal/testdata/already-good.in.go deleted file mode 100644 index 26a4c1e..0000000 --- a/pkg/gci/internal/testdata/already-good.in.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/already-good.out.go b/pkg/gci/internal/testdata/already-good.out.go deleted file mode 100644 index 26a4c1e..0000000 --- a/pkg/gci/internal/testdata/already-good.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/blank-format.cfg.yaml b/pkg/gci/internal/testdata/blank-format.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/blank-format.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/blank-format.in.go b/pkg/gci/internal/testdata/blank-format.in.go deleted file mode 100644 index 6712762..0000000 --- a/pkg/gci/internal/testdata/blank-format.in.go +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 28402ae..0000000 --- a/pkg/gci/internal/testdata/blank-format.out.go +++ /dev/null @@ -1,10 +0,0 @@ -package main - -import ( - "fmt" - - // comment - g "github.com/golang" // comment - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/cgo-block-after-import.cfg.yaml b/pkg/gci/internal/testdata/cgo-block-after-import.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/cgo-block-after-import.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/cgo-block-after-import.in.go b/pkg/gci/internal/testdata/cgo-block-after-import.in.go deleted file mode 100644 index 2f75b1f..0000000 --- a/pkg/gci/internal/testdata/cgo-block-after-import.in.go +++ /dev/null @@ -1,14 +0,0 @@ -package main - -import ( - "fmt" - - "github.com/daixiang0/gci" - g "github.com/golang" -) - -// #cgo CFLAGS: -DPNG_DEBUG=1 -// #cgo amd64 386 CFLAGS: -DX86=1 -// #cgo LDFLAGS: -lpng -// #include -import "C" diff --git a/pkg/gci/internal/testdata/cgo-block-after-import.out.go b/pkg/gci/internal/testdata/cgo-block-after-import.out.go deleted file mode 100644 index e75feda..0000000 --- a/pkg/gci/internal/testdata/cgo-block-after-import.out.go +++ /dev/null @@ -1,15 +0,0 @@ -package main - -// #cgo CFLAGS: -DPNG_DEBUG=1 -// #cgo amd64 386 CFLAGS: -DX86=1 -// #cgo LDFLAGS: -lpng -// #include -import "C" - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/cgo-block-before-import.cfg.yaml b/pkg/gci/internal/testdata/cgo-block-before-import.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/cgo-block-before-import.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/cgo-block-before-import.in.go b/pkg/gci/internal/testdata/cgo-block-before-import.in.go deleted file mode 100644 index 0bde1be..0000000 --- a/pkg/gci/internal/testdata/cgo-block-before-import.in.go +++ /dev/null @@ -1,15 +0,0 @@ -package main - -// #cgo CFLAGS: -DPNG_DEBUG=1 -// #cgo amd64 386 CFLAGS: -DX86=1 -// #cgo LDFLAGS: -lpng -// #include -import "C" - -import ( - "fmt" - - "github.com/daixiang0/gci" - - g "github.com/golang" -) diff --git a/pkg/gci/internal/testdata/cgo-block-before-import.out.go b/pkg/gci/internal/testdata/cgo-block-before-import.out.go deleted file mode 100644 index e75feda..0000000 --- a/pkg/gci/internal/testdata/cgo-block-before-import.out.go +++ /dev/null @@ -1,15 +0,0 @@ -package main - -// #cgo CFLAGS: -DPNG_DEBUG=1 -// #cgo amd64 386 CFLAGS: -DX86=1 -// #cgo LDFLAGS: -lpng -// #include -import "C" - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/cgo-block-mixed-with-content.cfg.yaml b/pkg/gci/internal/testdata/cgo-block-mixed-with-content.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/cgo-block-mixed-with-content.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/cgo-block-mixed-with-content.in.go b/pkg/gci/internal/testdata/cgo-block-mixed-with-content.in.go deleted file mode 100644 index 8a08100..0000000 --- a/pkg/gci/internal/testdata/cgo-block-mixed-with-content.in.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import ( - /* #include "types.h" - #include "other.h" */"C" -) diff --git a/pkg/gci/internal/testdata/cgo-block-mixed-with-content.out.go b/pkg/gci/internal/testdata/cgo-block-mixed-with-content.out.go deleted file mode 100644 index 8a08100..0000000 --- a/pkg/gci/internal/testdata/cgo-block-mixed-with-content.out.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import ( - /* #include "types.h" - #include "other.h" */"C" -) diff --git a/pkg/gci/internal/testdata/cgo-block-mixed.cfg.yaml b/pkg/gci/internal/testdata/cgo-block-mixed.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/cgo-block-mixed.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/cgo-block-mixed.in.go b/pkg/gci/internal/testdata/cgo-block-mixed.in.go deleted file mode 100644 index 6c023d7..0000000 --- a/pkg/gci/internal/testdata/cgo-block-mixed.in.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import ( - /* #include "types.h" - */"C" -) diff --git a/pkg/gci/internal/testdata/cgo-block-mixed.out.go b/pkg/gci/internal/testdata/cgo-block-mixed.out.go deleted file mode 100644 index 6c023d7..0000000 --- a/pkg/gci/internal/testdata/cgo-block-mixed.out.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import ( - /* #include "types.h" - */"C" -) diff --git a/pkg/gci/internal/testdata/cgo-block-prefix.cfg.yaml b/pkg/gci/internal/testdata/cgo-block-prefix.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/cgo-block-prefix.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/cgo-block-prefix.in.go b/pkg/gci/internal/testdata/cgo-block-prefix.in.go deleted file mode 100644 index fa6bac4..0000000 --- a/pkg/gci/internal/testdata/cgo-block-prefix.in.go +++ /dev/null @@ -1,5 +0,0 @@ -package main - -import ( - /* #include "types.h" */ "C" -) diff --git a/pkg/gci/internal/testdata/cgo-block-prefix.out.go b/pkg/gci/internal/testdata/cgo-block-prefix.out.go deleted file mode 100644 index fa6bac4..0000000 --- a/pkg/gci/internal/testdata/cgo-block-prefix.out.go +++ /dev/null @@ -1,5 +0,0 @@ -package main - -import ( - /* #include "types.h" */ "C" -) diff --git a/pkg/gci/internal/testdata/cgo-block-single-line.cfg.yaml b/pkg/gci/internal/testdata/cgo-block-single-line.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/cgo-block-single-line.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/cgo-block-single-line.in.go b/pkg/gci/internal/testdata/cgo-block-single-line.in.go deleted file mode 100644 index e26d6a6..0000000 --- a/pkg/gci/internal/testdata/cgo-block-single-line.in.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import ( - /* #include "types.h" */ - "C" -) diff --git a/pkg/gci/internal/testdata/cgo-block-single-line.out.go b/pkg/gci/internal/testdata/cgo-block-single-line.out.go deleted file mode 100644 index e26d6a6..0000000 --- a/pkg/gci/internal/testdata/cgo-block-single-line.out.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import ( - /* #include "types.h" */ - "C" -) diff --git a/pkg/gci/internal/testdata/cgo-block.cfg.yaml b/pkg/gci/internal/testdata/cgo-block.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/cgo-block.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/cgo-block.in.go b/pkg/gci/internal/testdata/cgo-block.in.go deleted file mode 100644 index 505b543..0000000 --- a/pkg/gci/internal/testdata/cgo-block.in.go +++ /dev/null @@ -1,8 +0,0 @@ -package main - -import ( - /* - #include "types.h" - */ - "C" -) diff --git a/pkg/gci/internal/testdata/cgo-block.out.go b/pkg/gci/internal/testdata/cgo-block.out.go deleted file mode 100644 index 505b543..0000000 --- a/pkg/gci/internal/testdata/cgo-block.out.go +++ /dev/null @@ -1,8 +0,0 @@ -package main - -import ( - /* - #include "types.h" - */ - "C" -) diff --git a/pkg/gci/internal/testdata/cgo-line.cfg.yaml b/pkg/gci/internal/testdata/cgo-line.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/cgo-line.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/cgo-line.in.go b/pkg/gci/internal/testdata/cgo-line.in.go deleted file mode 100644 index a5e367a..0000000 --- a/pkg/gci/internal/testdata/cgo-line.in.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import ( - // #include "types.h" - "C" -) diff --git a/pkg/gci/internal/testdata/cgo-line.out.go b/pkg/gci/internal/testdata/cgo-line.out.go deleted file mode 100644 index a5e367a..0000000 --- a/pkg/gci/internal/testdata/cgo-line.out.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import ( - // #include "types.h" - "C" -) diff --git a/pkg/gci/internal/testdata/cgo-multiline.cfg.yaml b/pkg/gci/internal/testdata/cgo-multiline.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/cgo-multiline.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/cgo-multiline.in.go b/pkg/gci/internal/testdata/cgo-multiline.in.go deleted file mode 100644 index 171bee5..0000000 --- a/pkg/gci/internal/testdata/cgo-multiline.in.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import ( - // #include "types.h" - // #include "other.h" - "C" -) diff --git a/pkg/gci/internal/testdata/cgo-multiline.out.go b/pkg/gci/internal/testdata/cgo-multiline.out.go deleted file mode 100644 index 171bee5..0000000 --- a/pkg/gci/internal/testdata/cgo-multiline.out.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import ( - // #include "types.h" - // #include "other.h" - "C" -) diff --git a/pkg/gci/internal/testdata/cgo-single.cfg.yaml b/pkg/gci/internal/testdata/cgo-single.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/cgo-single.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/cgo-single.in.go b/pkg/gci/internal/testdata/cgo-single.in.go deleted file mode 100644 index 144d8d2..0000000 --- a/pkg/gci/internal/testdata/cgo-single.in.go +++ /dev/null @@ -1,15 +0,0 @@ -package main - -import ( - "fmt" - - "github.com/daixiang0/gci" -) - -import "C" - -import "github.com/golang" - -import ( - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/cgo-single.out.go b/pkg/gci/internal/testdata/cgo-single.out.go deleted file mode 100644 index 467c205..0000000 --- a/pkg/gci/internal/testdata/cgo-single.out.go +++ /dev/null @@ -1,11 +0,0 @@ -package main - -import "C" - -import ( - "fmt" - - "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/comment-before-import.cfg.yaml b/pkg/gci/internal/testdata/comment-before-import.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/comment-before-import.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/comment-before-import.in.go b/pkg/gci/internal/testdata/comment-before-import.in.go deleted file mode 100644 index e409ca1..0000000 --- a/pkg/gci/internal/testdata/comment-before-import.in.go +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index e409ca1..0000000 --- a/pkg/gci/internal/testdata/comment-before-import.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -// comment -import ( - "fmt" - "os" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/comment-in-the-tail.cfg.yaml b/pkg/gci/internal/testdata/comment-in-the-tail.cfg.yaml deleted file mode 100644 index e666ab9..0000000 --- a/pkg/gci/internal/testdata/comment-in-the-tail.cfg.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0) diff --git a/pkg/gci/internal/testdata/comment-in-the-tail.in.go b/pkg/gci/internal/testdata/comment-in-the-tail.in.go deleted file mode 100644 index 9d0f407..0000000 --- a/pkg/gci/internal/testdata/comment-in-the-tail.in.go +++ /dev/null @@ -1,13 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "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 deleted file mode 100644 index 9d0f407..0000000 --- a/pkg/gci/internal/testdata/comment-in-the-tail.out.go +++ /dev/null @@ -1,13 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" -) - -type test int - -// test diff --git a/pkg/gci/internal/testdata/comment-top.cfg.yaml b/pkg/gci/internal/testdata/comment-top.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/comment-top.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/comment-top.in.go b/pkg/gci/internal/testdata/comment-top.in.go deleted file mode 100644 index 2c79240..0000000 --- a/pkg/gci/internal/testdata/comment-top.in.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import ( - "os" // https://pkg.go.dev/os - // https://pkg.go.dev/fmt - "fmt" -) diff --git a/pkg/gci/internal/testdata/comment-top.out.go b/pkg/gci/internal/testdata/comment-top.out.go deleted file mode 100644 index 7ecc981..0000000 --- a/pkg/gci/internal/testdata/comment-top.out.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import ( - // https://pkg.go.dev/fmt - "fmt" - "os" // https://pkg.go.dev/os -) diff --git a/pkg/gci/internal/testdata/comment-whithout-whitespace.cfg.yaml b/pkg/gci/internal/testdata/comment-whithout-whitespace.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/comment-whithout-whitespace.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/comment-whithout-whitespace.in.go b/pkg/gci/internal/testdata/comment-whithout-whitespace.in.go deleted file mode 100644 index 6ea46c9..0000000 --- a/pkg/gci/internal/testdata/comment-whithout-whitespace.in.go +++ /dev/null @@ -1,5 +0,0 @@ -package proc - -import ( - "context"// no separating whitespace here //nolint:confusion -) diff --git a/pkg/gci/internal/testdata/comment-whithout-whitespace.out.go b/pkg/gci/internal/testdata/comment-whithout-whitespace.out.go deleted file mode 100644 index 6ea46c9..0000000 --- a/pkg/gci/internal/testdata/comment-whithout-whitespace.out.go +++ /dev/null @@ -1,5 +0,0 @@ -package proc - -import ( - "context"// no separating whitespace here //nolint:confusion -) diff --git a/pkg/gci/internal/testdata/comment-with-slashslash.cfg.yaml b/pkg/gci/internal/testdata/comment-with-slashslash.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/comment-with-slashslash.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/comment-with-slashslash.in.go b/pkg/gci/internal/testdata/comment-with-slashslash.in.go deleted file mode 100644 index 73464d9..0000000 --- a/pkg/gci/internal/testdata/comment-with-slashslash.in.go +++ /dev/null @@ -1,5 +0,0 @@ -package main - -import ( - "fmt" // https://pkg.go.dev/fmt -) diff --git a/pkg/gci/internal/testdata/comment-with-slashslash.out.go b/pkg/gci/internal/testdata/comment-with-slashslash.out.go deleted file mode 100644 index 73464d9..0000000 --- a/pkg/gci/internal/testdata/comment-with-slashslash.out.go +++ /dev/null @@ -1,5 +0,0 @@ -package main - -import ( - "fmt" // https://pkg.go.dev/fmt -) diff --git a/pkg/gci/internal/testdata/comment.cfg.yaml b/pkg/gci/internal/testdata/comment.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/comment.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/comment.in.go b/pkg/gci/internal/testdata/comment.in.go deleted file mode 100644 index 800e96e..0000000 --- a/pkg/gci/internal/testdata/comment.in.go +++ /dev/null @@ -1,5 +0,0 @@ -package main -import ( - //Do not forget to run Gci - "fmt" -) diff --git a/pkg/gci/internal/testdata/comment.out.go b/pkg/gci/internal/testdata/comment.out.go deleted file mode 100644 index 800e96e..0000000 --- a/pkg/gci/internal/testdata/comment.out.go +++ /dev/null @@ -1,5 +0,0 @@ -package main -import ( - //Do not forget to run Gci - "fmt" -) diff --git a/pkg/gci/internal/testdata/common.cfg.yaml b/pkg/gci/internal/testdata/common.cfg.yaml deleted file mode 100644 index e666ab9..0000000 --- a/pkg/gci/internal/testdata/common.cfg.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0) diff --git a/pkg/gci/internal/testdata/configTest.cfg.yaml b/pkg/gci/internal/testdata/configTest.cfg.yaml deleted file mode 100644 index 3458e23..0000000 --- a/pkg/gci/internal/testdata/configTest.cfg.yaml +++ /dev/null @@ -1,3 +0,0 @@ -sections: - - Default -skipGenerated: true diff --git a/pkg/gci/internal/testdata/custom-order.cfg.yaml b/pkg/gci/internal/testdata/custom-order.cfg.yaml deleted file mode 100644 index c5af038..0000000 --- a/pkg/gci/internal/testdata/custom-order.cfg.yaml +++ /dev/null @@ -1,5 +0,0 @@ -customOrder: true -sections: - - Prefix(github.com/daixiang0) - - Default - - Standard diff --git a/pkg/gci/internal/testdata/custom-order.in.go b/pkg/gci/internal/testdata/custom-order.in.go deleted file mode 100644 index 012efe9..0000000 --- a/pkg/gci/internal/testdata/custom-order.in.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/a" -) diff --git a/pkg/gci/internal/testdata/custom-order.out.go b/pkg/gci/internal/testdata/custom-order.out.go deleted file mode 100644 index 74acb7f..0000000 --- a/pkg/gci/internal/testdata/custom-order.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "github.com/daixiang0/a" - - g "github.com/golang" - - "fmt" -) diff --git a/pkg/gci/internal/testdata/default-order.cfg.yaml b/pkg/gci/internal/testdata/default-order.cfg.yaml deleted file mode 100644 index 5bdf79c..0000000 --- a/pkg/gci/internal/testdata/default-order.cfg.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sections: - - Standard - - Prefix(github.com/daixiang0) - - Default diff --git a/pkg/gci/internal/testdata/default-order.in.go b/pkg/gci/internal/testdata/default-order.in.go deleted file mode 100644 index 012efe9..0000000 --- a/pkg/gci/internal/testdata/default-order.in.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/a" -) diff --git a/pkg/gci/internal/testdata/default-order.out.go b/pkg/gci/internal/testdata/default-order.out.go deleted file mode 100644 index 012efe9..0000000 --- a/pkg/gci/internal/testdata/default-order.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/a" -) diff --git a/pkg/gci/internal/testdata/defaultValues.cfg.yaml b/pkg/gci/internal/testdata/defaultValues.cfg.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/pkg/gci/internal/testdata/dot-and-blank.cfg.yaml b/pkg/gci/internal/testdata/dot-and-blank.cfg.yaml deleted file mode 100644 index 30d5493..0000000 --- a/pkg/gci/internal/testdata/dot-and-blank.cfg.yaml +++ /dev/null @@ -1,6 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0) - - Blank - - Dot diff --git a/pkg/gci/internal/testdata/dot-and-blank.in.go b/pkg/gci/internal/testdata/dot-and-blank.in.go deleted file mode 100644 index ac8e762..0000000 --- a/pkg/gci/internal/testdata/dot-and-blank.in.go +++ /dev/null @@ -1,15 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - . "github.com/golang/dot" - _ "github.com/golang/blank" - - "github.com/daixiang0/a" - "github.com/daixiang0/gci" - "github.com/daixiang0/gci/subtest" - . "github.com/daixiang0/gci/dot" - _ "github.com/daixiang0/gci/blank" -) diff --git a/pkg/gci/internal/testdata/dot-and-blank.out.go b/pkg/gci/internal/testdata/dot-and-blank.out.go deleted file mode 100644 index 036a8a3..0000000 --- a/pkg/gci/internal/testdata/dot-and-blank.out.go +++ /dev/null @@ -1,17 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/a" - "github.com/daixiang0/gci" - "github.com/daixiang0/gci/subtest" - - _ "github.com/daixiang0/gci/blank" - _ "github.com/golang/blank" - - . "github.com/daixiang0/gci/dot" - . "github.com/golang/dot" -) diff --git a/pkg/gci/internal/testdata/duplicate-imports.cfg.yaml b/pkg/gci/internal/testdata/duplicate-imports.cfg.yaml deleted file mode 100644 index e666ab9..0000000 --- a/pkg/gci/internal/testdata/duplicate-imports.cfg.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0) diff --git a/pkg/gci/internal/testdata/duplicate-imports.in.go b/pkg/gci/internal/testdata/duplicate-imports.in.go deleted file mode 100644 index 0ef8fec..0000000 --- a/pkg/gci/internal/testdata/duplicate-imports.in.go +++ /dev/null @@ -1,10 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - a "github.com/daixiang0/gci" - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/duplicate-imports.out.go b/pkg/gci/internal/testdata/duplicate-imports.out.go deleted file mode 100644 index 476a354..0000000 --- a/pkg/gci/internal/testdata/duplicate-imports.out.go +++ /dev/null @@ -1,10 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" - a "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/grouped-multiple-custom.cfg.yaml b/pkg/gci/internal/testdata/grouped-multiple-custom.cfg.yaml deleted file mode 100644 index 614bfa3..0000000 --- a/pkg/gci/internal/testdata/grouped-multiple-custom.cfg.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0,gitlab.com/daixiang0,daixiang0) diff --git a/pkg/gci/internal/testdata/grouped-multiple-custom.in.go b/pkg/gci/internal/testdata/grouped-multiple-custom.in.go deleted file mode 100644 index cc64488..0000000 --- a/pkg/gci/internal/testdata/grouped-multiple-custom.in.go +++ /dev/null @@ -1,10 +0,0 @@ -package main - -import ( - "daixiang0/lib1" - "fmt" - "github.com/daixiang0/gci" - "gitlab.com/daixiang0/gci" - g "github.com/golang" - "github.com/daixiang0/gci/subtest" -) diff --git a/pkg/gci/internal/testdata/grouped-multiple-custom.out.go b/pkg/gci/internal/testdata/grouped-multiple-custom.out.go deleted file mode 100644 index 3f21ff8..0000000 --- a/pkg/gci/internal/testdata/grouped-multiple-custom.out.go +++ /dev/null @@ -1,12 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "daixiang0/lib1" - "github.com/daixiang0/gci" - "github.com/daixiang0/gci/subtest" - "gitlab.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/leading-comment.cfg.yaml b/pkg/gci/internal/testdata/leading-comment.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/leading-comment.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/leading-comment.in.go b/pkg/gci/internal/testdata/leading-comment.in.go deleted file mode 100644 index b1aa143..0000000 --- a/pkg/gci/internal/testdata/leading-comment.in.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import ( - // foo - "fmt" -) diff --git a/pkg/gci/internal/testdata/leading-comment.out.go b/pkg/gci/internal/testdata/leading-comment.out.go deleted file mode 100644 index b1aa143..0000000 --- a/pkg/gci/internal/testdata/leading-comment.out.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import ( - // foo - "fmt" -) diff --git a/pkg/gci/internal/testdata/linebreak-no-custom.cfg.yaml b/pkg/gci/internal/testdata/linebreak-no-custom.cfg.yaml deleted file mode 100644 index e666ab9..0000000 --- a/pkg/gci/internal/testdata/linebreak-no-custom.cfg.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0) diff --git a/pkg/gci/internal/testdata/linebreak-no-custom.in.go b/pkg/gci/internal/testdata/linebreak-no-custom.in.go deleted file mode 100644 index f30e7d4..0000000 --- a/pkg/gci/internal/testdata/linebreak-no-custom.in.go +++ /dev/null @@ -1,8 +0,0 @@ -package main - -import ( - g "github.com/golang" - - "fmt" - -) diff --git a/pkg/gci/internal/testdata/linebreak-no-custom.out.go b/pkg/gci/internal/testdata/linebreak-no-custom.out.go deleted file mode 100644 index 8ca2577..0000000 --- a/pkg/gci/internal/testdata/linebreak-no-custom.out.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" -) diff --git a/pkg/gci/internal/testdata/linebreak.cfg.yaml b/pkg/gci/internal/testdata/linebreak.cfg.yaml deleted file mode 100644 index e666ab9..0000000 --- a/pkg/gci/internal/testdata/linebreak.cfg.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0) diff --git a/pkg/gci/internal/testdata/linebreak.in.go b/pkg/gci/internal/testdata/linebreak.in.go deleted file mode 100644 index 7e0f7e7..0000000 --- a/pkg/gci/internal/testdata/linebreak.in.go +++ /dev/null @@ -1,10 +0,0 @@ -package main - -import ( - g "github.com/golang" - - "fmt" - - "github.com/daixiang0/gci" - -) diff --git a/pkg/gci/internal/testdata/linebreak.out.go b/pkg/gci/internal/testdata/linebreak.out.go deleted file mode 100644 index 26a4c1e..0000000 --- a/pkg/gci/internal/testdata/linebreak.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/mismatch-section.cfg.yaml b/pkg/gci/internal/testdata/mismatch-section.cfg.yaml deleted file mode 100644 index be67ca2..0000000 --- a/pkg/gci/internal/testdata/mismatch-section.cfg.yaml +++ /dev/null @@ -1,5 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0) - - Prefix(github.com/daixiang0/gci) diff --git a/pkg/gci/internal/testdata/mismatch-section.in.go b/pkg/gci/internal/testdata/mismatch-section.in.go deleted file mode 100644 index 26a4c1e..0000000 --- a/pkg/gci/internal/testdata/mismatch-section.in.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/mismatch-section.out.go b/pkg/gci/internal/testdata/mismatch-section.out.go deleted file mode 100644 index 26a4c1e..0000000 --- a/pkg/gci/internal/testdata/mismatch-section.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/multiple-custom.cfg.yaml b/pkg/gci/internal/testdata/multiple-custom.cfg.yaml deleted file mode 100644 index 1a7eb9f..0000000 --- a/pkg/gci/internal/testdata/multiple-custom.cfg.yaml +++ /dev/null @@ -1,6 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0) - - Prefix(github.com/daixiang0/gci) - - Prefix(github.com/daixiang0/gci/subtest) diff --git a/pkg/gci/internal/testdata/multiple-custom.in.go b/pkg/gci/internal/testdata/multiple-custom.in.go deleted file mode 100644 index e9302a3..0000000 --- a/pkg/gci/internal/testdata/multiple-custom.in.go +++ /dev/null @@ -1,11 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/a" - "github.com/daixiang0/gci" - "github.com/daixiang0/gci/subtest" -) diff --git a/pkg/gci/internal/testdata/multiple-custom.out.go b/pkg/gci/internal/testdata/multiple-custom.out.go deleted file mode 100644 index 88895fe..0000000 --- a/pkg/gci/internal/testdata/multiple-custom.out.go +++ /dev/null @@ -1,13 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/a" - - "github.com/daixiang0/gci" - - "github.com/daixiang0/gci/subtest" -) diff --git a/pkg/gci/internal/testdata/multiple-imports.cfg.yaml b/pkg/gci/internal/testdata/multiple-imports.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/multiple-imports.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/multiple-imports.in.go b/pkg/gci/internal/testdata/multiple-imports.in.go deleted file mode 100644 index 930ab12..0000000 --- a/pkg/gci/internal/testdata/multiple-imports.in.go +++ /dev/null @@ -1,18 +0,0 @@ -package main - -import "fmt" - -import "context" - -import ( - "os" - - "github.com/daixiang0/test" -) - -import "math" - - -// main -func main() { -} diff --git a/pkg/gci/internal/testdata/multiple-imports.out.go b/pkg/gci/internal/testdata/multiple-imports.out.go deleted file mode 100644 index f136a04..0000000 --- a/pkg/gci/internal/testdata/multiple-imports.out.go +++ /dev/null @@ -1,14 +0,0 @@ -package main - -import ( - "context" - "fmt" - "math" - "os" - - "github.com/daixiang0/test" -) - -// main -func main() { -} diff --git a/pkg/gci/internal/testdata/multiple-line-comment.cfg.yaml b/pkg/gci/internal/testdata/multiple-line-comment.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/multiple-line-comment.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/multiple-line-comment.in.go b/pkg/gci/internal/testdata/multiple-line-comment.in.go deleted file mode 100644 index 0a952e7..0000000 --- a/pkg/gci/internal/testdata/multiple-line-comment.in.go +++ /dev/null @@ -1,15 +0,0 @@ -package proc - -import ( - "context" // in-line comment - "fmt" - "os" - - //nolint:depguard // A multi-line comment explaining why in - // this one case it's OK to use os/exec even though depguard - // is configured to force us to use dlib/exec instead. - "os/exec" - - "golang.org/x/sys/unix" - "github.com/local/dlib/dexec" -) diff --git a/pkg/gci/internal/testdata/multiple-line-comment.out.go b/pkg/gci/internal/testdata/multiple-line-comment.out.go deleted file mode 100644 index 03d51d5..0000000 --- a/pkg/gci/internal/testdata/multiple-line-comment.out.go +++ /dev/null @@ -1,14 +0,0 @@ -package proc - -import ( - "context" // in-line comment - "fmt" - "os" - //nolint:depguard // A multi-line comment explaining why in - // this one case it's OK to use os/exec even though depguard - // is configured to force us to use dlib/exec instead. - "os/exec" - - "github.com/local/dlib/dexec" - "golang.org/x/sys/unix" -) diff --git a/pkg/gci/internal/testdata/no-format.cfg.yaml b/pkg/gci/internal/testdata/no-format.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/no-format.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/no-format.in.go b/pkg/gci/internal/testdata/no-format.in.go deleted file mode 100644 index 9b480f1..0000000 --- a/pkg/gci/internal/testdata/no-format.in.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import( -"fmt" - -g "github.com/golang" - -"github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/no-format.out.go b/pkg/gci/internal/testdata/no-format.out.go deleted file mode 100644 index 26a4c1e..0000000 --- a/pkg/gci/internal/testdata/no-format.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/nochar-after-import.cfg.yaml b/pkg/gci/internal/testdata/nochar-after-import.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/nochar-after-import.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/nochar-after-import.in.go b/pkg/gci/internal/testdata/nochar-after-import.in.go deleted file mode 100644 index 33559f4..0000000 --- a/pkg/gci/internal/testdata/nochar-after-import.in.go +++ /dev/null @@ -1,5 +0,0 @@ -package main - -import ( - "fmt" -) diff --git a/pkg/gci/internal/testdata/nochar-after-import.out.go b/pkg/gci/internal/testdata/nochar-after-import.out.go deleted file mode 100644 index 33559f4..0000000 --- a/pkg/gci/internal/testdata/nochar-after-import.out.go +++ /dev/null @@ -1,5 +0,0 @@ -package main - -import ( - "fmt" -) diff --git a/pkg/gci/internal/testdata/nolint.cfg.yaml b/pkg/gci/internal/testdata/nolint.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/nolint.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/nolint.in.go b/pkg/gci/internal/testdata/nolint.in.go deleted file mode 100644 index 96c3dec..0000000 --- a/pkg/gci/internal/testdata/nolint.in.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - "github.com/forbidden/pkg" //nolint:depguard - - _ "github.com/daixiang0/gci" //nolint:depguard -) diff --git a/pkg/gci/internal/testdata/nolint.out.go b/pkg/gci/internal/testdata/nolint.out.go deleted file mode 100644 index 96c3dec..0000000 --- a/pkg/gci/internal/testdata/nolint.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - "github.com/forbidden/pkg" //nolint:depguard - - _ "github.com/daixiang0/gci" //nolint:depguard -) diff --git a/pkg/gci/internal/testdata/not.a.go.file b/pkg/gci/internal/testdata/not.a.go.file deleted file mode 100644 index e69de29..0000000 diff --git a/pkg/gci/internal/testdata/number-in-alias.cfg.yaml b/pkg/gci/internal/testdata/number-in-alias.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/number-in-alias.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/number-in-alias.in.go b/pkg/gci/internal/testdata/number-in-alias.in.go deleted file mode 100644 index 63b62ee..0000000 --- a/pkg/gci/internal/testdata/number-in-alias.in.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - go_V1 "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/number-in-alias.out.go b/pkg/gci/internal/testdata/number-in-alias.out.go deleted file mode 100644 index 63b62ee..0000000 --- a/pkg/gci/internal/testdata/number-in-alias.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - go_V1 "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/one-import-one-line.cfg.yaml b/pkg/gci/internal/testdata/one-import-one-line.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/one-import-one-line.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/one-import-one-line.in.go b/pkg/gci/internal/testdata/one-import-one-line.in.go deleted file mode 100644 index ba4f19d..0000000 --- a/pkg/gci/internal/testdata/one-import-one-line.in.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import "fmt" - -func main() { -} diff --git a/pkg/gci/internal/testdata/one-import-one-line.out.go b/pkg/gci/internal/testdata/one-import-one-line.out.go deleted file mode 100644 index ba4f19d..0000000 --- a/pkg/gci/internal/testdata/one-import-one-line.out.go +++ /dev/null @@ -1,6 +0,0 @@ -package main - -import "fmt" - -func main() { -} diff --git a/pkg/gci/internal/testdata/one-import.cfg.yaml b/pkg/gci/internal/testdata/one-import.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/one-import.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/one-import.in.go b/pkg/gci/internal/testdata/one-import.in.go deleted file mode 100644 index 2d40b08..0000000 --- a/pkg/gci/internal/testdata/one-import.in.go +++ /dev/null @@ -1,7 +0,0 @@ -package main -import ( - "fmt" -) - -func main() { -} diff --git a/pkg/gci/internal/testdata/one-import.out.go b/pkg/gci/internal/testdata/one-import.out.go deleted file mode 100644 index 2d40b08..0000000 --- a/pkg/gci/internal/testdata/one-import.out.go +++ /dev/null @@ -1,7 +0,0 @@ -package main -import ( - "fmt" -) - -func main() { -} diff --git a/pkg/gci/internal/testdata/one-line-import-after-import.cfg.yaml b/pkg/gci/internal/testdata/one-line-import-after-import.cfg.yaml deleted file mode 100644 index e666ab9..0000000 --- a/pkg/gci/internal/testdata/one-line-import-after-import.cfg.yaml +++ /dev/null @@ -1,4 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0) diff --git a/pkg/gci/internal/testdata/one-line-import-after-import.in.go b/pkg/gci/internal/testdata/one-line-import-after-import.in.go deleted file mode 100644 index 6de854d..0000000 --- a/pkg/gci/internal/testdata/one-line-import-after-import.in.go +++ /dev/null @@ -1,10 +0,0 @@ -package main - -import ( - "fmt" - "os" - - "github.com/daixiang0/test" -) - -import "context" diff --git a/pkg/gci/internal/testdata/one-line-import-after-import.out.go b/pkg/gci/internal/testdata/one-line-import-after-import.out.go deleted file mode 100644 index 9463369..0000000 --- a/pkg/gci/internal/testdata/one-line-import-after-import.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "context" - "fmt" - "os" - - "github.com/daixiang0/test" -) diff --git a/pkg/gci/internal/testdata/same-prefix-custom.cfg.yaml b/pkg/gci/internal/testdata/same-prefix-custom.cfg.yaml deleted file mode 100644 index 7913378..0000000 --- a/pkg/gci/internal/testdata/same-prefix-custom.cfg.yaml +++ /dev/null @@ -1,5 +0,0 @@ -sections: - - Standard - - Default - - Prefix(github.com/daixiang0/gci) - - Prefix(github.com/daixiang0/gci/subtest) diff --git a/pkg/gci/internal/testdata/same-prefix-custom.in.go b/pkg/gci/internal/testdata/same-prefix-custom.in.go deleted file mode 100644 index 715019b..0000000 --- a/pkg/gci/internal/testdata/same-prefix-custom.in.go +++ /dev/null @@ -1,10 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" - "github.com/daixiang0/gci/subtest" -) diff --git a/pkg/gci/internal/testdata/same-prefix-custom.out.go b/pkg/gci/internal/testdata/same-prefix-custom.out.go deleted file mode 100644 index b53a04d..0000000 --- a/pkg/gci/internal/testdata/same-prefix-custom.out.go +++ /dev/null @@ -1,11 +0,0 @@ -package main - -import ( - "fmt" - - g "github.com/golang" - - "github.com/daixiang0/gci" - - "github.com/daixiang0/gci/subtest" -) diff --git a/pkg/gci/internal/testdata/simple-case.cfg.yaml b/pkg/gci/internal/testdata/simple-case.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/simple-case.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/simple-case.in.go b/pkg/gci/internal/testdata/simple-case.in.go deleted file mode 100644 index 960e78d..0000000 --- a/pkg/gci/internal/testdata/simple-case.in.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "golang.org/x/tools" - - "fmt" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/simple-case.out.go b/pkg/gci/internal/testdata/simple-case.out.go deleted file mode 100644 index fd2408b..0000000 --- a/pkg/gci/internal/testdata/simple-case.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - "golang.org/x/tools" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/whitespace-test.cfg.yaml b/pkg/gci/internal/testdata/whitespace-test.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/whitespace-test.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/whitespace-test.in.go b/pkg/gci/internal/testdata/whitespace-test.in.go deleted file mode 100644 index aaf4195..0000000 --- a/pkg/gci/internal/testdata/whitespace-test.in.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import ( - "fmt" - "github.com/golang" // golang - alias "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/whitespace-test.out.go b/pkg/gci/internal/testdata/whitespace-test.out.go deleted file mode 100644 index 0347b51..0000000 --- a/pkg/gci/internal/testdata/whitespace-test.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - "github.com/golang" // golang - - alias "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/with-above-comment-and-alias.cfg.yaml b/pkg/gci/internal/testdata/with-above-comment-and-alias.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/with-above-comment-and-alias.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file 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 deleted file mode 100644 index 948fca8..0000000 --- a/pkg/gci/internal/testdata/with-above-comment-and-alias.in.go +++ /dev/null @@ -1,8 +0,0 @@ -package main - -import ( - "fmt" - // golang - _ "github.com/golang" - "github.com/daixiang0/gci" -) 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 deleted file mode 100644 index 14808a7..0000000 --- a/pkg/gci/internal/testdata/with-above-comment-and-alias.out.go +++ /dev/null @@ -1,10 +0,0 @@ -package main - -import ( - "fmt" - - // golang - _ "github.com/golang" - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/with-comment-and-alias.cfg.yaml b/pkg/gci/internal/testdata/with-comment-and-alias.cfg.yaml deleted file mode 120000 index b0db9e7..0000000 --- a/pkg/gci/internal/testdata/with-comment-and-alias.cfg.yaml +++ /dev/null @@ -1 +0,0 @@ -common.cfg.yaml \ No newline at end of file diff --git a/pkg/gci/internal/testdata/with-comment-and-alias.in.go b/pkg/gci/internal/testdata/with-comment-and-alias.in.go deleted file mode 100644 index 79791d9..0000000 --- a/pkg/gci/internal/testdata/with-comment-and-alias.in.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import ( - "fmt" - _ "github.com/golang" // golang - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/internal/testdata/with-comment-and-alias.out.go b/pkg/gci/internal/testdata/with-comment-and-alias.out.go deleted file mode 100644 index 1d6b967..0000000 --- a/pkg/gci/internal/testdata/with-comment-and-alias.out.go +++ /dev/null @@ -1,9 +0,0 @@ -package main - -import ( - "fmt" - - _ "github.com/golang" // golang - - "github.com/daixiang0/gci" -) diff --git a/pkg/gci/testdata.go b/pkg/gci/testdata.go new file mode 100644 index 0000000..9d61cd8 --- /dev/null +++ b/pkg/gci/testdata.go @@ -0,0 +1,1200 @@ +package gci + +type Cases struct { + name, config, in, out string +} + +var commonConfig = `sections: + - Standard + - Default + - Prefix(github.com/daixiang0) +` + +var testCases = []Cases{ + { + "already-good", + + commonConfig, + + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) +`}, + { + "blank-format", + + commonConfig, + + `package main +import ( + "fmt" + + // comment + g "github.com/golang" // comment + + "github.com/daixiang0/gci" +) +`, + `package main + +import ( + "fmt" + + // comment + g "github.com/golang" // comment + + "github.com/daixiang0/gci" +) +`}, + { + "cgo-block", + + commonConfig, + + `package main + +import ( + /* + #include "types.h" + */ + "C" +) +`, + `package main + +import ( + /* + #include "types.h" + */ + "C" +) +`}, + { + "cgo-block-after-import", + + commonConfig, + + `package main + +import ( + "fmt" + + "github.com/daixiang0/gci" + g "github.com/golang" +) + +// #cgo CFLAGS: -DPNG_DEBUG=1 +// #cgo amd64 386 CFLAGS: -DX86=1 +// #cgo LDFLAGS: -lpng +// #include +import "C" +`, + `package main + +// #cgo CFLAGS: -DPNG_DEBUG=1 +// #cgo amd64 386 CFLAGS: -DX86=1 +// #cgo LDFLAGS: -lpng +// #include +import "C" + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) +`}, + { + "cgo-block-before-import", + + commonConfig, + + `package main + +// #cgo CFLAGS: -DPNG_DEBUG=1 +// #cgo amd64 386 CFLAGS: -DX86=1 +// #cgo LDFLAGS: -lpng +// #include +import "C" + +import ( + "fmt" + + "github.com/daixiang0/gci" + + g "github.com/golang" +) +`, + `package main + +// #cgo CFLAGS: -DPNG_DEBUG=1 +// #cgo amd64 386 CFLAGS: -DX86=1 +// #cgo LDFLAGS: -lpng +// #include +import "C" + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) +`}, + { + "cgo-block-mixed", + + commonConfig, + + `package main + +import ( + /* #include "types.h" + */"C" +) +`, + `package main + +import ( + /* #include "types.h" + */"C" +) +`}, + { + "cgo-block-mixed-with-content", + + commonConfig, + + `package main + +import ( + /* #include "types.h" + #include "other.h" */"C" +) +`, + `package main + +import ( + /* #include "types.h" + #include "other.h" */"C" +) +`}, + { + "cgo-block-prefix", + + commonConfig, + + `package main + +import ( + /* #include "types.h" */ "C" +) +`, + `package main + +import ( + /* #include "types.h" */ "C" +) +`}, + { + "cgo-block-single-line", + + commonConfig, + + `package main + +import ( + /* #include "types.h" */ + "C" +) +`, + `package main + +import ( + /* #include "types.h" */ + "C" +) +`}, + { + "cgo-line", + + commonConfig, + + `package main + +import ( + // #include "types.h" + "C" +) +`, + `package main + +import ( + // #include "types.h" + "C" +) +`}, + { + "cgo-multiline", + + commonConfig, + + `package main + +import ( + // #include "types.h" + // #include "other.h" + "C" +) +`, + `package main + +import ( + // #include "types.h" + // #include "other.h" + "C" +) +`}, + { + "cgo-single", + + commonConfig, + + `package main + +import ( + "fmt" + + "github.com/daixiang0/gci" +) + +import "C" + +import "github.com/golang" + +import ( + "github.com/daixiang0/gci" +) +`, + `package main + +import "C" + +import ( + "fmt" + + "github.com/golang" + + "github.com/daixiang0/gci" +) +`}, + { + "comment", + + commonConfig, + + `package main +import ( + //Do not forget to run Gci + "fmt" +) +`, + `package main +import ( + //Do not forget to run Gci + "fmt" +) +`}, + { + "comment-before-import", + + commonConfig, + + `package main + +// comment +import ( + "fmt" + "os" + + "github.com/daixiang0/gci" +) +`, + `package main + +// comment +import ( + "fmt" + "os" + + "github.com/daixiang0/gci" +) +`}, + { + "comment-in-the-tail", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) + +type test int + +// test +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) + +type test int + +// test +`}, + { + "comment-top", + + commonConfig, + + `package main + +import ( + "os" // https://pkg.go.dev/os + // https://pkg.go.dev/fmt + "fmt" +) +`, + `package main + +import ( + // https://pkg.go.dev/fmt + "fmt" + "os" // https://pkg.go.dev/os +) +`}, + { + "comment-whithout-whitespace", + + commonConfig, + + `package proc + +import ( + "context"// no separating whitespace here //nolint:confusion +) +`, + `package proc + +import ( + "context"// no separating whitespace here //nolint:confusion +) +`}, + { + "comment-with-slashslash", + + commonConfig, + + `package main + +import ( + "fmt" // https://pkg.go.dev/fmt +) +`, + `package main + +import ( + "fmt" // https://pkg.go.dev/fmt +) +`}, + { + "custom-order", + + `customOrder: true +sections: + - Prefix(github.com/daixiang0) + - Default + - Standard +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/a" +) +`, + `package main + +import ( + "github.com/daixiang0/a" + + g "github.com/golang" + + "fmt" +) +`}, + { + "default-order", + + `sections: + - Standard + - Prefix(github.com/daixiang0) + - Default +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/a" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/a" +) +`}, + { + "dot-and-blank", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0) + - Blank + - Dot +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + . "github.com/golang/dot" + _ "github.com/golang/blank" + + "github.com/daixiang0/a" + "github.com/daixiang0/gci" + "github.com/daixiang0/gci/subtest" + . "github.com/daixiang0/gci/dot" + _ "github.com/daixiang0/gci/blank" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/a" + "github.com/daixiang0/gci" + "github.com/daixiang0/gci/subtest" + + _ "github.com/daixiang0/gci/blank" + _ "github.com/golang/blank" + + . "github.com/daixiang0/gci/dot" + . "github.com/golang/dot" +) +`}, + { + "duplicate-imports", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + a "github.com/daixiang0/gci" + "github.com/daixiang0/gci" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" + a "github.com/daixiang0/gci" +) +`}, + { + "grouped-multiple-custom", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0,gitlab.com/daixiang0,daixiang0) +`, + `package main + +import ( + "daixiang0/lib1" + "fmt" + "github.com/daixiang0/gci" + "gitlab.com/daixiang0/gci" + g "github.com/golang" + "github.com/daixiang0/gci/subtest" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "daixiang0/lib1" + "github.com/daixiang0/gci" + "github.com/daixiang0/gci/subtest" + "gitlab.com/daixiang0/gci" +) +`}, + { + "leading-comment", + + commonConfig, + + `package main + +import ( + // foo + "fmt" +) +`, + `package main + +import ( + // foo + "fmt" +) +`}, + { + "linebreak", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0) +`, + `package main + +import ( + g "github.com/golang" + + "fmt" + + "github.com/daixiang0/gci" + +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) +`}, + { + "linebreak-no-custom", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0) +`, + `package main + +import ( + g "github.com/golang" + + "fmt" + +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" +) +`}, + { + "mismatch-section", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0) + - Prefix(github.com/daixiang0/gci) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) +`}, + { + "multiple-custom", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0) + - Prefix(github.com/daixiang0/gci) + - Prefix(github.com/daixiang0/gci/subtest) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/a" + "github.com/daixiang0/gci" + "github.com/daixiang0/gci/subtest" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/a" + + "github.com/daixiang0/gci" + + "github.com/daixiang0/gci/subtest" +) +`}, + { + "multiple-imports", + + commonConfig, + + `package main + +import "fmt" + +import "context" + +import ( + "os" + + "github.com/daixiang0/test" +) + +import "math" + + +// main +func main() { +} +`, + `package main + +import ( + "context" + "fmt" + "math" + "os" + + "github.com/daixiang0/test" +) + +// main +func main() { +} +`}, + { + "multiple-line-comment", + + commonConfig, + + `package proc + +import ( + "context" // in-line comment + "fmt" + "os" + + //nolint:depguard // A multi-line comment explaining why in + // this one case it's OK to use os/exec even though depguard + // is configured to force us to use dlib/exec instead. + "os/exec" + + "golang.org/x/sys/unix" + "github.com/local/dlib/dexec" +) +`, + `package proc + +import ( + "context" // in-line comment + "fmt" + "os" + //nolint:depguard // A multi-line comment explaining why in + // this one case it's OK to use os/exec even though depguard + // is configured to force us to use dlib/exec instead. + "os/exec" + + "github.com/local/dlib/dexec" + "golang.org/x/sys/unix" +) +`}, + { + "nochar-after-import", + + commonConfig, + + `package main + +import ( + "fmt" +) +`, + `package main + +import ( + "fmt" +) +`}, + { + "no-format", + + commonConfig, + + `package main + +import( +"fmt" + +g "github.com/golang" + +"github.com/daixiang0/gci" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" +) +`}, + { + "nolint", + + commonConfig, + + `package main + +import ( + "fmt" + + "github.com/forbidden/pkg" //nolint:depguard + + _ "github.com/daixiang0/gci" //nolint:depguard +) +`, + `package main + +import ( + "fmt" + + "github.com/forbidden/pkg" //nolint:depguard + + _ "github.com/daixiang0/gci" //nolint:depguard +) +`}, + { + "number-in-alias", + + commonConfig, + + `package main + +import ( + "fmt" + + go_V1 "github.com/golang" + + "github.com/daixiang0/gci" +) +`, + `package main + +import ( + "fmt" + + go_V1 "github.com/golang" + + "github.com/daixiang0/gci" +) +`}, + { + "one-import", + + commonConfig, + + `package main +import ( + "fmt" +) + +func main() { +} +`, + `package main +import ( + "fmt" +) + +func main() { +} +`}, + { + "one-import-one-line", + + commonConfig, + + `package main + +import "fmt" + +func main() { +} +`, + `package main + +import "fmt" + +func main() { +} +`}, + { + "one-line-import-after-import", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0) +`, + `package main + +import ( + "fmt" + "os" + + "github.com/daixiang0/test" +) + +import "context" +`, + `package main + +import ( + "context" + "fmt" + "os" + + "github.com/daixiang0/test" +) +`}, + { + "same-prefix-custom", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0/gci) + - Prefix(github.com/daixiang0/gci/subtest) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" + "github.com/daixiang0/gci/subtest" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" + + "github.com/daixiang0/gci/subtest" +) +`}, + { + "simple-case", + + commonConfig, + + `package main + +import ( + "golang.org/x/tools" + + "fmt" + + "github.com/daixiang0/gci" +) +`, + `package main + +import ( + "fmt" + + "golang.org/x/tools" + + "github.com/daixiang0/gci" +) +`}, + { + "whitespace-test", + + commonConfig, + + `package main + +import ( + "fmt" + "github.com/golang" // golang + alias "github.com/daixiang0/gci" +) +`, + `package main + +import ( + "fmt" + + "github.com/golang" // golang + + alias "github.com/daixiang0/gci" +) +`}, + { + "with-above-comment-and-alias", + + commonConfig, + + `package main + +import ( + "fmt" + // golang + _ "github.com/golang" + "github.com/daixiang0/gci" +) +`, + `package main + +import ( + "fmt" + + // golang + _ "github.com/golang" + + "github.com/daixiang0/gci" +) +`}, + { + "with-comment-and-alias", + + commonConfig, + + `package main + +import ( + "fmt" + _ "github.com/golang" // golang + "github.com/daixiang0/gci" +) +`, + `package main + +import ( + "fmt" + + _ "github.com/golang" // golang + + "github.com/daixiang0/gci" +) +`}, + { + "same-prefix-custom", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0/gci) + - Prefix(github.com/daixiang0/gci/subtest) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" + "github.com/daixiang0/gci/subtest" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" + + "github.com/daixiang0/gci/subtest" +) +`}, + { + "same-prefix-custom", + + `sections: + - Standard + - Default + - Prefix(github.com/daixiang0/gci) + - Prefix(github.com/daixiang0/gci/subtest) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" + "github.com/daixiang0/gci/subtest" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" + + "github.com/daixiang0/gci/subtest" +) +`}, + { + "blank-in-config", + + `sections: + - Standard + - Default + - Prefix( github.com/daixiang0/gci, github.com/daixiang0/gci/subtest ) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" + "github.com/daixiang0/gci/subtest" +) +`, + `package main + +import ( + "fmt" + + g "github.com/golang" + + "github.com/daixiang0/gci" + "github.com/daixiang0/gci/subtest" +) +`}, +} diff --git a/pkg/section/prefix.go b/pkg/section/prefix.go index a274347..30bdd8f 100644 --- a/pkg/section/prefix.go +++ b/pkg/section/prefix.go @@ -20,6 +20,7 @@ const CustomType = "custom" func (c Custom) MatchSpecificity(spec *parse.GciImports) specificity.MatchSpecificity { for _, prefix := range strings.Split(c.Prefix, CustomSeparator) { + prefix = strings.TrimSpace(prefix) if strings.HasPrefix(spec.Path, prefix) { return specificity.Match{Length: len(prefix)} } From a60fdab418e9bf8cf75c00ccda28ae4a0905ec44 Mon Sep 17 00:00:00 2001 From: Loong Date: Mon, 18 Sep 2023 13:04:23 +0800 Subject: [PATCH 2/2] fix CI Signed-off-by: Loong --- pkg/gci/gci_test.go | 1 - pkg/gci/testdata.go | 135 +++++++++++++++++++++++++++++--------------- 2 files changed, 90 insertions(+), 46 deletions(-) diff --git a/pkg/gci/gci_test.go b/pkg/gci/gci_test.go index 90559e8..86b9510 100644 --- a/pkg/gci/gci_test.go +++ b/pkg/gci/gci_test.go @@ -37,5 +37,4 @@ func TestRun(t *testing.T) { assert.Equal(t, testCases[i].out, string(new)) }) } - } diff --git a/pkg/gci/testdata.go b/pkg/gci/testdata.go index 9d61cd8..a48ce35 100644 --- a/pkg/gci/testdata.go +++ b/pkg/gci/testdata.go @@ -35,7 +35,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "blank-format", @@ -61,7 +62,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "cgo-block", @@ -84,7 +86,8 @@ import ( */ "C" ) -`}, +`, + }, { "cgo-block-after-import", @@ -120,7 +123,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "cgo-block-before-import", @@ -157,7 +161,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "cgo-block-mixed", @@ -176,7 +181,8 @@ import ( /* #include "types.h" */"C" ) -`}, +`, + }, { "cgo-block-mixed-with-content", @@ -195,7 +201,8 @@ import ( /* #include "types.h" #include "other.h" */"C" ) -`}, +`, + }, { "cgo-block-prefix", @@ -212,7 +219,8 @@ import ( import ( /* #include "types.h" */ "C" ) -`}, +`, + }, { "cgo-block-single-line", @@ -231,7 +239,8 @@ import ( /* #include "types.h" */ "C" ) -`}, +`, + }, { "cgo-line", @@ -250,7 +259,8 @@ import ( // #include "types.h" "C" ) -`}, +`, + }, { "cgo-multiline", @@ -271,7 +281,8 @@ import ( // #include "other.h" "C" ) -`}, +`, + }, { "cgo-single", @@ -304,7 +315,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "comment", @@ -321,7 +333,8 @@ import ( //Do not forget to run Gci "fmt" ) -`}, +`, + }, { "comment-before-import", @@ -346,7 +359,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "comment-in-the-tail", @@ -382,7 +396,8 @@ import ( type test int // test -`}, +`, + }, { "comment-top", @@ -403,7 +418,8 @@ import ( "fmt" "os" // https://pkg.go.dev/os ) -`}, +`, + }, { "comment-whithout-whitespace", @@ -420,7 +436,8 @@ import ( import ( "context"// no separating whitespace here //nolint:confusion ) -`}, +`, + }, { "comment-with-slashslash", @@ -437,7 +454,8 @@ import ( import ( "fmt" // https://pkg.go.dev/fmt ) -`}, +`, + }, { "custom-order", @@ -466,7 +484,8 @@ import ( "fmt" ) -`}, +`, + }, { "default-order", @@ -494,7 +513,8 @@ import ( "github.com/daixiang0/a" ) -`}, +`, + }, { "dot-and-blank", @@ -538,7 +558,8 @@ import ( . "github.com/daixiang0/gci/dot" . "github.com/golang/dot" ) -`}, +`, + }, { "duplicate-imports", @@ -568,7 +589,8 @@ import ( "github.com/daixiang0/gci" a "github.com/daixiang0/gci" ) -`}, +`, + }, { "grouped-multiple-custom", @@ -600,7 +622,8 @@ import ( "github.com/daixiang0/gci/subtest" "gitlab.com/daixiang0/gci" ) -`}, +`, + }, { "leading-comment", @@ -619,7 +642,8 @@ import ( // foo "fmt" ) -`}, +`, + }, { "linebreak", @@ -648,7 +672,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "linebreak-no-custom", @@ -673,7 +698,8 @@ import ( g "github.com/golang" ) -`}, +`, + }, { "mismatch-section", @@ -702,7 +728,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "multiple-custom", @@ -738,7 +765,8 @@ import ( "github.com/daixiang0/gci/subtest" ) -`}, +`, + }, { "multiple-imports", @@ -777,7 +805,8 @@ import ( // main func main() { } -`}, +`, + }, { "multiple-line-comment", @@ -813,7 +842,8 @@ import ( "github.com/local/dlib/dexec" "golang.org/x/sys/unix" ) -`}, +`, + }, { "nochar-after-import", @@ -830,7 +860,8 @@ import ( import ( "fmt" ) -`}, +`, + }, { "no-format", @@ -855,7 +886,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "nolint", @@ -880,7 +912,8 @@ import ( _ "github.com/daixiang0/gci" //nolint:depguard ) -`}, +`, + }, { "number-in-alias", @@ -905,7 +938,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "one-import", @@ -926,7 +960,8 @@ import ( func main() { } -`}, +`, + }, { "one-import-one-line", @@ -945,7 +980,8 @@ import "fmt" func main() { } -`}, +`, + }, { "one-line-import-after-import", @@ -974,7 +1010,8 @@ import ( "github.com/daixiang0/test" ) -`}, +`, + }, { "same-prefix-custom", @@ -1006,7 +1043,8 @@ import ( "github.com/daixiang0/gci/subtest" ) -`}, +`, + }, { "simple-case", @@ -1031,7 +1069,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "whitespace-test", @@ -1054,7 +1093,8 @@ import ( alias "github.com/daixiang0/gci" ) -`}, +`, + }, { "with-above-comment-and-alias", @@ -1079,7 +1119,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "with-comment-and-alias", @@ -1102,7 +1143,8 @@ import ( "github.com/daixiang0/gci" ) -`}, +`, + }, { "same-prefix-custom", @@ -1134,7 +1176,8 @@ import ( "github.com/daixiang0/gci/subtest" ) -`}, +`, + }, { "same-prefix-custom", @@ -1166,7 +1209,8 @@ import ( "github.com/daixiang0/gci/subtest" ) -`}, +`, + }, { "blank-in-config", @@ -1196,5 +1240,6 @@ import ( "github.com/daixiang0/gci" "github.com/daixiang0/gci/subtest" ) -`}, +`, + }, }