[gopls-release-branch.0.7] all: merge master into gopls-release-branch.0.7

acac939 go/analysis/passes/bools: add typeparams test
ac2ed98 go/analysis/passes/printf: warn against using non-error interface values with %w
378b9e1 internal/lsp/analysis: add typeparams tests for nonewvars and noresultvalues
24389d4 internal/lsp: use the correct dynamic registration booleans
074820e go/analysis/passes/usesgenerics: a new analysis to detect generic code
94178a2 internal/lsp: use source.Offset instead of tok.Offset
0b930fb cmd/goimports: recommend go install instead of go get in docs
c83725b go/analysis/passes/loopclosure: add typeparams test
18fa840 internal/lsp/semantic: prepare for generics
1af23bd go/analysis/passes/assign: add typeparams test
ee04797 go/types/objectpath: canonical order for methods
c5188f2 gopls/doc/advanced.md: update unstable version installation instruction
d477ef3 go/analysis/passes/atomic: add a test that uses typeparams
2dc2755 internal/lsp/protocol: update LSP definitions and stubs
81efdbc cover: add function to parse profiles from an io.Reader
36e7bf9 internal/lsp/analysis/unusedparams: add tests for generics
db89b5a internal/lsp: handle nil pointer in fixInitStmt
ccaa907 go/analysis/passes/unmarshal: allow unmarshalling to a type parameter
0ebff1a go/ast/astutil: update PathEnclosingInterval to handle type parameters
942994f internal/typeparams: use alias rather than indirection for IndexListExpr
13c407c go/ast/inspector: add support for the new IndexListExpr node
58ad7eb go/types/objectpath: add support for type parameters
3883e4a go/internal/gcimporter: allow both prefixes and subscripts for tparams
6f5fd9b internal/lsp: add parameterized slice test for simplifyslice analysis
2189684 internal/typeparams: use NewSignatureType, IsMethodSet, and Context
e89823e x/tools/go/internal/gcimporter: exclude a file from TestImportTypeparamTests
1c35f2a internal/lsp/analysis: quick-fix to remove unnecessary type arguments
7d467dc internal/lsp: support go.work outside of experimental
d9648c9 go/analysis: test errorsas analysis with type params
d42c92b internal/lsp/analysis/fillreturns: skip any parameterized functions
5dbd5e4 internal/typeparams: filter out API diffs related to types.Environment
df9a164 Revert "internal/typeparams: hide go1.18 API usage behind a build constraint"
0df0ca0 internal/typeparams: hide go1.18 API usage behind a build constraint
7898fe6 internal/lsp/analysis: move implementmissing logic into undeclared
da36f79 go/internal/gcimporter: skip typeparam import tests on unified builders
64bbad1 internal/lsp/debug: improve readability of session options
b182fde go/analysis/passes/tests: check example output
ba6b94c internal/lsp: add fields to anonymous struct info
939195f go/ssa: skip the "constraints" package in TestStdlib
e1e06b8 go/internal/gcimporter: temporarily skip the contraints package on the unified builder
6d1e33f internal/lsp: handle panic in hoverRune by using token.Pos
c8db761 internal/lsp/cache: keep going on failed analyzers
2847958 internal/lsp/analysis: add a useany analyzer
efaec4e go/pointer: skip tests that depend on an unstable API changed in Go 1.18
ecbcf3a go/callgraph/vta: improve support for function value flow
b98090b internal/lsp/analysis/implementmissing: add analyzer
0d12d39 internal/typeparams: update to the new Instances API
fe076c8 internal/typesinternal: document ReadGo116ErrorData
91c880c go/internal/gcimporter: add support for exporting the 1.18 export format
d2417d5 gopls/doc: add instructions for the new "kokoro rerun" feature
464a887 internal/lsp/templates: replace panic by logging
a0016a2 internal/lsp/diagnostics: avoid erroneous error message for orphaned files
7559231 internal/lsp/command: fix typo in comment
2758b04 gopls/api-diff: create api-diff command for gopls api
aba0c5f go/callgraph/vta: optimize scc type initialization
1a7ca93 internal/lsp/source: update SuggestedFixFunc to accept source.Snapshot
76d4494 internal/lsp: fix panic in find references on Error
4ba3eff gopls/doc: remove -tags=typeparams from generic build instructions
02e5238 go/internal/gcimporter: rename instType to instanceType
0cffec9 go/internal/gcimporter: update iimport.go to support type parameters
5492d01 internal/lsp/testdata: update inferred.go to use hoverdef
9207707 go/internal/gcimporter: skip TestIExportData_stdlib on go1.18
cd7c003 internal/lsp: add support for hovering runes
258ee27 internal/lsp/template: implement completions for template files
384e5da go/ssa: keep the ops doc sorted alphabetically
e7de652 internal/lsp: produce "method" in place of "member" as per the spec
915f620 go/ssa: fix slice to array ptr conversions for named type
a568412 go/callgraph/vta: fix call site computation bug
295a39b internal/lsp: remove the TODO and add a test for the hover panic
c163c31 gopls: add more instructions for working with Bazel and gopls
076821b internal/typeparams: update MultiIndexExpr to IndexListExpr
2cae65c internal/typeparams: follow changes to Type in the go/ast and go/types
0a6f080 internal/lsp: check InRange before calling token.Offset
e5f719f internal/lsp/source: consider test variants when finding pkg from pos
3604566 go/analysis/passes/testinggoroutine: fix panic in goStmtFun
d39bbca gopls: consistently capitalize enum variants for symbolStyle
4e109c5 gopls: use new "codelenses" config key in docs over deprecated "codelens"
7391fc1 gopls/doc: update generic code section of advanced.md
3b801c8 internal/lsp: exclude node_modules in the workspace root by default

Change-Id: I9e6d85aa0a8506c63d082e1a73c749781dccf720

Author: stamblerre

cmd/goimports/doc.go

@@ -7,7 +7,7 @@
 Command goimports updates your Go import lines,
 adding missing ones and removing unreferenced ones.
 
-     $ go get golang.org/x/tools/cmd/goimports
+     $ go install golang.org/x/tools/cmd/goimports@latest
 
 In addition to fixing imports, goimports also formats
 your code in the same style as gofmt so it can be used

copyright/copyright.go

@@ -2,29 +2,37 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.18
+// +build go1.18
+
 // Package copyright checks that files have the correct copyright notices.
 package copyright
 
 import (
 	"go/ast"
 	"go/parser"
 	"go/token"
+	"io/fs"
 	"io/ioutil"
-	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
 )
 
 func checkCopyright(dir string) ([]string, error) {
 	var files []string
-	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
+	err := filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
-		if info.IsDir() {
+		if d.IsDir() {
 			// Skip directories like ".git".
-			if strings.HasPrefix(info.Name(), ".") {
+			if strings.HasPrefix(d.Name(), ".") {
+				return filepath.SkipDir
+			}
+			// Skip any directory that starts with an underscore, as the go
+			// command would.
+			if strings.HasPrefix(d.Name(), "_") {
 				return filepath.SkipDir
 			}
 			return nil

copyright/copyright_test.go

@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.18
+// +build go1.18
+
 package copyright
 
 import (

cover/profile.go

@@ -10,6 +10,7 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
+	"io"
 	"math"
 	"os"
 	"sort"
@@ -45,14 +46,18 @@ func ParseProfiles(fileName string) ([]*Profile, error) {
 		return nil, err
 	}
 	defer pf.Close()
+	return ParseProfilesFromReader(pf)
+}
 
-	files := make(map[string]*Profile)
-	buf := bufio.NewReader(pf)
+// ParseProfilesFromReader parses profile data from the Reader and
+// returns a Profile for each source file described therein.
+func ParseProfilesFromReader(rd io.Reader) ([]*Profile, error) {
 	// First line is "mode: foo", where foo is "set", "count", or "atomic".
 	// Rest of file is in the format
 	//	encoding/base64/base64.go:34.44,37.40 3 1
 	// where the fields are: name.go:line.column,line.column numberOfStatements count
-	s := bufio.NewScanner(buf)
+	files := make(map[string]*Profile)
+	s := bufio.NewScanner(rd)
 	mode := ""
 	for s.Scan() {
 		line := s.Text()

go.mod

@@ -8,5 +8,6 @@ require (
 	golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e
+	golang.org/x/text v0.3.6
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 )

go.sum

@@ -18,7 +18,10 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

go/analysis/analysistest/analysistest.go

@@ -196,12 +196,13 @@ func RunWithSuggestedFixes(t Testing, dir string, a *analysis.Analyzer, patterns
 							want := string(bytes.TrimRight(vf.Data, "\n")) + "\n"
 							formatted, err := format.Source([]byte(out))
 							if err != nil {
+								t.Errorf("%s: error formatting edited source: %v\n%s", file.Name(), err, out)
 								continue
 							}
 							if want != string(formatted) {
 								d, err := myers.ComputeEdits("", want, string(formatted))
 								if err != nil {
-									t.Errorf("failed to compute suggested fixes: %v", err)
+									t.Errorf("failed to compute suggested fix diff: %v", err)
 								}
 								t.Errorf("suggested fixes failed for %s:\n%s", file.Name(), diff.ToUnified(fmt.Sprintf("%s.golden [%s]", file.Name(), sf), "actual", want, d))
 							}
@@ -225,12 +226,13 @@ func RunWithSuggestedFixes(t Testing, dir string, a *analysis.Analyzer, patterns
 
 				formatted, err := format.Source([]byte(out))
 				if err != nil {
+					t.Errorf("%s: error formatting resulting source: %v\n%s", file.Name(), err, out)
 					continue
 				}
 				if want != string(formatted) {
 					d, err := myers.ComputeEdits("", want, string(formatted))
 					if err != nil {
-						t.Errorf("failed to compute edits: %s", err)
+						t.Errorf("%s: failed to compute suggested fix diff: %s", file.Name(), err)
 					}
 					t.Errorf("suggested fixes failed for %s:\n%s", file.Name(), diff.ToUnified(file.Name()+".golden", "actual", want, d))
 				}

go/analysis/passes/assign/assign_test.go

@@ -9,9 +9,14 @@ import (
 
 	"golang.org/x/tools/go/analysis/analysistest"
 	"golang.org/x/tools/go/analysis/passes/assign"
+	"golang.org/x/tools/internal/typeparams"
 )
 
 func Test(t *testing.T) {
 	testdata := analysistest.TestData()
-	analysistest.RunWithSuggestedFixes(t, testdata, assign.Analyzer, "a")
+	tests := []string{"a"}
+	if typeparams.Enabled {
+		tests = append(tests, "typeparams")
+	}
+	analysistest.RunWithSuggestedFixes(t, testdata, assign.Analyzer, tests...)
 }

go/analysis/passes/assign/testdata/src/typeparams/typeparams.go

@@ -0,0 +1,33 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// This file contains tests for the useless-assignment checker.
+
+//go:build go1.18
+
+package testdata
+
+import "math/rand"
+
+type ST[T interface{ ~int }] struct {
+	x T
+	l []T
+}
+
+func (s *ST[T]) SetX(x T, ch chan T) {
+	// Accidental self-assignment; it should be "s.x = x"
+	x = x // want "self-assignment of x to x"
+	// Another mistake
+	s.x = s.x // want "self-assignment of s.x to s.x"
+
+	s.l[0] = s.l[0] // want "self-assignment of s.l.0. to s.l.0."
+
+	// Bail on any potential side effects to avoid false positives
+	s.l[num()] = s.l[num()]
+	rng := rand.New(rand.NewSource(0))
+	s.l[rng.Intn(len(s.l))] = s.l[rng.Intn(len(s.l))]
+	s.l[<-ch] = s.l[<-ch]
+}
+
+func num() int { return 2 }

go/analysis/passes/assign/testdata/src/typeparams/typeparams.go.golden

@@ -0,0 +1,33 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// This file contains tests for the useless-assignment checker.
+
+//go:build go1.18
+
+package testdata
+
+import "math/rand"
+
+type ST[T interface{ ~int }] struct {
+	x T
+	l []T
+}
+
+func (s *ST[T]) SetX(x T, ch chan T) {
+	// Accidental self-assignment; it should be "s.x = x"
+	// want "self-assignment of x to x"
+	// Another mistake
+	// want "self-assignment of s.x to s.x"
+
+	// want "self-assignment of s.l.0. to s.l.0."
+
+	// Bail on any potential side effects to avoid false positives
+	s.l[num()] = s.l[num()]
+	rng := rand.New(rand.NewSource(0))
+	s.l[rng.Intn(len(s.l))] = s.l[rng.Intn(len(s.l))]
+	s.l[<-ch] = s.l[<-ch]
+}
+
+func num() int { return 2 }