The ULTIMATE fix

Author: ldez

go.mod

@@ -33,6 +33,7 @@ require (
 	github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254
 	github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5
 	github.com/gostaticanalysis/nilerr v0.1.1
+	github.com/hashicorp/go-multierror v1.0.0
 	github.com/jgautheron/goconst v1.4.0
 	github.com/jingyugao/rowserrcheck v0.0.0-20210315055705-d907ca737bb1
 	github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af

go.sum

@@ -2,7 +2,6 @@ package goanalysis
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/pkg/errors"
 	"golang.org/x/tools/go/packages"
@@ -20,58 +19,24 @@ func (e *IllTypedError) Error() string {
 	return fmt.Sprintf("errors in package: %v", e.Pkg.Errors)
 }
 
-type FailedPrerequisitesError struct {
-	errors map[string][]string
-}
-
-func (f FailedPrerequisitesError) NotEmpty() bool {
-	return len(f.errors) > 0
-}
+func buildIssuesFromIllTypedError(errs []error, lintCtx *linter.Context) ([]result.Issue, error) {
+	var issues []result.Issue
+	uniqReportedIssues := map[string]bool{}
 
-func (f *FailedPrerequisitesError) Consume(name string, err error) {
-	if f.errors == nil {
-		f.errors = map[string][]string{}
-	}
-	k := fmt.Sprintf("%v", err)
-	f.errors[k] = append(f.errors[k], name)
-}
+	var other error
 
-func (f FailedPrerequisitesError) Error() string {
-	var errs []string
-	for err := range f.errors {
-		errs = append(errs, err)
-	}
-	var groups []groupedPrerequisiteErr
 	for _, err := range errs {
-		groups = append(groups, groupedPrerequisiteErr{
-			err:   err,
-			names: f.errors[err],
-		})
-	}
-	return fmt.Sprintf("failed prerequisites: %s", groups)
-}
-
-type groupedPrerequisiteErr struct {
-	names []string
-	err   string
-}
+		err := err
 
-func (g groupedPrerequisiteErr) String() string {
-	if len(g.names) == 1 {
-		return fmt.Sprintf("%s: %s", g.names[0], g.err)
-	}
-	return fmt.Sprintf("(%s): %s", strings.Join(g.names, ", "), g.err)
-}
-
-func buildIssuesFromErrorsForTypecheckMode(errs []error, lintCtx *linter.Context) ([]result.Issue, error) {
-	var issues []result.Issue
-	uniqReportedIssues := map[string]bool{}
-	for _, err := range errs {
-		itErr, ok := errors.Cause(err).(*IllTypedError)
-		if !ok {
-			return nil, err
+		var ill *IllTypedError
+		if !errors.As(err, &ill) {
+			if other == nil {
+				other = err
+			}
+			continue
 		}
-		for _, err := range libpackages.ExtractErrors(itErr.Pkg) {
+
+		for _, err := range libpackages.ExtractErrors(ill.Pkg) {
 			i, perr := parseError(err)
 			if perr != nil { // failed to parse
 				if uniqReportedIssues[err.Msg] {
@@ -80,11 +45,16 @@ func buildIssuesFromErrorsForTypecheckMode(errs []error, lintCtx *linter.Context
 				uniqReportedIssues[err.Msg] = true
 				lintCtx.Log.Errorf("typechecking error: %s", err.Msg)
 			} else {
-				i.Pkg = itErr.Pkg // to save to cache later
+				i.Pkg = ill.Pkg // to save to cache later
 				issues = append(issues, *i)
 			}
 		}
 	}
+
+	if len(issues) == 0 && other != nil {
+		return nil, other
+	}
+
 	return issues, nil
 }
 

pkg/golinters/goanalysis/errors.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/golangci/golangci-lint/pkg/logutils"
 	"github.com/pkg/errors"
 	"golang.org/x/tools/go/analysis"
 

pkg/golinters/goanalysis/linter.go

@@ -7,6 +7,7 @@ import (
 	"runtime/debug"
 	"time"
 
+	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/packages"
@@ -117,15 +118,20 @@ func (act *action) analyze() {
 	}(time.Now())
 
 	// Report an error if any dependency failures.
-	var depErr FailedPrerequisitesError
+	var depErrors *multierror.Error
 	for _, dep := range act.deps {
 		if dep.err == nil {
 			continue
 		}
-		depErr.Consume(dep.String(), dep.err)
+
+		depErrors = multierror.Append(depErrors, errors.Cause(dep.err))
 	}
-	if depErr.NotEmpty() {
-		act.err = depErr
+	if depErrors != nil {
+		depErrors.ErrorFormat = func(e []error) string {
+			return fmt.Sprintf("failed prerequisites: %v", e)
+		}
+
+		act.err = depErrors
 		return
 	}
 

pkg/golinters/goanalysis/runner_action.go

@@ -74,24 +74,16 @@ func runAnalyzers(cfg runAnalyzersConfig, lintCtx *linter.Context) ([]result.Iss
 		return retIssues
 	}
 
-	if cfg.isTypecheckMode() {
-		errIssues, err := buildIssuesFromErrorsForTypecheckMode(errs, lintCtx)
-		if err != nil {
-			return nil, err
-		}
-
-		issues = append(issues, errIssues...)
-		issues = append(issues, buildAllIssues()...)
-
-		return issues, nil
+	errIssues, err := buildIssuesFromIllTypedError(errs, lintCtx)
+	if err != nil {
+		return nil, err
 	}
 
-	// Don't print all errs: they can duplicate.
-	if len(errs) != 0 {
-		return nil, errs[0]
+	issues = append(issues, errIssues...)
+	if len(errIssues) == 0 {
+		issues = append(issues, buildAllIssues()...)
 	}
 
-	issues = append(issues, buildAllIssues()...)
 	return issues, nil
 }