[gopls-release-branch.0.6] all: merge master into gopls-release-branch.0.6
9a6582cd gopls/internal/regtest: avoid flake in TestGoModInvalidesOnSave
f618651c internal/lsp/cache: compare file size when invalidating file cache
7646fae9 internal/lsp/fake: use hash rather than mtime to identify workdir files
45115c1c internal/lsp/source: rename uses of embedded fields
1e6ecd4b go/packages: don't crash if given an invalid overlay
88ba5d0b internal/imports: handle un-downloaded modules
d33bae44 copyright: test that all files in the repo have copyright notices
1b1bb645 gopls/doc/emacs.md: describe configuration for eglot
7905ceac internal/lsp/cmd: add licenses command
9c811dba gopls/internal/hooks: create included licenses text
1462c254 gopls/internal/regtest: fix TestUnimportedCompletions
e1c06e46 gopls: use standard command doc comment format
21398c4d Revert "go/analysis/passes/structtag: recognize multiple keys per tag"
5bd8423e internal/lsp/cache: fix panic in GOPATH mode
6f6e4b65 internal/lsp/cache: fix module paths in nested module error messages
7de0487e gopls/internal/regtest: skip regtests on android-amd64-emu
92778473 all: add copyright notices to files that are missing them
5d655790 go/packages: remove -mod, -modfile flags from build flags for go version
b8e0803c internal/lsp/source: return all field funcs from outgoing callhierarchy
6c3993fd gopls: update link to nvim-lspconfig gopls configuration
66568f37 gopls/doc: add additional information on CI in contributing.md
961d08dc gopls: bump gofumpt to v0.1.0
2e889ff4 gopls/internal/regtest: support multiple workspace folders
eb9b40eb cmd/goyacc: double ACTSIZE, NSTATE and TEMPSTATE
2993f551 internal/lsp: avoid panic during interface assertion
c4dccaf3 go/analysis/passes/fieldalignment: add command
9ca8607e internal/lsp: save all possible keys for analyses, codelenses
d2d86cca internal/lsp: restructure user options (CL 278433 continued)
Change-Id: I9ee4b4ad55369caa697e0527bfc61c553e40bbe4
diff --git a/gopls/go.mod b/gopls/go.mod
index 390d162..139a166 100644
--- a/gopls/go.mod
+++ b/gopls/go.mod
@@ -7,7 +7,7 @@
github.com/sanity-io/litter v1.3.0
github.com/sergi/go-diff v1.1.0
golang.org/x/mod v0.4.0
- golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee
+ golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
honnef.co/go/tools v0.0.1-2020.1.6
mvdan.cc/gofumpt v0.1.0
diff --git a/internal/lsp/debug/info.go b/internal/lsp/debug/info.go
index d458019..ebcb66b 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.2"
// 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.
