golangci · tpounds · Oct 1, 2019 · Sep 28, 2019
diff --git a/internal/errorutil/errors.go b/internal/errorutil/errors.go
@@ -1,6 +1,8 @@
 package errorutil
 
-import "fmt"
+import (
+	"fmt"
+)
 
 // PanicError can be used to not print stacktrace twice
 type PanicError struct {

diff --git a/internal/pkgcache/pkgcache.go b/internal/pkgcache/pkgcache.go
@@ -9,14 +9,12 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/golangci/golangci-lint/pkg/logutils"
-
-	"github.com/golangci/golangci-lint/pkg/timeutils"
-
 	"github.com/pkg/errors"
 	"golang.org/x/tools/go/packages"
 
 	"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

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

diff --git a/pkg/commands/executor.go b/pkg/commands/executor.go
@@ -5,19 +5,16 @@ import (
 	"github.com/spf13/cobra"
 	"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/pkg/timeutils"
-
-	"github.com/golangci/golangci-lint/pkg/fsutils"
-
 	"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/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/golangci/golangci-lint/pkg/timeutils"
 )
 
 type Executor struct {

diff --git a/pkg/commands/run.go b/pkg/commands/run.go
@@ -10,9 +10,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golangci/golangci-lint/pkg/packages"
-	"github.com/golangci/golangci-lint/pkg/result/processors"
-
 	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -23,8 +20,10 @@ import (
 	"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/packages"
 	"github.com/golangci/golangci-lint/pkg/printers"
 	"github.com/golangci/golangci-lint/pkg/result"
+	"github.com/golangci/golangci-lint/pkg/result/processors"
 )
 
 func getDefaultIssueExcludeHelp() string {

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

diff --git a/pkg/fsutils/filecache.go b/pkg/fsutils/filecache.go
@@ -5,9 +5,9 @@ import (
 	"io/ioutil"
 	"sync"
 
-	"github.com/golangci/golangci-lint/pkg/logutils"
-
 	"github.com/pkg/errors"
+
+	"github.com/golangci/golangci-lint/pkg/logutils"
 )
 
 type FileCache struct {

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

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

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

diff --git a/pkg/golinters/goanalysis/runner.go b/pkg/golinters/goanalysis/runner.go
@@ -28,20 +28,16 @@ import (
 	"sync/atomic"
 	"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/packages"
+	"golang.org/x/tools/go/types/objectpath"
 
 	"github.com/golangci/golangci-lint/internal/errorutil"
 	"github.com/golangci/golangci-lint/internal/pkgcache"
-
 	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis/load"
 	"github.com/golangci/golangci-lint/pkg/logutils"
-
-	"github.com/pkg/errors"
-
-	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/packages"
 )
 
 var (

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

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

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

diff --git a/pkg/golinters/gosec.go b/pkg/golinters/gosec.go
@@ -8,14 +8,12 @@ import (
 	"strconv"
 	"sync"
 
+	"github.com/securego/gosec"
+	"github.com/securego/gosec/rules"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/packages"
 
 	"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/result"
 )

diff --git a/pkg/golinters/govet.go b/pkg/golinters/govet.go
@@ -3,10 +3,6 @@ package golinters
 import (
 	"golang.org/x/tools/go/analysis"
 
-	"github.com/golangci/golangci-lint/pkg/config"
-
-	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
-
 	// analysis plug-ins
 	"golang.org/x/tools/go/analysis/passes/asmdecl"
 	"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/unsafeptr"
 	"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 {

diff --git a/pkg/golinters/govet_test.go b/pkg/golinters/govet_test.go
@@ -4,8 +4,6 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/golangci/golangci-lint/pkg/config"
-
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/asmdecl"
 	"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/cgocall"
 	"golang.org/x/tools/go/analysis/passes/shadow"
+
+	"github.com/golangci/golangci-lint/pkg/config"
 )
 
 func TestGovet(t *testing.T) {

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

diff --git a/pkg/golinters/interfacer.go b/pkg/golinters/interfacer.go
@@ -5,11 +5,9 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/buildssa"
-
-	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
-
 	"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/result"
 )

diff --git a/pkg/golinters/megacheck.go b/pkg/golinters/megacheck.go
@@ -3,9 +3,9 @@ package golinters
 import (
 	"fmt"
 
-	"github.com/golangci/golangci-lint/pkg/logutils"
-
 	"golang.org/x/tools/go/analysis"
+
+	"github.com/golangci/golangci-lint/pkg/logutils"
 )
 
 var debugf = logutils.Debug("megacheck")
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ import ( @@
     	"sync"
     	"github.com/matoous/godox"
     	"golang.org/x/tools/go/analysis"
     	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
@@ Expand Down @@