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

b261fe96 go/tools: add vet check for direct comparion of reflect.Values
e78b40c7 internal/lsp: switch to 'go get -u ./...' for transitive upgrades
3ac76b8b gopls/internal/coverage: better error messages and output
c6024661 Revert "internal/lsp/cache: disable GOPACKAGESDRIVER"
35a91593 go/internal/gcimporter: ensure that imported floats are of float kind
5d334387 go/internal/gcimporter: merge go1.11 tests back into gcimporter_test.go
11c3f835 internal/lsp/source: fix Highlight for std and 3rd-party packages
8c34cc9c internal/lsp/cache: fix race condition in snapshot's initializedErr
0deaffd2 gopls/internal/regtest: re-enable the gc_details regtest for -short
af364066 internal/lsp/source: respond with the underlying type to Type Definition requests for composite types
682c7e60 godoc/static: link to golang.org for content moved out of Go root
ca627f83 internal/lsp/semantic: fix some type definitions
04595890 internal/lsp/protocol/typescript: small cleanups and add tsconfig.json
b0e994dc internal/jsonrpc2_v2: move the idle timeout handling out of the server
95535753 internal/lsp: remove unnecessary call to WorkspacePackages in mod tidy
769264cf internal/lsp/source: fix docs for fields of anonymous structs/interfaces
cb7d5993 internal/lsp/source: skip blank identifiers during the function extraction
94a19427 internal/lsp/completion: move postfix completions behind option
09058ab0 internal/lsp/source/completion: add postfix snippet completions
2c039f7f internal/event/label: prevent unsafe get of non-string
4c8e4a8b go/analysis/passes/inspect: fix typo in comment
63ea654b internal/lsp: hold the gc details lock when storing diagnostics
7f6d50ea internal/lsp/source: fix hover and completion with dot imports
b3556f0f internal/lsp: remove some unused parameters, mostly in the cache package
09a00c1a internal/lsp: fix support for SourceFixAll code actions
877f9c48 internal/jsonrpc2_v2: an updated jsonrpc2 library
52cb7724 gopls: upgrade mvdan.cc/gofumpt to v0.1.1
a1191f37 gopls: upgrade honnef.co/go/tools to v0.1.3
d8aeb16b internal/lsp: add defaultLibrary mod for basic types
aa0c7234 internal/lsp/cache: get control of reloadOrphanedFiles
d7a25ada gopls/integration: remove obsolete code
9bdb4197 gopls/internal: add coverage command to compute test coverage
d2e11a2b present: don't drop commands that immediately follow text
695b1675 cmd/present2md: allow comments to be retained in translated document
a14ff98a present: retain complete caption command when parsing captions
1aac171f Update emacs.md - add .dir-locals.el example
2c4a8865 internal/lsp: remove module diagnostics from code actions
9b614f5d internal/lsp/cache: tolerate analysis panics better
9e9211a9 gopls/internal/regtest: fix race when printing regtest state on falure
6d45e3d9 internal/lsp: add a temp workspace per folder, and a helper command
e409f121 internal/lsp: add snippet completion for t.Fatal errs
8e4f4c86 godoc: delete GoogleCN logic
44abc2a7 internal/lsp: only load by view when there are no go.mod files

Change-Id: Ie5d628f640a8edaeb41c4cdf30aafefbc892ec7c
diff --git a/gopls/go.mod b/gopls/go.mod
index 452ab13..e26a512 100644
--- a/gopls/go.mod
+++ b/gopls/go.mod
@@ -8,7 +8,7 @@
 	github.com/sergi/go-diff v1.1.0
 	golang.org/x/mod v0.4.1
 	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c
-	golang.org/x/tools v0.1.0
+	golang.org/x/tools v0.1.1-0.20210408020845-b261fe96097f
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 	honnef.co/go/tools v0.1.3
 	mvdan.cc/gofumpt v0.1.1
diff --git a/gopls/internal/coverage/coverage.go b/gopls/internal/coverage/coverage.go
index c3d30c6..7bb3640 100644
--- a/gopls/internal/coverage/coverage.go
+++ b/gopls/internal/coverage/coverage.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go.build go.1.16
+//go:build go.1.16
 // +build go.1.16
 
 // Running this program in the tools directory will produce a coverage file /tmp/cover.out
diff --git a/internal/lsp/debug/info.go b/internal/lsp/debug/info.go
index d458019..7013396 100644
--- a/internal/lsp/debug/info.go
+++ b/internal/lsp/debug/info.go
@@ -26,7 +26,7 @@
 )
 
 // Version is a manually-updated mechanism for tracking versions.
-const Version = "master"
+const Version = "v0.6.10"
 
 // ServerVersion is the format used by gopls to report its version to the
 // client. This format is structured so that the client can parse it easily.