all: merge master into gopls-release-branch.0.4
Figured it was easier to just merge to master instead of cherry-picking.
Change-Id: Ia78e95bd1dc4e6b07bd5f9be73118f99f9827091
diff --git a/gopls/go.mod b/gopls/go.mod
index 12d68af..e4f8426 100644
--- a/gopls/go.mod
+++ b/gopls/go.mod
@@ -4,7 +4,7 @@
require (
github.com/sergi/go-diff v1.1.0
- golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d
+ golang.org/x/tools v0.0.0-20200507174705-50c062a2b64a
honnef.co/go/tools v0.0.1-2020.1.3
mvdan.cc/xurls/v2 v2.1.0
)
diff --git a/internal/lsp/debug/info.go b/internal/lsp/debug/info.go
index b070c99..d9077ad 100644
--- a/internal/lsp/debug/info.go
+++ b/internal/lsp/debug/info.go
@@ -23,7 +23,7 @@
)
// Version is a manually-updated mechanism for tracking versions.
-var Version = "master"
+var Version = "0.4.1"
// PrintServerInfo writes HTML debug info to w for the Instance.
func (i *Instance) PrintServerInfo(ctx context.Context, w io.Writer) {
