all: merge master (3fca6a0) into gopls-release-branch.0.7

Merge List:

+ 2021-12-08 3fca6a0 cmd/gorename: log 'go build' output on failure
+ 2021-12-08 cadd57e docs: updated nvim-lspconfig link
+ 2021-12-07 fd2bfb7 go/analysis/passes/stdmethods: recognize any as alias for interface{}, for errors.As check
+ 2021-12-07 68cbf41 internal/lsp/template: add missed hover cases
+ 2021-12-07 d3358c1 go/internal/gcimporter: fix test for Go 1.18 any
+ 2021-12-06 feb39d0 internal/lsp/source: don't format generated files
+ 2021-12-03 c882a49 gopls/doc: fix rendering of example for the infertypeargs analyzer
+ 2021-12-03 f64c0f4 internal/lsp/analysis/fillreturns: update fillreturns for new type errs
+ 2021-12-02 e212aff internal/memoize: do not allow (*Generation).Acquire to fail
+ 2021-12-02 2ac48c6 go/types/typeutil: add support for mapping generic types
+ 2021-12-01 df48029 go/internal/gcimporter: allow reusing empty interfaces on the RHS of type decls
+ 2021-12-01 d99d6fa internal/lsp/protocol: fix whitespace in comments
+ 2021-12-01 3c63f30 gopls/internal/regtest/misc: temporarily skip TestGenerateProgress
+ 2021-12-01 615f9a6 internal/lsp/protocol: bring the LSP stubs up to date
+ 2021-11-30 1fd30d2 refactor/importgraph: set env from packagestest.Export and check errors from Build
+ 2021-11-30 2c9b078 internal/memoize: record the caller of Destroy
+ 2021-11-29 6e52f51 x/tools: temporarily skip a couple of tests
+ 2021-11-29 a618923 internal/lsp/template: fix error that causes crashes
+ 2021-11-24 cb80a01 cmd/godoc: remove extra // characters from deprecation notice
+ 2021-11-23 7cf1f38 go/ssa: remove deprecated FindTests and CreateTestMainPackage
+ 2021-11-23 1e71a25 gopls:  template suffix flags and documentation
+ 2021-11-22 c2c92fd go/callgraph/vta/internal/trie: fix build with go1.12
+ 2021-11-19 d0c7211 internal/lsp/cache: fix resolution of the go directive in multi-module workspaces

Change-Id: I35eaffd1d914065a619cb71a96f6ce3cc2815888

Author: findleyr

cmd/godoc/doc.go

@@ -108,7 +108,7 @@ see https://golang.org/pkg/testing/#hdr-Examples for the conventions.
 See "Godoc: documenting Go code" for how to write good comments for godoc:
 https://golang.org/doc/articles/godoc_documenting_go_code.html
 
-// Deprecated: godoc cannot select what version of a package is displayed.
-// Instead, use golang.org/x/pkgsite/cmd/pkgsite.
+Deprecated: godoc cannot select what version of a package is displayed.
+Instead, use golang.org/x/pkgsite/cmd/pkgsite.
 */
 package main // import "golang.org/x/tools/cmd/godoc"

cmd/gorename/gorename_test.go

@@ -331,8 +331,8 @@ func buildGorename(t *testing.T) (tmp, bin string, cleanup func()) {
 		bin += ".exe"
 	}
 	cmd := exec.Command("go", "build", "-o", bin)
-	if err := cmd.Run(); err != nil {
-		t.Fatalf("Building gorename: %v", err)
+	if out, err := cmd.CombinedOutput(); err != nil {
+		t.Fatalf("Building gorename: %v\n%s", err, out)
 	}
 	return tmp, bin, func() { os.RemoveAll(tmp) }
 }

go/analysis/passes/stdmethods/stdmethods.go

@@ -61,7 +61,7 @@ var Analyzer = &analysis.Analyzer{
 // we let it go. But if it does have a fmt.ScanState, then the
 // rest has to match.
 var canonicalMethods = map[string]struct{ args, results []string }{
-	"As": {[]string{"interface{}"}, []string{"bool"}}, // errors.As
+	"As": {[]string{"any"}, []string{"bool"}}, // errors.As
 	// "Flush": {{}, {"error"}}, // http.Flusher and jpeg.writer conflict
 	"Format":        {[]string{"=fmt.State", "rune"}, []string{}},                      // fmt.Formatter
 	"GobDecode":     {[]string{"[]byte"}, []string{"error"}},                           // gob.GobDecoder
@@ -194,7 +194,9 @@ func matchParams(pass *analysis.Pass, expect []string, actual *types.Tuple, pref
 func matchParamType(expect string, actual types.Type) bool {
 	expect = strings.TrimPrefix(expect, "=")
 	// Overkill but easy.
-	return typeString(actual) == expect
+	t := typeString(actual)
+	return t == expect ||
+		(t == "any" || t == "interface{}") && (expect == "any" || expect == "interface{}")
 }
 
 var errorType = types.Universe.Lookup("error").Type().Underlying().(*types.Interface)

go/analysis/passes/stdmethods/testdata/src/a/a.go

@@ -47,14 +47,18 @@ type E int
 
 func (E) Error() string { return "" } // E implements error.
 
-func (E) As()     {} // want `method As\(\) should have signature As\(interface{}\) bool`
+func (E) As()     {} // want `method As\(\) should have signature As\((any|interface\{\})\) bool`
 func (E) Is()     {} // want `method Is\(\) should have signature Is\(error\) bool`
 func (E) Unwrap() {} // want `method Unwrap\(\) should have signature Unwrap\(\) error`
 
 type F int
 
 func (F) Error() string { return "" } // Both F and *F implement error.
 
-func (*F) As()     {} // want `method As\(\) should have signature As\(interface{}\) bool`
+func (*F) As()     {} // want `method As\(\) should have signature As\((any|interface\{\})\) bool`
 func (*F) Is()     {} // want `method Is\(\) should have signature Is\(error\) bool`
 func (*F) Unwrap() {} // want `method Unwrap\(\) should have signature Unwrap\(\) error`
+
+type G int
+
+func (G) As(interface{}) bool // ok

go/analysis/passes/stdmethods/testdata/src/a/b.go

@@ -0,0 +1,12 @@
+// Copyright 2021 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.
+
+//go:build go1.18
+// +build go1.18
+
+package a
+
+type H int
+
+func (H) As(any) bool // ok

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

@@ -28,14 +28,14 @@ type E[P any] int
 
 func (E[_]) Error() string { return "" } // E implements error.
 
-func (E[P]) As()     {} // want `method As\(\) should have signature As\(interface{}\) bool`
+func (E[P]) As()     {} // want `method As\(\) should have signature As\((any|interface\{\})\) bool`
 func (E[_]) Is()     {} // want `method Is\(\) should have signature Is\(error\) bool`
 func (E[_]) Unwrap() {} // want `method Unwrap\(\) should have signature Unwrap\(\) error`
 
 type F[P any] int
 
 func (F[_]) Error() string { return "" } // Both F and *F implement error.
 
-func (*F[_]) As()     {} // want `method As\(\) should have signature As\(interface{}\) bool`
+func (*F[_]) As()     {} // want `method As\(\) should have signature As\((any|interface\{\})\) bool`
 func (*F[_]) Is()     {} // want `method Is\(\) should have signature Is\(error\) bool`
 func (*F[_]) Unwrap() {} // want `method Unwrap\(\) should have signature Unwrap\(\) error`

go/callgraph/vta/internal/trie/bits.go

@@ -46,7 +46,7 @@ func branchingBit(x, y prefix) bitpos {
 	if p == 0 {
 		return 0
 	}
-	return 1 << (bits.Len64(uint64(p)) - 1)
+	return bitpos(1) << uint(bits.Len64(uint64(p))-1) // uint conversion needed for go1.12
 }
 
 // zeroBit returns true if k has a 0 bit at position `b`.

go/callgraph/vta/internal/trie/bits_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.13
+// +build go1.13
+
 package trie
 
 import (

go/callgraph/vta/internal/trie/trie_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.13
+// +build go1.13
+
 package trie
 
 import (

go/internal/gcimporter/gcimporter_test.go

@@ -10,6 +10,7 @@ package gcimporter
 import (
 	"bytes"
 	"fmt"
+	"go/build"
 	"go/constant"
 	"go/types"
 	"io/ioutil"
@@ -255,7 +256,7 @@ var importedObjectTests = []struct {
 	{"go/internal/gcimporter.FindPkg", "func FindPkg(path string, srcDir string) (filename string, id string)"},
 
 	// interfaces
-	{"context.Context", "type Context interface{Deadline() (deadline time.Time, ok bool); Done() <-chan struct{}; Err() error; Value(key interface{}) interface{}}"},
+	{"context.Context", "type Context interface{Deadline() (deadline time.Time, ok bool); Done() <-chan struct{}; Err() error; Value(key any) any}"},
 	{"crypto.Decrypter", "type Decrypter interface{Decrypt(rand io.Reader, msg []byte, opts DecrypterOpts) (plaintext []byte, err error); Public() PublicKey}"},
 	{"encoding.BinaryMarshaler", "type BinaryMarshaler interface{MarshalBinary() (data []byte, err error)}"},
 	{"io.Reader", "type Reader interface{Read(p []byte) (n int, err error)}"},
@@ -264,6 +265,18 @@ var importedObjectTests = []struct {
 	{"go/types.Type", "type Type interface{String() string; Underlying() Type}"},
 }
 
+// TODO(rsc): Delete this init func after x/tools no longer needs to test successfully with Go 1.17.
+func init() {
+	if build.Default.ReleaseTags[len(build.Default.ReleaseTags)-1] <= "go1.17" {
+		for i := range importedObjectTests {
+			if importedObjectTests[i].name == "context.Context" {
+				// Expand any to interface{}.
+				importedObjectTests[i].want = "type Context interface{Deadline() (deadline time.Time, ok bool); Done() <-chan struct{}; Err() error; Value(key interface{}) interface{}}"
+			}
+		}
+	}
+}
+
 func TestImportedTypes(t *testing.T) {
 	testenv.NeedsGo1Point(t, 11)
 	// This package only handles gc export data.
@@ -275,6 +288,12 @@ func TestImportedTypes(t *testing.T) {
 			continue // error reported elsewhere
 		}
 		got := types.ObjectString(obj, types.RelativeTo(obj.Pkg()))
+
+		// TODO(rsc): Delete this block once go.dev/cl/368254 lands.
+		if got != test.want && test.want == strings.ReplaceAll(got, "interface{}", "any") {
+			got = test.want
+		}
+
 		if got != test.want {
 			t.Errorf("%s: got %q; want %q", test.name, got, test.want)
 		}