bump golang.org/x/tools to HEAD

go.mod

@@ -99,7 +99,7 @@ require (
 	github.com/yagipy/maintidx v1.0.0
 	github.com/yeya24/promlinter v0.2.0
 	gitlab.com/bosi/decorder v0.2.1
-	golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a
+	golang.org/x/tools v0.1.11-0.20220518213611-904e24e9fcf9
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	honnef.co/go/tools v0.3.1
 	mvdan.cc/gofumpt v0.3.1
@@ -165,11 +165,10 @@ require (
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

pkg/golinters/asciicheck.go

@@ -11,9 +11,7 @@ func NewAsciicheck() *goanalysis.Linter {
 	return goanalysis.NewLinter(
 		"asciicheck",
 		"Simple linter to check that your code does not contain non-ASCII identifiers",
-		[]*analysis.Analyzer{
-			asciicheck.NewAnalyzer(),
-		},
+		[]*analysis.Analyzer{asciicheck.NewAnalyzer()},
 		nil,
 	).WithLoadMode(goanalysis.LoadModeSyntax)
 }

pkg/golinters/bodyclose.go

@@ -8,14 +8,10 @@ import (
 )
 
 func NewBodyclose() *goanalysis.Linter {
-	analyzers := []*analysis.Analyzer{
-		bodyclose.Analyzer,
-	}
-
 	return goanalysis.NewLinter(
 		"bodyclose",
 		"checks whether HTTP response body is closed successfully",
-		analyzers,
+		[]*analysis.Analyzer{bodyclose.Analyzer},
 		nil,
 	).WithLoadMode(goanalysis.LoadModeTypesInfo)
 }

pkg/golinters/contextcheck.go

@@ -8,11 +8,10 @@ import (
 )
 
 func NewContextCheck() *goanalysis.Linter {
-	analyzer := contextcheck.NewAnalyzer()
 	return goanalysis.NewLinter(
 		"contextcheck",
 		"check the function whether use a non-inherited context",
-		[]*analysis.Analyzer{analyzer},
+		[]*analysis.Analyzer{contextcheck.NewAnalyzer()},
 		nil,
 	).WithLoadMode(goanalysis.LoadModeTypesInfo)
 }

pkg/golinters/deadcode.go

@@ -12,37 +12,46 @@ import (
 	"github.com/golangci/golangci-lint/pkg/result"
 )
 
+const deadcodeName = "deadcode"
+
 func NewDeadcode() *goanalysis.Linter {
-	const linterName = "deadcode"
 	var mu sync.Mutex
 	var resIssues []goanalysis.Issue
 
 	analyzer := &analysis.Analyzer{
-		Name: linterName,
+		Name: deadcodeName,
 		Doc:  goanalysis.TheOnlyanalyzerDoc,
 		Run: func(pass *analysis.Pass) (interface{}, error) {
 			prog := goanalysis.MakeFakeLoaderProgram(pass)
+
 			issues, err := deadcodeAPI.Run(prog)
 			if err != nil {
 				return nil, err
 			}
+
 			res := make([]goanalysis.Issue, 0, len(issues))
 			for _, i := range issues {
 				res = append(res, goanalysis.NewIssue(&result.Issue{
 					Pos:        i.Pos,
 					Text:       fmt.Sprintf("%s is unused", formatCode(i.UnusedIdentName, nil)),
-					FromLinter: linterName,
+					FromLinter: deadcodeName,
 				}, pass))
 			}
+
+			if len(issues) == 0 {
+				return nil, nil
+			}
+
 			mu.Lock()
 			resIssues = append(resIssues, res...)
 			mu.Unlock()
 
 			return nil, nil
 		},
 	}
+
 	return goanalysis.NewLinter(
-		linterName,
+		deadcodeName,
 		"Finds unused code",
 		[]*analysis.Analyzer{analyzer},
 		nil,

pkg/golinters/decorder.go

@@ -13,8 +13,6 @@ import (
 func NewDecorder(settings *config.DecorderSettings) *goanalysis.Linter {
 	a := decorder.Analyzer
 
-	analyzers := []*analysis.Analyzer{a}
-
 	// disable all rules/checks by default
 	cfg := map[string]interface{}{
 		"disable-dec-num-check":         true,
@@ -32,7 +30,7 @@ func NewDecorder(settings *config.DecorderSettings) *goanalysis.Linter {
 	return goanalysis.NewLinter(
 		a.Name,
 		a.Doc,
-		analyzers,
+		[]*analysis.Analyzer{a},
 		map[string]map[string]interface{}{a.Name: cfg},
 	).WithLoadMode(goanalysis.LoadModeSyntax)
 }

pkg/golinters/depguard.go

@@ -15,23 +15,25 @@ import (
 	"github.com/golangci/golangci-lint/pkg/result"
 )
 
-const depguardLinterName = "depguard"
+const depguardName = "depguard"
 
-func NewDepguard() *goanalysis.Linter {
+func NewDepguard(settings *config.DepGuardSettings) *goanalysis.Linter {
 	var mu sync.Mutex
 	var resIssues []goanalysis.Issue
 
 	analyzer := &analysis.Analyzer{
-		Name: depguardLinterName,
+		Name: depguardName,
 		Doc:  goanalysis.TheOnlyanalyzerDoc,
+		Run:  goanalysis.DummyRun,
 	}
+
 	return goanalysis.NewLinter(
-		depguardLinterName,
+		depguardName,
 		"Go linter that checks if package imports are in a list of acceptable packages",
 		[]*analysis.Analyzer{analyzer},
 		nil,
 	).WithContextSetter(func(lintCtx *linter.Context) {
-		dg, err := newDepGuard(&lintCtx.Settings().Depguard)
+		dg, err := newDepGuard(settings)
 
 		analyzer.Run = func(pass *analysis.Pass) (interface{}, error) {
 			if err != nil {
@@ -153,7 +155,7 @@ func (g guardian) run(loadConfig *loader.Config, prog *loader.Program, pass *ana
 			goanalysis.NewIssue(&result.Issue{
 				Pos:        issue.Position,
 				Text:       g.createMsg(issue.PackageName),
-				FromLinter: depguardLinterName,
+				FromLinter: depguardName,
 			}, pass),
 		)
 	}

pkg/golinters/dogsled.go

@@ -8,51 +8,65 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 
+	"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/result"
 )
 
-const dogsledLinterName = "dogsled"
+const dogsledName = "dogsled"
 
-func NewDogsled() *goanalysis.Linter {
+//nolint:dupl
+func NewDogsled(settings *config.DogsledSettings) *goanalysis.Linter {
 	var mu sync.Mutex
 	var resIssues []goanalysis.Issue
 
 	analyzer := &analysis.Analyzer{
-		Name: dogsledLinterName,
+		Name: dogsledName,
 		Doc:  goanalysis.TheOnlyanalyzerDoc,
-	}
-	return goanalysis.NewLinter(
-		dogsledLinterName,
-		"Checks assignments with too many blank identifiers (e.g. x, _, _, _, := f())",
-		[]*analysis.Analyzer{analyzer},
-		nil,
-	).WithContextSetter(func(lintCtx *linter.Context) {
-		analyzer.Run = func(pass *analysis.Pass) (interface{}, error) {
-			var pkgIssues []goanalysis.Issue
-			for _, f := range pass.Files {
-				v := returnsVisitor{
-					maxBlanks: lintCtx.Settings().Dogsled.MaxBlankIdentifiers,
-					f:         pass.Fset,
-				}
-				ast.Walk(&v, f)
-				for i := range v.issues {
-					pkgIssues = append(pkgIssues, goanalysis.NewIssue(&v.issues[i], pass))
-				}
+		Run: func(pass *analysis.Pass) (interface{}, error) {
+			issues := runDogsled(pass, settings)
+
+			if len(issues) == 0 {
+				return nil, nil
 			}
 
 			mu.Lock()
-			resIssues = append(resIssues, pkgIssues...)
+			resIssues = append(resIssues, issues...)
 			mu.Unlock()
 
 			return nil, nil
-		}
-	}).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue {
+		},
+	}
+
+	return goanalysis.NewLinter(
+		dogsledName,
+		"Checks assignments with too many blank identifiers (e.g. x, _, _, _, := f())",
+		[]*analysis.Analyzer{analyzer},
+		nil,
+	).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue {
 		return resIssues
 	}).WithLoadMode(goanalysis.LoadModeSyntax)
 }
 
+func runDogsled(pass *analysis.Pass, settings *config.DogsledSettings) []goanalysis.Issue {
+	var reports []goanalysis.Issue
+	for _, f := range pass.Files {
+		v := &returnsVisitor{
+			maxBlanks: settings.MaxBlankIdentifiers,
+			f:         pass.Fset,
+		}
+
+		ast.Walk(v, f)
+
+		for i := range v.issues {
+			reports = append(reports, goanalysis.NewIssue(&v.issues[i], pass))
+		}
+	}
+
+	return reports
+}
+
 type returnsVisitor struct {
 	f         *token.FileSet
 	maxBlanks int
@@ -87,7 +101,7 @@ func (v *returnsVisitor) Visit(node ast.Node) ast.Visitor {
 
 		if numBlank > v.maxBlanks {
 			v.issues = append(v.issues, result.Issue{
-				FromLinter: dogsledLinterName,
+				FromLinter: dogsledName,
 				Text:       fmt.Sprintf("declaration has %v blank identifiers", numBlank),
 				Pos:        v.f.Position(assgnStmt.Pos()),
 			})