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

8122e49 go/pointer: remove use of deprecated ssa.CreateTestMainPackage
1a3081d all: prepare for formatting any as 'any' in type strings
4adea50 internal/typeparams: normalize the underlying constraint interface
4392381 go/analysis/passes/unsafeptr: add tests using generics
49ce184 cmd/guru: remove use of deprecated ssa.CreateTestMainPackage
fda06c1 gopls/internal/regtest/diagnostics: skip Test_Issue38211
c116b72 internal/lsp/lsprpc: increase timeout for TestEnvForwarding
fc3ed20 internal/lsp: enable template processing and add templateFiles option
e900012 go/callgraph/vta: represent type sets using tries
5e46725 internal/lsp: return all code action kinds with context.only prefix
fafc446 go/internal/gccgoimporter: skip obj importer test on AIX
a5321bf go/internal/gccgoimporter: skip installation test on AIX
0edd7b8 go/internal/gccgoimporter: fix up gccgo installation test
e93be81 go/internal/gccgoimporter: use t.TempDir() in tests
17472e0 go/internal/gccgoimporter: change all .gox files to text
c8e8de6 go/ssa: correct names of examples
b766c28 internal/jsonrpc2: make Serve wait for all connections to close
2cdcc60 cmd: avoid printing redundant newlines
0c60b7c go/analysis/passes/printf: add test for generic printf wrappers
ddcef59 go/analysis/passes/printf: warn about verbs that don’t match a type parameter’s type set
b8b8e7f analysis/internal/facts: Updating facts for generics.
4ab7496 go/analysis/passes/copylock: avoid infinite recursion via type params
1c6f3cc go/analysis/passes/ctrlfow: rely on typeutil.StaticCallee
1ae27d3 internal/lsp/cache: don't offset invalid positions
6f75aad go/callgraph/vta: add trie implementation to VTA
84e69e7 go/analysis/passes/copylock: detect copylock in multi-assignment
68536fa internal/testenv: treat linux-riscv64-unmatched as a slow builder
012c320 internal/regtest: skip TestQuickFixEmptyFiles: it is too flaky
7e23819 internal/regtest: skip TestProgressBarErrors: it is too flaky
3b1a674 go/types/objectpath: temporarily comment-out some tests
714668c go/internal/gcimporter: remove skipSpecialPlatforms
9aacde2 go/internal/gcimporter: avoid printing to stderr in passing tests
6561d8c go/internal/gcimporter: skip Test{I,B}ExportData_stdlib in -short mode
182bbdc go/pointer: skip TestInput on 32-bit platforms
f6440c8 x/tools: print check misses concatenated strings
bb4add0 go/analysis/passes/printf: refactor and simplify matchArgType
1ba8fdb go/analysis/passes/errorsas: avoid type param on RHS of type decl
058ed05 go/analysis/passes/copylock: find locks via type parameters
ebc40b3 go/pointer: replace use of deprecated CreateTestMainPackage API
4d06874 internal/testenv: treat dragonfly-amd64 as a slow machine
ee08195 go/types/typeutil: Callee supports generics
e8bb373 go/types/objectpath: fix testcase for the fix of TypeName.IsAlias
b7d65fb go/types/objectpath: comment some testcase temporarily for the fix of TypeName.IsAlias
42daa65 go/analysis/passes/stringintconv: add support for type parameters
513e3fb cmd/godoc: deprecate and point to cmd/pkgsite
351c04c /internal/lsp/source: apply directory filters to workspace symbols
a6c6f4b go/analysis/passes/nilfunc: add typeparams test
a2be0cd go/analysis/passes/tests: update for generics
4d2571b go/analysis/passes/testinggoroutine: update for generics
96715ad internal/lsp: check for invalid URIs in definition
170abdd go/analysis/passes/stdmethods: add tests with generic receivers
d6a9af8 godoc/analysis: remove deprecated analysis package
e7eb6f6 go/analysis/passes/unusedresult: add test for typeparams
c8ad2e1 go/analysis/passes/ctrlflow: add typeparams test
8de2a7f go/analysis/passes/sortslice: add missing functions using empty interface
9cd58b0 x/tools/cmd/stringer: adjust generics tests
7b0b504 go/analysis/passes/ifaceassert: add a typeparams test
58ba5e4 go/analysis/passes/internal/analysisutil: add a test for generic type assertions
1b02aa2 go/analysis/passes/shift: update for generics
08f2e89 gopls/api-diff: fix api-diff command for Go 1.18
d5520c2 internal/lsp/source: check for nil objects in call hierarchy
e1e2965 all: update install commands to go install pkg@version
591e12a go/analysis/passes/cgocall: add typeparams test
26dbf47 go/analysis/passes/lostcancel: add typeparams test
9626607 all: update dependencies post-release
244f92e internal/lsp: do not send semantic tokens that client doesn't support
c4ead46 go/analysis/passes/httpresponse: fix a testing issue
903c757 go/analysis/passes/httpresponse: add typeparams test
f916b54 go/analysis,go/ssa: initialize the types.Info.Instances map
1050b5c go/analysis/passes/composite: update for generics
5a40697 tools/gopls: use `go install` instead of `go get`
bcc6fa8 internal/typeparams: guard against generics in stdlib tests
fc8b4ca go/internal/gcimporter: stub support importing/exporting constant kind
18096c5 go/internal/gcimporter: add support for the Go 1.18 export data version
affba50 internal/lsp: temporarily strip subscripts from generic hover
316ba0b go/packages/packagestest: skip nested module directories in copying
6f2254e internal/lsp: adjust extract function range if block statement
baf4e38 go/gcexportdata: limit reader to the export data section of the archive
4100dac go/analysis/passes/deepequalerrors: add typeparams test
9b675d0 gopls/doc: remove bad gopls cli link
cbf1d01 go/internal/gcimporter: avoid setting unnecessary lines in fakeFileSet
4ea6123 internal/lsp: don't add multiple views for the same folder
81f084e go/internal/gcimporter: remove support for type parameters subscripts
3a9f390 gopls: update generics instructions to mention go.mod go directive
9f721e8 internal/lsp: fix data race in Templates code
1feb683 internal/lsp/analysis/infertypeargs: reduce diagnostic range
98f6e03 internal/lsp: disable fillstruct for type params
288d0b3 gopls: tidy go.mod file for go1.18
ce04ca3 go/internal/gcimporter: normalize implicit interfaces in export tests
3a269dc internal/typeparams: copy the term list algorithm from go/types
e69ba9d internal/lsp/cache: fix incorrect detection of useless code
88e80df cmd/stringer: add a few tests using instantiated generic types

Change-Id: Ie4b34cafc81a488de650019f874287558f9a8d70

Author: findleyr

README.md

@@ -9,15 +9,14 @@ Some of the tools, `godoc` and `vet` for example, are included in binary Go
 distributions.
 
 Others, including the Go `guru` and the test coverage tool, can be fetched with
-`go get`.
+`go install`.
 
 Packages include a type-checker for Go and an implementation of the
 Static Single Assignment form (SSA) representation for Go programs.
 
 ## Download/Install
 
-The easiest way to install is to run `go get -u golang.org/x/tools/...`. You can
-also manually git clone the repository to `$GOPATH/src/golang.org/x/tools`.
+The easiest way to install is to run `go install golang.org/x/tools/...@latest`.
 
 ## JS/CSS Formatting
 

cmd/callgraph/main.go

@@ -166,7 +166,7 @@ var stdout io.Writer = os.Stdout
 
 func doCallgraph(dir, gopath, algo, format string, tests bool, args []string) error {
 	if len(args) == 0 {
-		fmt.Fprintln(os.Stderr, Usage)
+		fmt.Fprint(os.Stderr, Usage)
 		return nil
 	}
 

cmd/cover/cover.go

@@ -42,8 +42,8 @@ Finally, to generate modified source code with coverage annotations
 `
 
 func usage() {
-	fmt.Fprintln(os.Stderr, usageMessage)
-	fmt.Fprintln(os.Stderr, "Flags:")
+	fmt.Fprint(os.Stderr, usageMessage)
+	fmt.Fprintln(os.Stderr, "\nFlags:")
 	flag.PrintDefaults()
 	fmt.Fprintln(os.Stderr, "\n  Only one of -html, -func, or -mode may be set.")
 	os.Exit(2)

cmd/eg/eg.go

@@ -59,7 +59,8 @@ func doMain() error {
 	args := flag.Args()
 
 	if *helpFlag {
-		fmt.Fprint(os.Stderr, eg.Help)
+		help := eg.Help // hide %s from vet
+		fmt.Fprint(os.Stderr, help)
 		os.Exit(2)
 	}
 

cmd/godoc/doc.go

@@ -52,13 +52,6 @@ The flags are:
 		Go root directory
 	-http=addr
 		HTTP service address (e.g., '127.0.0.1:6060' or just ':6060')
-	-analysis=type,pointer
-		comma-separated list of analyses to perform
-		"type": display identifier resolution, type info, method sets,
-			'implements', and static callees
-		"pointer": display channel peers, callers and dynamic callees
-			(significantly slower)
-		See https://golang.org/lib/godoc/analysis/help.html for details.
 	-templates=""
 		directory containing alternate template files; if set,
 		the directory may provide alternative template files
@@ -115,5 +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.
 */
 package main // import "golang.org/x/tools/cmd/godoc"

cmd/godoc/godoc_test.go

@@ -5,11 +5,9 @@
 package main_test
 
 import (
-	"bufio"
 	"bytes"
 	"fmt"
 	"go/build"
-	"io"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -479,135 +477,3 @@ func TestNoMainModule(t *testing.T) {
 		t.Errorf("stderr contains 'go mod download', is that intentional?\nstderr=%q", stderr.String())
 	}
 }
-
-// Basic integration test for godoc -analysis=type (via HTTP interface).
-func TestTypeAnalysis(t *testing.T) {
-	bin, cleanup := buildGodoc(t)
-	defer cleanup()
-	testTypeAnalysis(t, packagestest.GOPATH, bin)
-	// TODO(golang.org/issue/34473): Add support for type, pointer
-	// analysis in module mode, then enable its test coverage here.
-}
-func testTypeAnalysis(t *testing.T, x packagestest.Exporter, bin string) {
-	if runtime.GOOS == "plan9" {
-		t.Skip("skipping test on plan9 (issue #11974)") // see comment re: Plan 9 below
-	}
-
-	// Write a fake GOROOT/GOPATH.
-	// TODO(golang.org/issue/34473): This test uses import paths without a dot in first
-	// path element. This is not viable in module mode; import paths will need to change.
-	e := packagestest.Export(t, x, []packagestest.Module{
-		{
-			Name: "app",
-			Files: map[string]interface{}{
-				"main.go": `
-package main
-import "lib"
-func main() { print(lib.V) }
-`,
-			},
-		},
-		{
-			Name: "lib",
-			Files: map[string]interface{}{
-				"lib.go": `
-package lib
-type T struct{}
-const C = 3
-var V T
-func (T) F() int { return C }
-`,
-			},
-		},
-	})
-	goroot := filepath.Join(e.Temp(), "goroot")
-	if err := os.Mkdir(goroot, 0755); err != nil {
-		t.Fatalf("os.Mkdir(%q) failed: %v", goroot, err)
-	}
-	defer e.Cleanup()
-
-	// Start the server.
-	addr := serverAddress(t)
-	cmd := exec.Command(bin, fmt.Sprintf("-http=%s", addr), "-analysis=type")
-	cmd.Dir = e.Config.Dir
-	// Point to an empty GOROOT directory to speed things up
-	// by not doing type analysis for the entire real GOROOT.
-	// TODO(golang.org/issue/34473): This test optimization may not be viable in module mode.
-	cmd.Env = append(e.Config.Env, fmt.Sprintf("GOROOT=%s", goroot))
-	cmd.Stdout = os.Stderr
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		t.Fatal(err)
-	}
-	cmd.Args[0] = "godoc"
-	if err := cmd.Start(); err != nil {
-		t.Fatalf("failed to start godoc: %s", err)
-	}
-	defer killAndWait(cmd)
-	waitForServerReady(t, cmd, addr)
-
-	// Wait for type analysis to complete.
-	reader := bufio.NewReader(stderr)
-	for {
-		s, err := reader.ReadString('\n') // on Plan 9 this fails
-		if err != nil {
-			t.Fatal(err)
-		}
-		fmt.Fprint(os.Stderr, s)
-		if strings.Contains(s, "Type analysis complete.") {
-			break
-		}
-	}
-	go io.Copy(os.Stderr, reader)
-
-	t0 := time.Now()
-
-	// Make an HTTP request and check for a regular expression match.
-	// The patterns are very crude checks that basic type information
-	// has been annotated onto the source view.
-tryagain:
-	for _, test := range []struct{ url, pattern string }{
-		{"/src/lib/lib.go", "L2.*package .*Package docs for lib.*/lib"},
-		{"/src/lib/lib.go", "L3.*type .*type info for T.*struct"},
-		{"/src/lib/lib.go", "L5.*var V .*type T struct"},
-		{"/src/lib/lib.go", "L6.*func .*type T struct.*T.*return .*const C untyped int.*C"},
-
-		{"/src/app/main.go", "L2.*package .*Package docs for app"},
-		{"/src/app/main.go", "L3.*import .*Package docs for lib.*lib"},
-		{"/src/app/main.go", "L4.*func main.*package lib.*lib.*var lib.V lib.T.*V"},
-	} {
-		url := fmt.Sprintf("http://%s%s", addr, test.url)
-		resp, err := http.Get(url)
-		if err != nil {
-			t.Errorf("GET %s failed: %s", url, err)
-			continue
-		}
-		body, err := ioutil.ReadAll(resp.Body)
-		resp.Body.Close()
-		if err != nil {
-			t.Errorf("GET %s: failed to read body: %s (response: %v)", url, err, resp)
-			continue
-		}
-
-		if !bytes.Contains(body, []byte("Static analysis features")) {
-			// Type analysis results usually become available within
-			// ~4ms after godoc startup (for this input on my machine).
-			if elapsed := time.Since(t0); elapsed > 500*time.Millisecond {
-				t.Fatalf("type analysis results still unavailable after %s", elapsed)
-			}
-			time.Sleep(10 * time.Millisecond)
-			goto tryagain
-		}
-
-		match, err := regexp.Match(test.pattern, body)
-		if err != nil {
-			t.Errorf("regexp.Match(%q) failed: %s", test.pattern, err)
-			continue
-		}
-		if !match {
-			// This is a really ugly failure message.
-			t.Errorf("GET %s: body doesn't match %q, got:\n%s",
-				url, test.pattern, string(body))
-		}
-	}
-}

cmd/godoc/main.go

@@ -25,7 +25,6 @@ import (
 	"flag"
 	"fmt"
 	"go/build"
-	exec "golang.org/x/sys/execabs"
 	"io"
 	"log"
 	"net/http"
@@ -38,8 +37,9 @@ import (
 	"runtime"
 	"strings"
 
+	exec "golang.org/x/sys/execabs"
+
 	"golang.org/x/tools/godoc"
-	"golang.org/x/tools/godoc/analysis"
 	"golang.org/x/tools/godoc/static"
 	"golang.org/x/tools/godoc/vfs"
 	"golang.org/x/tools/godoc/vfs/gatefs"
@@ -59,8 +59,6 @@ var (
 	// file-based index
 	writeIndex = flag.Bool("write_index", false, "write index to a file; the file name must be specified with -index_files")
 
-	analysisFlag = flag.String("analysis", "", `comma-separated list of analyses to perform when in GOPATH mode (supported: type, pointer). See https://golang.org/lib/godoc/analysis/help.html`)
-
 	// network
 	httpAddr = flag.String("http", defaultAddr, "HTTP service address")
 
@@ -208,12 +206,6 @@ func main() {
 	if goModFile != "" {
 		fmt.Printf("using module mode; GOMOD=%s\n", goModFile)
 
-		if *analysisFlag != "" {
-			fmt.Fprintln(os.Stderr, "The -analysis flag is supported only in GOPATH mode at this time.")
-			fmt.Fprintln(os.Stderr, "See https://golang.org/issue/34473.")
-			usage()
-		}
-
 		// Detect whether to use vendor mode or not.
 		mainMod, vendorEnabled, err := gocommand.VendorEnabled(context.Background(), gocommand.Invocation{}, &gocommand.Runner{})
 		if err != nil {
@@ -266,20 +258,6 @@ func main() {
 		}
 	}
 
-	var typeAnalysis, pointerAnalysis bool
-	if *analysisFlag != "" {
-		for _, a := range strings.Split(*analysisFlag, ",") {
-			switch a {
-			case "type":
-				typeAnalysis = true
-			case "pointer":
-				pointerAnalysis = true
-			default:
-				log.Fatalf("unknown analysis: %s", a)
-			}
-		}
-	}
-
 	var corpus *godoc.Corpus
 	if goModFile != "" {
 		corpus = godoc.NewCorpus(moduleFS{fs})
@@ -376,11 +354,6 @@ func main() {
 		go corpus.RunIndexer()
 	}
 
-	// Start type/pointer analysis.
-	if typeAnalysis || pointerAnalysis {
-		go analysis.Run(pointerAnalysis, &corpus.Analysis)
-	}
-
 	// Start http server.
 	if *verbose {
 		log.Println("starting HTTP server")

cmd/gomvpkg/main.go

@@ -83,7 +83,7 @@ func main() {
 	}
 
 	if *helpFlag || *fromFlag == "" || *toFlag == "" {
-		fmt.Println(Usage)
+		fmt.Print(Usage)
 		return
 	}
 

cmd/gorename/main.go

@@ -46,7 +46,7 @@ func main() {
 	}
 
 	if *helpFlag || (*offsetFlag == "" && *fromFlag == "" && *toFlag == "") {
-		fmt.Println(rename.Usage)
+		fmt.Print(rename.Usage)
 		return
 	}
 

cmd/gotype/gotype.go

@@ -167,7 +167,8 @@ files to include for such packages.
 `
 
 func usage() {
-	fmt.Fprintln(os.Stderr, usageString)
+	fmt.Fprint(os.Stderr, usageString)
+	fmt.Fprintln(os.Stderr)
 	flag.PrintDefaults()
 	os.Exit(2)
 }