diff --git a/.golangci.example.yml b/.golangci.example.yml index 0c019f9d..3bca3787 100644 --- a/.golangci.example.yml +++ b/.golangci.example.yml @@ -68,6 +68,10 @@ linters-settings: gofmt: # simplify code: gofmt with `-s` option, true by default simplify: true + goimports: + # put imports beginning with prefix after 3rd-party packages; + # it's a comma-separated list of prefixes + local-prefixes: github.com/org/project gocyclo: # minimal code complexity to report, 30 by default (but we recommend 10-20) min-complexity: 10 diff --git a/.golangci.yml b/.golangci.yml index 9b34a15e..c6190f3a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -22,6 +22,8 @@ linters-settings: locale: US lll: line-length: 140 + goimports: + local-prefixes: github.com/golangci/golangci-lint linters: enable-all: true diff --git a/README.md b/README.md index f5684862..1fa0e503 100644 --- a/README.md +++ b/README.md @@ -518,6 +518,10 @@ linters-settings: gofmt: # simplify code: gofmt with `-s` option, true by default simplify: true + goimports: + # put imports beginning with prefix after 3rd-party packages; + # it's a comma-separated list of prefixes + local-prefixes: github.com/org/project gocyclo: # minimal code complexity to report, 30 by default (but we recommend 10-20) min-complexity: 10 @@ -655,6 +659,8 @@ linters-settings: locale: US lll: line-length: 140 + goimports: + local-prefixes: github.com/golangci/golangci-lint linters: enable-all: true diff --git a/pkg/commands/executor.go b/pkg/commands/executor.go index 55ff865d..7008a179 100644 --- a/pkg/commands/executor.go +++ b/pkg/commands/executor.go @@ -1,14 +1,15 @@ package commands import ( + "github.com/spf13/cobra" + "github.com/spf13/pflag" + "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/goutil" "github.com/golangci/golangci-lint/pkg/lint" "github.com/golangci/golangci-lint/pkg/lint/lintersdb" "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/report" - "github.com/spf13/cobra" - "github.com/spf13/pflag" ) type Executor struct { diff --git a/pkg/commands/help.go b/pkg/commands/help.go index ffcfc2d5..c0884a7a 100644 --- a/pkg/commands/help.go +++ b/pkg/commands/help.go @@ -6,9 +6,10 @@ import ( "strings" "github.com/fatih/color" + "github.com/spf13/cobra" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/spf13/cobra" ) func (e *Executor) initHelp() { diff --git a/pkg/commands/linters.go b/pkg/commands/linters.go index da581fdb..fada8084 100644 --- a/pkg/commands/linters.go +++ b/pkg/commands/linters.go @@ -5,8 +5,9 @@ import ( "os" "github.com/fatih/color" - "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/spf13/cobra" + + "github.com/golangci/golangci-lint/pkg/lint/linter" ) func (e *Executor) initLinters() { diff --git a/pkg/commands/root.go b/pkg/commands/root.go index 1a0c6c08..b0074fa7 100644 --- a/pkg/commands/root.go +++ b/pkg/commands/root.go @@ -6,10 +6,11 @@ import ( "runtime" "runtime/pprof" - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/logutils" "github.com/spf13/cobra" "github.com/spf13/pflag" + + "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/pkg/logutils" ) func (e *Executor) persistentPreRun(cmd *cobra.Command, args []string) { diff --git a/pkg/commands/run.go b/pkg/commands/run.go index 6ad7a6a2..0a6aabc6 100644 --- a/pkg/commands/run.go +++ b/pkg/commands/run.go @@ -11,6 +11,10 @@ import ( "time" "github.com/fatih/color" + "github.com/pkg/errors" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/exitcodes" "github.com/golangci/golangci-lint/pkg/lint" @@ -18,9 +22,6 @@ import ( "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/printers" "github.com/golangci/golangci-lint/pkg/result" - "github.com/pkg/errors" - "github.com/spf13/cobra" - "github.com/spf13/pflag" ) func getDefaultExcludeHelp() string { diff --git a/pkg/config/config.go b/pkg/config/config.go index d3a99dfd..f7266798 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -127,6 +127,9 @@ type LintersSettings struct { Gofmt struct { Simplify bool } + Goimports struct { + LocalPrefixes string `mapstructure:"local-prefixes"` + } Gocyclo struct { MinComplexity int `mapstructure:"min-complexity"` } diff --git a/pkg/config/reader.go b/pkg/config/reader.go index ac978ad5..9cd9af79 100644 --- a/pkg/config/reader.go +++ b/pkg/config/reader.go @@ -7,9 +7,10 @@ import ( "path/filepath" "strings" + "github.com/spf13/viper" + "github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/spf13/viper" ) type FileReader struct { diff --git a/pkg/golinters/deadcode.go b/pkg/golinters/deadcode.go index 4f7d74be..d6ab4f26 100644 --- a/pkg/golinters/deadcode.go +++ b/pkg/golinters/deadcode.go @@ -5,6 +5,7 @@ import ( "fmt" deadcodeAPI "github.com/golangci/go-misc/deadcode" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/golinters/depguard.go b/pkg/golinters/depguard.go index 72f5ed02..a00af5c9 100644 --- a/pkg/golinters/depguard.go +++ b/pkg/golinters/depguard.go @@ -6,6 +6,7 @@ import ( "strings" depguardAPI "github.com/OpenPeeDeeP/depguard" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/golinters/dupl.go b/pkg/golinters/dupl.go index a0d8ecc6..c31c8779 100644 --- a/pkg/golinters/dupl.go +++ b/pkg/golinters/dupl.go @@ -6,10 +6,11 @@ import ( "go/token" duplAPI "github.com/golangci/dupl" + "github.com/pkg/errors" + "github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - "github.com/pkg/errors" ) type Dupl struct{} diff --git a/pkg/golinters/errcheck.go b/pkg/golinters/errcheck.go index 62635b54..5d752aac 100644 --- a/pkg/golinters/errcheck.go +++ b/pkg/golinters/errcheck.go @@ -7,10 +7,11 @@ import ( "os" errcheckAPI "github.com/golangci/errcheck/golangci" + "github.com/pkg/errors" + "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - "github.com/pkg/errors" ) type Errcheck struct{} diff --git a/pkg/golinters/gas.go b/pkg/golinters/gas.go index 665e0ac7..c156bf33 100644 --- a/pkg/golinters/gas.go +++ b/pkg/golinters/gas.go @@ -8,10 +8,11 @@ import ( "log" "strconv" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/gosec" "github.com/golangci/gosec/rules" + + "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/result" ) type Gosec struct{} diff --git a/pkg/golinters/goconst.go b/pkg/golinters/goconst.go index 7ac8b0f6..87011df9 100644 --- a/pkg/golinters/goconst.go +++ b/pkg/golinters/goconst.go @@ -5,6 +5,7 @@ import ( "fmt" goconstAPI "github.com/golangci/goconst" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/golinters/gocyclo.go b/pkg/golinters/gocyclo.go index d9b43d87..0681c75e 100644 --- a/pkg/golinters/gocyclo.go +++ b/pkg/golinters/gocyclo.go @@ -6,6 +6,7 @@ import ( "sort" gocycloAPI "github.com/golangci/gocyclo/pkg/gocyclo" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/golinters/gofmt.go b/pkg/golinters/gofmt.go index 5bd622ff..c121784f 100644 --- a/pkg/golinters/gofmt.go +++ b/pkg/golinters/gofmt.go @@ -6,12 +6,15 @@ import ( "fmt" "go/token" + "golang.org/x/tools/imports" + gofmtAPI "github.com/golangci/gofmt/gofmt" goimportsAPI "github.com/golangci/gofmt/goimports" + "sourcegraph.com/sourcegraph/go-diff/diff" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/result" - "sourcegraph.com/sourcegraph/go-diff/diff" ) type Gofmt struct { @@ -109,6 +112,7 @@ func (g Gofmt) Run(ctx context.Context, lintCtx *linter.Context) ([]result.Issue var diff []byte var err error if g.UseGoimports { + imports.LocalPrefix = lintCtx.Settings().Goimports.LocalPrefixes diff, err = goimportsAPI.Run(f) } else { diff, err = gofmtAPI.Run(f, lintCtx.Settings().Gofmt.Simplify) diff --git a/pkg/golinters/golint.go b/pkg/golinters/golint.go index cf251518..07be07e9 100644 --- a/pkg/golinters/golint.go +++ b/pkg/golinters/golint.go @@ -6,9 +6,10 @@ import ( "go/ast" "go/token" + lintAPI "github.com/golangci/lint-1" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - lintAPI "github.com/golangci/lint-1" ) type Golint struct{} diff --git a/pkg/golinters/govet.go b/pkg/golinters/govet.go index 64335b97..17af8ae6 100644 --- a/pkg/golinters/govet.go +++ b/pkg/golinters/govet.go @@ -5,10 +5,11 @@ import ( "go/ast" "go/token" + govetAPI "github.com/golangci/govet" + "github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - govetAPI "github.com/golangci/govet" ) type Govet struct{} diff --git a/pkg/golinters/ineffassign.go b/pkg/golinters/ineffassign.go index 72a9f310..b5d047b6 100644 --- a/pkg/golinters/ineffassign.go +++ b/pkg/golinters/ineffassign.go @@ -4,9 +4,10 @@ import ( "context" "fmt" + ineffassignAPI "github.com/golangci/ineffassign" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - ineffassignAPI "github.com/golangci/ineffassign" ) type Ineffassign struct{} diff --git a/pkg/golinters/interfacer.go b/pkg/golinters/interfacer.go index 2f8e8779..b8f7f8c4 100644 --- a/pkg/golinters/interfacer.go +++ b/pkg/golinters/interfacer.go @@ -3,9 +3,10 @@ package golinters import ( "context" + "github.com/golangci/interfacer/check" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - "github.com/golangci/interfacer/check" ) type Interfacer struct{} diff --git a/pkg/golinters/maligned.go b/pkg/golinters/maligned.go index e90bc9a4..624a7774 100644 --- a/pkg/golinters/maligned.go +++ b/pkg/golinters/maligned.go @@ -4,9 +4,10 @@ import ( "context" "fmt" + malignedAPI "github.com/golangci/maligned" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - malignedAPI "github.com/golangci/maligned" ) type Maligned struct{} diff --git a/pkg/golinters/megacheck.go b/pkg/golinters/megacheck.go index d33d9e5d..f1dc9e5e 100644 --- a/pkg/golinters/megacheck.go +++ b/pkg/golinters/megacheck.go @@ -11,12 +11,13 @@ import ( "github.com/golangci/go-tools/simple" "github.com/golangci/go-tools/staticcheck" "github.com/golangci/go-tools/unused" - "github.com/golangci/golangci-lint/pkg/fsutils" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/tools/go/ssa" "golang.org/x/tools/go/loader" "golang.org/x/tools/go/packages" + + "github.com/golangci/golangci-lint/pkg/fsutils" + "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/result" ) const megacheckName = "megacheck" diff --git a/pkg/golinters/misspell.go b/pkg/golinters/misspell.go index 46fcccc9..90aab384 100644 --- a/pkg/golinters/misspell.go +++ b/pkg/golinters/misspell.go @@ -7,9 +7,10 @@ import ( "io/ioutil" "strings" + "github.com/golangci/misspell" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - "github.com/golangci/misspell" ) type Misspell struct{} diff --git a/pkg/golinters/prealloc.go b/pkg/golinters/prealloc.go index 03330a93..6b2e032c 100644 --- a/pkg/golinters/prealloc.go +++ b/pkg/golinters/prealloc.go @@ -5,9 +5,10 @@ import ( "fmt" "go/ast" + "github.com/golangci/prealloc" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - "github.com/golangci/prealloc" ) type Prealloc struct{} diff --git a/pkg/golinters/structcheck.go b/pkg/golinters/structcheck.go index 9fd431fa..4b6b106f 100644 --- a/pkg/golinters/structcheck.go +++ b/pkg/golinters/structcheck.go @@ -5,6 +5,7 @@ import ( "fmt" structcheckAPI "github.com/golangci/check/cmd/structcheck" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/golinters/typecheck.go b/pkg/golinters/typecheck.go index c893196c..fd32f165 100644 --- a/pkg/golinters/typecheck.go +++ b/pkg/golinters/typecheck.go @@ -7,10 +7,11 @@ import ( "strconv" "strings" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" "github.com/pkg/errors" "golang.org/x/tools/go/packages" + + "github.com/golangci/golangci-lint/pkg/lint/linter" + "github.com/golangci/golangci-lint/pkg/result" ) type TypeCheck struct{} diff --git a/pkg/golinters/unconvert.go b/pkg/golinters/unconvert.go index 22ca8082..20ba45dc 100644 --- a/pkg/golinters/unconvert.go +++ b/pkg/golinters/unconvert.go @@ -3,9 +3,10 @@ package golinters import ( "context" + unconvertAPI "github.com/golangci/unconvert" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - unconvertAPI "github.com/golangci/unconvert" ) type Unconvert struct{} diff --git a/pkg/golinters/unparam.go b/pkg/golinters/unparam.go index ffc6917c..8ea2f8e9 100644 --- a/pkg/golinters/unparam.go +++ b/pkg/golinters/unparam.go @@ -3,9 +3,10 @@ package golinters import ( "context" + "github.com/golangci/unparam/check" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" - "github.com/golangci/unparam/check" ) type Unparam struct{} diff --git a/pkg/golinters/util.go b/pkg/golinters/util.go index 09938d08..5dd2669b 100644 --- a/pkg/golinters/util.go +++ b/pkg/golinters/util.go @@ -8,9 +8,10 @@ import ( "strings" "sync" + gopackages "golang.org/x/tools/go/packages" + "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/lint/linter" - gopackages "golang.org/x/tools/go/packages" ) func formatCode(code string, _ *config.Config) string { diff --git a/pkg/golinters/varcheck.go b/pkg/golinters/varcheck.go index 8e506e98..17e2eee6 100644 --- a/pkg/golinters/varcheck.go +++ b/pkg/golinters/varcheck.go @@ -5,6 +5,7 @@ import ( "fmt" varcheckAPI "github.com/golangci/check/cmd/varcheck" + "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/goutil/env.go b/pkg/goutil/env.go index acc472b2..76e63ff3 100644 --- a/pkg/goutil/env.go +++ b/pkg/goutil/env.go @@ -9,8 +9,9 @@ import ( "strconv" "strings" - "github.com/golangci/golangci-lint/pkg/logutils" "github.com/pkg/errors" + + "github.com/golangci/golangci-lint/pkg/logutils" ) type Env struct { diff --git a/pkg/lint/astcache/astcache.go b/pkg/lint/astcache/astcache.go index f4227b97..1505c8bd 100644 --- a/pkg/lint/astcache/astcache.go +++ b/pkg/lint/astcache/astcache.go @@ -8,8 +8,9 @@ import ( "strings" "time" - "github.com/golangci/golangci-lint/pkg/logutils" "golang.org/x/tools/go/packages" + + "github.com/golangci/golangci-lint/pkg/logutils" ) type File struct { diff --git a/pkg/lint/linter/context.go b/pkg/lint/linter/context.go index 27eea8a2..443f7d60 100644 --- a/pkg/lint/linter/context.go +++ b/pkg/lint/linter/context.go @@ -1,12 +1,13 @@ package linter import ( - "github.com/golangci/golangci-lint/pkg/config" - "github.com/golangci/golangci-lint/pkg/lint/astcache" - "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/tools/go/ssa" "golang.org/x/tools/go/loader" "golang.org/x/tools/go/packages" + + "github.com/golangci/golangci-lint/pkg/config" + "github.com/golangci/golangci-lint/pkg/lint/astcache" + "github.com/golangci/golangci-lint/pkg/logutils" ) type Context struct { diff --git a/pkg/lint/lintersdb/enabled_set_test.go b/pkg/lint/lintersdb/enabled_set_test.go index 6367037d..de4144ad 100644 --- a/pkg/lint/lintersdb/enabled_set_test.go +++ b/pkg/lint/lintersdb/enabled_set_test.go @@ -4,9 +4,10 @@ import ( "sort" "testing" + "github.com/stretchr/testify/assert" + "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/stretchr/testify/assert" ) func TestGetEnabledLintersSet(t *testing.T) { diff --git a/pkg/lint/load.go b/pkg/lint/load.go index 7c507d2b..ab03184f 100644 --- a/pkg/lint/load.go +++ b/pkg/lint/load.go @@ -10,17 +10,18 @@ import ( "strings" "time" + "github.com/golangci/tools/go/ssa" + "github.com/golangci/tools/go/ssa/ssautil" + "github.com/pkg/errors" + "golang.org/x/tools/go/loader" + "golang.org/x/tools/go/packages" + "github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/exitcodes" "github.com/golangci/golangci-lint/pkg/goutil" "github.com/golangci/golangci-lint/pkg/lint/astcache" "github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/logutils" - "github.com/golangci/tools/go/ssa" - "github.com/golangci/tools/go/ssa/ssautil" - "github.com/pkg/errors" - "golang.org/x/tools/go/loader" - "golang.org/x/tools/go/packages" ) type ContextLoader struct { diff --git a/pkg/logutils/stderr_log.go b/pkg/logutils/stderr_log.go index ffccb11f..10a3ed03 100644 --- a/pkg/logutils/stderr_log.go +++ b/pkg/logutils/stderr_log.go @@ -4,8 +4,9 @@ import ( "fmt" "os" - "github.com/golangci/golangci-lint/pkg/exitcodes" "github.com/sirupsen/logrus" //nolint:depguard + + "github.com/golangci/golangci-lint/pkg/exitcodes" ) type StderrLog struct { diff --git a/pkg/printers/tab.go b/pkg/printers/tab.go index 56170bbd..51ad0d70 100644 --- a/pkg/printers/tab.go +++ b/pkg/printers/tab.go @@ -7,6 +7,7 @@ import ( "text/tabwriter" "github.com/fatih/color" + "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/printers/text.go b/pkg/printers/text.go index e173fb3c..1b2a61db 100644 --- a/pkg/printers/text.go +++ b/pkg/printers/text.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/fatih/color" + "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/result" ) diff --git a/pkg/result/processors/cgo.go b/pkg/result/processors/cgo.go index 1095bef3..9867cbff 100644 --- a/pkg/result/processors/cgo.go +++ b/pkg/result/processors/cgo.go @@ -4,9 +4,10 @@ import ( "path/filepath" "strings" + "github.com/pkg/errors" + "github.com/golangci/golangci-lint/pkg/goutil" "github.com/golangci/golangci-lint/pkg/result" - "github.com/pkg/errors" ) type Cgo struct { diff --git a/pkg/result/processors/diff.go b/pkg/result/processors/diff.go index 42b9d8a0..fc4aba4b 100644 --- a/pkg/result/processors/diff.go +++ b/pkg/result/processors/diff.go @@ -8,8 +8,9 @@ import ( "os" "strings" - "github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/revgrep" + + "github.com/golangci/golangci-lint/pkg/result" ) type Diff struct { diff --git a/pkg/result/processors/exclude_test.go b/pkg/result/processors/exclude_test.go index fa19a49d..7f68d908 100644 --- a/pkg/result/processors/exclude_test.go +++ b/pkg/result/processors/exclude_test.go @@ -3,8 +3,9 @@ package processors import ( "testing" - "github.com/golangci/golangci-lint/pkg/result" "github.com/stretchr/testify/assert" + + "github.com/golangci/golangci-lint/pkg/result" ) func newTextIssue(text string) result.Issue { diff --git a/pkg/result/processors/nolint_test.go b/pkg/result/processors/nolint_test.go index 562b11e4..6ba0778b 100644 --- a/pkg/result/processors/nolint_test.go +++ b/pkg/result/processors/nolint_test.go @@ -7,10 +7,11 @@ import ( "testing" "github.com/golang/mock/gomock" + "github.com/stretchr/testify/assert" + "github.com/golangci/golangci-lint/pkg/lint/astcache" "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/result" - "github.com/stretchr/testify/assert" ) func newNolintFileIssue(line int, fromLinter string) result.Issue { diff --git a/pkg/result/processors/skip_dirs.go b/pkg/result/processors/skip_dirs.go index 2728d5af..b290f773 100644 --- a/pkg/result/processors/skip_dirs.go +++ b/pkg/result/processors/skip_dirs.go @@ -6,10 +6,11 @@ import ( "sort" "strings" + "github.com/pkg/errors" + "github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/result" - "github.com/pkg/errors" ) type SkipDirs struct { diff --git a/pkg/result/processors/skip_files_test.go b/pkg/result/processors/skip_files_test.go index df557a05..92c50ca7 100644 --- a/pkg/result/processors/skip_files_test.go +++ b/pkg/result/processors/skip_files_test.go @@ -4,8 +4,9 @@ import ( "go/token" "testing" - "github.com/golangci/golangci-lint/pkg/result" "github.com/stretchr/testify/assert" + + "github.com/golangci/golangci-lint/pkg/result" ) func newFileIssue(file string) result.Issue { diff --git a/test/bench_test.go b/test/bench_test.go index ddbf8450..0e1021a3 100644 --- a/test/bench_test.go +++ b/test/bench_test.go @@ -13,9 +13,10 @@ import ( "testing" "time" - "github.com/golangci/golangci-lint/pkg/config" gops "github.com/mitchellh/go-ps" "github.com/shirou/gopsutil/process" + + "github.com/golangci/golangci-lint/pkg/config" ) func chdir(b *testing.B, dir string) { diff --git a/test/linters_test.go b/test/linters_test.go index 5d14e357..70c59c42 100644 --- a/test/linters_test.go +++ b/test/linters_test.go @@ -9,8 +9,9 @@ import ( "strings" "testing" - "github.com/golangci/golangci-lint/pkg/exitcodes" assert "github.com/stretchr/testify/require" + + "github.com/golangci/golangci-lint/pkg/exitcodes" ) func runGoErrchk(c *exec.Cmd, t *testing.T) { diff --git a/test/run_test.go b/test/run_test.go index 393c4d44..18fa429a 100644 --- a/test/run_test.go +++ b/test/run_test.go @@ -13,9 +13,10 @@ import ( "syscall" "testing" + assert "github.com/stretchr/testify/require" + "github.com/golangci/golangci-lint/pkg/exitcodes" "github.com/golangci/golangci-lint/pkg/lint/lintersdb" - assert "github.com/stretchr/testify/require" ) var root = filepath.Join("..", "...")