Group imports by package.

This commit is contained in:
Trevor Pounds 2019-09-27 20:58:49 -04:00
parent df4f6766ba
commit 6d786b50ae
37 changed files with 74 additions and 116 deletions

@ -1,6 +1,8 @@
package errorutil package errorutil
import "fmt" import (
"fmt"
)
// PanicError can be used to not print stacktrace twice // PanicError can be used to not print stacktrace twice
type PanicError struct { type PanicError struct {

@ -9,14 +9,12 @@ import (
"sort" "sort"
"sync" "sync"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/timeutils"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/tools/go/packages" "golang.org/x/tools/go/packages"
"github.com/golangci/golangci-lint/internal/cache" "github.com/golangci/golangci-lint/internal/cache"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/timeutils"
) )
// Cache is a per-package data cache. A cached data is invalidated when // Cache is a per-package data cache. A cached data is invalidated when

@ -4,12 +4,11 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/golangci/golangci-lint/pkg/exitcodes" "github.com/golangci/golangci-lint/pkg/exitcodes"
"github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/spf13/cobra"
) )
func (e *Executor) initConfig() { func (e *Executor) initConfig() {

@ -5,19 +5,16 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load"
"github.com/golangci/golangci-lint/internal/pkgcache" "github.com/golangci/golangci-lint/internal/pkgcache"
"github.com/golangci/golangci-lint/pkg/timeutils"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load"
"github.com/golangci/golangci-lint/pkg/goutil" "github.com/golangci/golangci-lint/pkg/goutil"
"github.com/golangci/golangci-lint/pkg/lint" "github.com/golangci/golangci-lint/pkg/lint"
"github.com/golangci/golangci-lint/pkg/lint/lintersdb" "github.com/golangci/golangci-lint/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/report" "github.com/golangci/golangci-lint/pkg/report"
"github.com/golangci/golangci-lint/pkg/timeutils"
) )
type Executor struct { type Executor struct {

@ -10,9 +10,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/golangci/golangci-lint/pkg/packages"
"github.com/golangci/golangci-lint/pkg/result/processors"
"github.com/fatih/color" "github.com/fatih/color"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -23,8 +20,10 @@ import (
"github.com/golangci/golangci-lint/pkg/lint" "github.com/golangci/golangci-lint/pkg/lint"
"github.com/golangci/golangci-lint/pkg/lint/lintersdb" "github.com/golangci/golangci-lint/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/packages"
"github.com/golangci/golangci-lint/pkg/printers" "github.com/golangci/golangci-lint/pkg/printers"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
"github.com/golangci/golangci-lint/pkg/result/processors"
) )
func getDefaultIssueExcludeHelp() string { func getDefaultIssueExcludeHelp() string {

@ -7,12 +7,11 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/logutils"
homedir "github.com/mitchellh/go-homedir"
) )
type FileReader struct { type FileReader struct {

@ -5,9 +5,9 @@ import (
"io/ioutil" "io/ioutil"
"sync" "sync"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/golangci/golangci-lint/pkg/logutils"
) )
type FileCache struct { type FileCache struct {

@ -5,33 +5,31 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/OpenPeeDeeP/depguard"
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/loader" "golang.org/x/tools/go/loader"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
depguardAPI "github.com/OpenPeeDeeP/depguard"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )
func setDepguardListType(dg *depguardAPI.Depguard, lintCtx *linter.Context) error { func setDepguardListType(dg *depguard.Depguard, lintCtx *linter.Context) error {
listType := lintCtx.Settings().Depguard.ListType listType := lintCtx.Settings().Depguard.ListType
var found bool var found bool
dg.ListType, found = depguardAPI.StringToListType[strings.ToLower(listType)] dg.ListType, found = depguard.StringToListType[strings.ToLower(listType)]
if !found { if !found {
if listType != "" { if listType != "" {
return fmt.Errorf("unsure what list type %s is", listType) return fmt.Errorf("unsure what list type %s is", listType)
} }
dg.ListType = depguardAPI.LTBlacklist dg.ListType = depguard.LTBlacklist
} }
return nil return nil
} }
func setupDepguardPackages(dg *depguardAPI.Depguard, lintCtx *linter.Context) { func setupDepguardPackages(dg *depguard.Depguard, lintCtx *linter.Context) {
if dg.ListType == depguardAPI.LTBlacklist { if dg.ListType == depguard.LTBlacklist {
// if the list type was a blacklist the packages with error messages should // if the list type was a blacklist the packages with error messages should
// be included in the blacklist package list // be included in the blacklist package list
@ -66,7 +64,7 @@ func NewDepguard() *goanalysis.Linter {
dgSettings := &lintCtx.Settings().Depguard dgSettings := &lintCtx.Settings().Depguard
analyzer.Run = func(pass *analysis.Pass) (interface{}, error) { analyzer.Run = func(pass *analysis.Pass) (interface{}, error) {
prog := goanalysis.MakeFakeLoaderProgram(pass) prog := goanalysis.MakeFakeLoaderProgram(pass)
dg := &depguardAPI.Depguard{ dg := &depguard.Depguard{
Packages: dgSettings.Packages, Packages: dgSettings.Packages,
IncludeGoRoot: dgSettings.IncludeGoRoot, IncludeGoRoot: dgSettings.IncludeGoRoot,
} }
@ -87,7 +85,7 @@ func NewDepguard() *goanalysis.Linter {
return nil, nil return nil, nil
} }
msgSuffix := "is in the blacklist" msgSuffix := "is in the blacklist"
if dg.ListType == depguardAPI.LTWhitelist { if dg.ListType == depguard.LTWhitelist {
msgSuffix = "is not in the whitelist" msgSuffix = "is not in the whitelist"
} }
res := make([]result.Issue, 0, len(issues)) res := make([]result.Issue, 0, len(issues))

@ -10,15 +10,13 @@ import (
"strings" "strings"
"sync" "sync"
"golang.org/x/tools/go/analysis" errcheck "github.com/golangci/errcheck/golangci"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
errcheckAPI "github.com/golangci/errcheck/golangci"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/tools/go/analysis"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )
@ -44,7 +42,7 @@ func NewErrcheck() *goanalysis.Linter {
if err != nil { if err != nil {
return nil, err return nil, err
} }
errcheckIssues, err := errcheckAPI.RunWithConfig(prog, errCfg) errcheckIssues, err := errcheck.RunWithConfig(prog, errCfg)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -106,13 +104,13 @@ func parseIgnoreConfig(s string) (map[string]*regexp.Regexp, error) {
return cfg, nil return cfg, nil
} }
func genConfig(errCfg *config.ErrcheckSettings) (*errcheckAPI.Config, error) { func genConfig(errCfg *config.ErrcheckSettings) (*errcheck.Config, error) {
ignoreConfig, err := parseIgnoreConfig(errCfg.Ignore) ignoreConfig, err := parseIgnoreConfig(errCfg.Ignore)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to parse 'ignore' directive") return nil, errors.Wrap(err, "failed to parse 'ignore' directive")
} }
c := &errcheckAPI.Config{ c := &errcheck.Config{
Ignore: ignoreConfig, Ignore: ignoreConfig,
Blank: errCfg.CheckAssignToBlank, Blank: errCfg.CheckAssignToBlank,
Asserts: errCfg.CheckTypeAssertions, Asserts: errCfg.CheckTypeAssertions,

@ -5,13 +5,12 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/ultraware/funlen"
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
"github.com/ultraware/funlen"
) )
const funlenLinterName = "funlen" const funlenLinterName = "funlen"

@ -28,20 +28,16 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"golang.org/x/tools/go/types/objectpath" "github.com/pkg/errors"
"golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/gcexportdata" "golang.org/x/tools/go/gcexportdata"
"golang.org/x/tools/go/packages"
"golang.org/x/tools/go/types/objectpath"
"github.com/golangci/golangci-lint/internal/errorutil" "github.com/golangci/golangci-lint/internal/errorutil"
"github.com/golangci/golangci-lint/internal/pkgcache" "github.com/golangci/golangci-lint/internal/pkgcache"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load"
"github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/logutils"
"github.com/pkg/errors"
"golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/packages"
) )
var ( var (

@ -10,7 +10,6 @@ import (
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )

@ -10,14 +10,11 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/go-lintpack/lintpack"
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/go-lintpack/lintpack"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )

@ -6,7 +6,6 @@ import (
"sync" "sync"
"github.com/matoous/godox" "github.com/matoous/godox"
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis"

@ -8,14 +8,12 @@ import (
"strconv" "strconv"
"sync" "sync"
"github.com/securego/gosec"
"github.com/securego/gosec/rules"
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/packages" "golang.org/x/tools/go/packages"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/securego/gosec"
"github.com/securego/gosec/rules"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )

@ -3,10 +3,6 @@ package golinters
import ( import (
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
// analysis plug-ins // analysis plug-ins
"golang.org/x/tools/go/analysis/passes/asmdecl" "golang.org/x/tools/go/analysis/passes/asmdecl"
"golang.org/x/tools/go/analysis/passes/assign" "golang.org/x/tools/go/analysis/passes/assign"
@ -40,6 +36,9 @@ import (
"golang.org/x/tools/go/analysis/passes/unreachable" "golang.org/x/tools/go/analysis/passes/unreachable"
"golang.org/x/tools/go/analysis/passes/unsafeptr" "golang.org/x/tools/go/analysis/passes/unsafeptr"
"golang.org/x/tools/go/analysis/passes/unusedresult" "golang.org/x/tools/go/analysis/passes/unusedresult"
"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
) )
func getAllAnalyzers() []*analysis.Analyzer { func getAllAnalyzers() []*analysis.Analyzer {

@ -4,8 +4,6 @@ import (
"sort" "sort"
"testing" "testing"
"github.com/golangci/golangci-lint/pkg/config"
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/analysis/passes/asmdecl" "golang.org/x/tools/go/analysis/passes/asmdecl"
"golang.org/x/tools/go/analysis/passes/assign" "golang.org/x/tools/go/analysis/passes/assign"
@ -14,6 +12,8 @@ import (
"golang.org/x/tools/go/analysis/passes/buildtag" "golang.org/x/tools/go/analysis/passes/buildtag"
"golang.org/x/tools/go/analysis/passes/cgocall" "golang.org/x/tools/go/analysis/passes/cgocall"
"golang.org/x/tools/go/analysis/passes/shadow" "golang.org/x/tools/go/analysis/passes/shadow"
"github.com/golangci/golangci-lint/pkg/config"
) )
func TestGovet(t *testing.T) { func TestGovet(t *testing.T) {

@ -4,12 +4,10 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/golangci/ineffassign"
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
ineffassignAPI "github.com/golangci/ineffassign"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )
@ -37,7 +35,7 @@ func NewIneffassign() *goanalysis.Linter {
fileNames = append(fileNames, pos.Filename) fileNames = append(fileNames, pos.Filename)
} }
issues := ineffassignAPI.Run(fileNames) issues := ineffassign.Run(fileNames)
if len(issues) == 0 { if len(issues) == 0 {
return nil, nil return nil, nil
} }

@ -5,11 +5,9 @@ import (
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"golang.org/x/tools/go/analysis/passes/buildssa" "golang.org/x/tools/go/analysis/passes/buildssa"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"mvdan.cc/interfacer/check" "mvdan.cc/interfacer/check"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )

@ -3,9 +3,9 @@ package golinters
import ( import (
"fmt" "fmt"
"github.com/golangci/golangci-lint/pkg/logutils"
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"github.com/golangci/golangci-lint/pkg/logutils"
) )
var debugf = logutils.Debug("megacheck") var debugf = logutils.Debug("megacheck")

@ -4,10 +4,9 @@ import (
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"honnef.co/go/tools/unused" "honnef.co/go/tools/unused"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
) )
func NewUnused() *goanalysis.Linter { func NewUnused() *goanalysis.Linter {

@ -5,13 +5,12 @@ import (
"sync" "sync"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/ultraware/whitespace"
"golang.org/x/tools/go/analysis" "golang.org/x/tools/go/analysis"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
"github.com/ultraware/whitespace"
) )
func NewWhitespace() *goanalysis.Linter { func NewWhitespace() *goanalysis.Linter {

@ -3,9 +3,8 @@ package lintersdb
import ( import (
"sort" "sort"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/logutils"
) )

@ -4,7 +4,6 @@ import (
"os" "os"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/golinters" "github.com/golangci/golangci-lint/pkg/golinters"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
) )

@ -11,17 +11,14 @@ import (
"strings" "strings"
"time" "time"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load"
"github.com/golangci/golangci-lint/internal/pkgcache"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/tools/go/packages" "golang.org/x/tools/go/packages"
"github.com/golangci/golangci-lint/internal/pkgcache"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/exitcodes" "github.com/golangci/golangci-lint/pkg/exitcodes"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load"
"github.com/golangci/golangci-lint/pkg/goutil" "github.com/golangci/golangci-lint/pkg/goutil"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/logutils"

@ -7,13 +7,11 @@ import (
"strings" "strings"
"github.com/golangci/golangci-lint/internal/errorutil" "github.com/golangci/golangci-lint/internal/errorutil"
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/goutil" "github.com/golangci/golangci-lint/pkg/goutil"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/packages" "github.com/golangci/golangci-lint/pkg/packages"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"

@ -1,6 +1,8 @@
package result package result
import "go/token" import (
"go/token"
)
type Range struct { type Range struct {
From, To int From, To int

@ -3,10 +3,8 @@ package processors
import ( import (
"regexp" "regexp"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/fsutils" "github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )

@ -5,10 +5,9 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )

@ -8,16 +8,13 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/golangci/golangci-lint/pkg/timeutils"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/fsutils"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
"github.com/golangci/golangci-lint/pkg/timeutils"
) )
type Fixer struct { type Fixer struct {

@ -4,7 +4,6 @@ import (
"sort" "sort"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/logutils" "github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )

@ -1,6 +1,8 @@
package processors package processors
import "github.com/golangci/golangci-lint/pkg/result" import (
"github.com/golangci/golangci-lint/pkg/result"
)
type Processor interface { type Processor interface {
Process(issues []result.Issue) ([]result.Issue, error) Process(issues []result.Issue) ([]result.Issue, error)

@ -5,7 +5,6 @@ import (
"testing" "testing"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/result" "github.com/golangci/golangci-lint/pkg/result"
) )

@ -13,12 +13,11 @@ import (
"testing" "testing"
"time" "time"
"github.com/golangci/golangci-lint/test/testshared"
gops "github.com/mitchellh/go-ps" gops "github.com/mitchellh/go-ps"
"github.com/shirou/gopsutil/process" "github.com/shirou/gopsutil/process"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/test/testshared"
) )
func chdir(b *testing.B, dir string) { func chdir(b *testing.B, dir string) {

@ -1,6 +1,8 @@
package test package test
import "path/filepath" import (
"path/filepath"
)
const testdataDir = "testdata" const testdataDir = "testdata"
const binName = "../golangci-lint" const binName = "../golangci-lint"

@ -9,11 +9,10 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/golangci/golangci-lint/test/testshared"
assert "github.com/stretchr/testify/require" assert "github.com/stretchr/testify/require"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
"github.com/golangci/golangci-lint/test/testshared"
) )
func runGoErrchk(c *exec.Cmd, files []string, t *testing.T) { func runGoErrchk(c *exec.Cmd, files []string, t *testing.T) {

@ -6,12 +6,10 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
_ "github.com/valyala/quicktemplate"
"github.com/golangci/golangci-lint/test/testshared"
"github.com/golangci/golangci-lint/pkg/exitcodes" "github.com/golangci/golangci-lint/pkg/exitcodes"
"github.com/golangci/golangci-lint/test/testshared"
_ "github.com/valyala/quicktemplate"
) )
func getCommonRunArgs() []string { func getCommonRunArgs() []string {