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

42984c42 internal/lsp/regtest: run one quick fix at a time in TestUnknownRevision
19b1717e go.mod: upgrade to Go 1.17
a1fbb681 all: upgrade go.mod files to Go 1.16
062bf4eb internal/lsp: make ShowDocument RPC available to gopls
3e17c62e internal/lsp: warn users who have built gopls with go-diff v1.2.0
def02638 gopls: clarify policy with respect to support for older Go versions
7a6108e9 internal/lsp: don't use ast.NewPackage to build builtin
edbe9bef internal/lsp/completion: indicate completion candidates that are deprecated
9b9633e0 internal/lsp/regtest: force GOPACKAGESDRIVER=off
291330a8 gopls/internal/regtest/modfile: set an explicit go version in the TestUnknownRevision modules
aec13729 gopls/internal/regtest: unskip tests for golang/go#37098
28c1392e internal/lsp: don't call PackagesForFile on builtin.go
800adbe2 go/packages: enable TestIssue37098 for Go 1.17 and later
16b25d25 internal/lsp: print comments that would be lost during extract func
7c72a848 go/analysis/passes/fieldalignment: clarify reported diagnostics in docs
9ff86487 internal/lsp: add support for extracting non-nested returns
d0768c91 internal/lsp/source/completion: suggest only valid package names
6397a116 internal/lsp/debug: splice in updated servers rather than overwrite
7b9993c5 internal/lsp/cmd: add a command-line command to start daemon debugging
fe1c5480 gopls/test: it is safe to ignore json unmarshalling errors
735ed62f gopls: tidy module
e3dc99f8 cmd/guru: update referrers-json testdata to reflect new line numbering
3f1e7240 cmd/guru: remove test assertions involving unsafe to fix the build
cf354b66 internal/lsp/cache: improve snapshot clone perfomance
7657be6e gopls/doc: fix broken link
7c93484b internal/lsp: add a command to start the debug server
716a04c6 lsp/completion: fix postfix completions preceding assignments
f74a6698 internal/lsp/cache: preallocate internal maps when cloning snapshots
e435455a internal/lsp: introduce MemoryMode
f7e8e244 internal/lsp: support Check For Upgrades in vendor mode
a8e7c0c9 internal/lsp: move gopls/internal/regtest ->  internal/lsp/regtest
f946a157 passes/sigchanyzer: allow valid inlined unbuffered signal channel
4934781c lsp/completion: offer candidates converting arrays to slices
b3e5b999 internal/lsp: update unsafe completion test for upcoming spec changes
e74674ae internal/lsp/protocol: latest version of LSP
dbc87476 internal/lsp/semantic: avoid doing semantic tokens for large files
a13dbf1a lsp/completion: omit deep completions into unimported package names
10909d8c internal/lsp/cache: remove type info trimming
1dce19db internal/lsp/cache: don't trim types.Info with staticcheck enabled
07295caa internal/lsp/cache: prune types.Info entries in slice literals
1a0c6081 internal/lsp/protocol/typescript: update documentation and generated code
fe503716 internal/lsp/source: fix Deref function for cyclic types
cb5dc85c internal/lsp/cache: add a scheme for types error code links
799b6824 gopls/internal/hooks: respect the default checks of the staticcheck tool
d1362d7a internal/lsp/source: fix an infinite loop in Deref function
59a2b45a internal/lsp/source: update process of hover signature creation for type declarations
2140ccea fix the argument of the goimports example
ec686a2a all: upgrade all dependencies except for go-diff
0243799c gopls/internal/coverage: apply gofmt to the build tag syntax
be791d07 internal/lsp/source: small fixes to directory filters

Change-Id: If0eb9499020d2baab77f05523197adb95044705f
diff --git a/gopls/go.mod b/gopls/go.mod
index 2a5810e..62b9f6c 100644
--- a/gopls/go.mod
+++ b/gopls/go.mod
@@ -9,7 +9,7 @@
 	github.com/sergi/go-diff v1.1.0
 	golang.org/x/mod v0.4.2
 	golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57
-	golang.org/x/tools v0.1.0
+	golang.org/x/tools v0.1.1-0.20210408155258-593413344da1
 	honnef.co/go/tools v0.1.3
 	mvdan.cc/gofumpt v0.1.1
 	mvdan.cc/xurls/v2 v2.2.0
diff --git a/internal/lsp/debug/info.go b/internal/lsp/debug/info.go
index 3533b36..e19f1e1 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.11"
 
 // 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.