Update and fix staticcheck

vendor/honnef.co/go/tools/lint/lint.go

@@ -3,6 +3,7 @@ package lint // import "honnef.co/go/tools/lint"
 
 import (
 	"bytes"
+	"encoding/gob"
 	"fmt"
 	"go/scanner"
 	"go/token"
@@ -17,6 +18,7 @@ import (
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/packages"
 	"honnef.co/go/tools/config"
+	"honnef.co/go/tools/internal/cache"
 )
 
 type Documentation struct {
@@ -62,7 +64,7 @@ type LineIgnore struct {
 	Line    int
 	Checks  []string
 	Matched bool
-	Pos     token.Pos
+	Pos     token.Position
 }
 
 func (li *LineIgnore) Match(p Problem) bool {
@@ -119,6 +121,21 @@ type Problem struct {
 	Message  string
 	Check    string
 	Severity Severity
+	Related  []Related
+}
+
+type Related struct {
+	Pos     token.Position
+	End     token.Position
+	Message string
+}
+
+func (p Problem) Equal(o Problem) bool {
+	return p.Pos == o.Pos &&
+		p.End == o.End &&
+		p.Message == o.Message &&
+		p.Check == o.Check &&
+		p.Severity == o.Severity
 }
 
 func (p *Problem) String() string {
@@ -132,6 +149,7 @@ type Linter struct {
 	GoVersion          int
 	Config             config.Config
 	Stats              Stats
+	RepeatAnalyzers    uint
 }
 
 type CumulativeChecker interface {
@@ -184,6 +202,7 @@ func (l *Linter) Lint(cfg *packages.Config, patterns []string) ([]Problem, error
 		return nil, err
 	}
 	r.goVersion = l.GoVersion
+	r.repeatAnalyzers = l.RepeatAnalyzers
 
 	pkgs, err := r.Run(cfg, patterns, allowedAnalyzers, hasCumulative)
 	if err != nil {
@@ -264,10 +283,12 @@ func (l *Linter) Lint(cfg *packages.Config, patterns []string) ([]Problem, error
 	}
 
 	atomic.StoreUint32(&r.stats.State, StateCumulative)
-	var problems []Problem
 	for _, cum := range l.CumulativeCheckers {
 		for _, res := range cum.Result() {
 			pkg := tpkgToPkg[res.Pkg()]
+			if pkg == nil {
+				panic(fmt.Sprintf("analyzer %s flagged object %s in package %s, a package that we aren't tracking", cum.Analyzer(), res, res.Pkg()))
+			}
 			allowedChecks := FilterChecks(allowedAnalyzers, pkg.cfg.Merge(l.Config).Checks)
 			if allowedChecks[cum.Analyzer().Name] {
 				pos := DisplayPosition(pkg.Fset, res.Pos())
@@ -278,21 +299,51 @@ func (l *Linter) Lint(cfg *packages.Config, patterns []string) ([]Problem, error
 					continue
 				}
 				p := cum.ProblemObject(pkg.Fset, res)
-				problems = append(problems, p)
+				pkg.problems = append(pkg.problems, p)
 			}
 		}
 	}
 
+	for _, pkg := range pkgs {
+		if !pkg.fromSource {
+			// Don't cache packages that we loaded from the cache
+			continue
+		}
+		cpkg := cachedPackage{
+			Problems: pkg.problems,
+			Ignores:  pkg.ignores,
+			Config:   pkg.cfg,
+		}
+		buf := &bytes.Buffer{}
+		if err := gob.NewEncoder(buf).Encode(cpkg); err != nil {
+			return nil, err
+		}
+		id := cache.Subkey(pkg.actionID, "data "+r.problemsCacheKey)
+		if err := r.cache.PutBytes(id, buf.Bytes()); err != nil {
+			return nil, err
+		}
+	}
+
+	var problems []Problem
+	// Deduplicate line ignores. When U1000 processes a package and
+	// its test variant, it will only emit a single problem for an
+	// unused object, not two problems. We will, however, have two
+	// line ignores, one per package. Without deduplication, one line
+	// ignore will be marked as matched, while the other one won't,
+	// subsequently reporting a "this linter directive didn't match
+	// anything" error.
+	ignores := map[token.Position]Ignore{}
 	for _, pkg := range pkgs {
 		for _, ig := range pkg.ignores {
-			for i := range pkg.problems {
-				p := &pkg.problems[i]
-				if ig.Match(*p) {
-					p.Severity = Ignored
+			if lig, ok := ig.(*LineIgnore); ok {
+				ig = ignores[lig.Pos]
+				if ig == nil {
+					ignores[lig.Pos] = lig
+					ig = lig
 				}
 			}
-			for i := range problems {
-				p := &problems[i]
+			for i := range pkg.problems {
+				p := &pkg.problems[i]
 				if ig.Match(*p) {
 					p.Severity = Ignored
 				}
@@ -318,6 +369,7 @@ func (l *Linter) Lint(cfg *packages.Config, patterns []string) ([]Problem, error
 			if !ok {
 				continue
 			}
+			ig = ignores[ig.Pos].(*LineIgnore)
 			if ig.Matched {
 				continue
 			}
@@ -338,7 +390,7 @@ func (l *Linter) Lint(cfg *packages.Config, patterns []string) ([]Problem, error
 				continue
 			}
 			p := Problem{
-				Pos:     DisplayPosition(pkg.Fset, ig.Pos),
+				Pos:     ig.Pos,
 				Message: "this linter directive didn't match anything; should it be removed?",
 				Check:   "",
 			}
@@ -372,7 +424,7 @@ func (l *Linter) Lint(cfg *packages.Config, patterns []string) ([]Problem, error
 	for i, p := range problems[1:] {
 		// We may encounter duplicate problems because one file
 		// can be part of many packages.
-		if problems[i] != p {
+		if !problems[i].Equal(p) {
 			out = append(out, p)
 		}
 	}
@@ -422,10 +474,6 @@ func FilterChecks(allChecks []*analysis.Analyzer, checks []string) map[string]bo
 	return allowedChecks
 }
 
-type Positioner interface {
-	Pos() token.Pos
-}
-
 func DisplayPosition(fset *token.FileSet, p token.Pos) token.Position {
 	if p == token.NoPos {
 		return token.Position{}