all: merge master (92d58ea) into gopls-release-branch.0.9
Also add a replace directive to gopls/go.mod, and re-tidy.
Merge List:
+ 2022-08-08 92d58ea4e internal/lsp/cache: register a file watcher for explicit GOWORK values
+ 2022-08-08 98aef7799 internal/lsp/cache: track explicit go.work files outside the workspace
+ 2022-08-08 fff6d6d39 internal/lsp: update the broken workspace message to mention go.work
+ 2022-08-08 9b6085242 gopls/internal/regtest: move TestMultipleModules_Warning to ./workspace
+ 2022-08-05 06d96ee8f gopls/internal/regtest/bench: add a test for completion following edits
Change-Id: I78f2b3552725d0317ec1dd62196558997f70fe29
diff --git a/codereview.cfg b/codereview.cfg
index 3f8b14b..b309710 100644
--- a/codereview.cfg
+++ b/codereview.cfg
@@ -1 +1,3 @@
issuerepo: golang/go
+branch: gopls-release-branch.0.9
+parent-branch: master
diff --git a/gopls/go.mod b/gopls/go.mod
index 006bfe2..b3fc2db 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.6.0-dev.0.20220419223038-86c51ed26bb4
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
- golang.org/x/tools v0.1.11
+ golang.org/x/tools v0.1.13-0.20220805154628-fad228792ce9
golang.org/x/vuln v0.0.0-20220725105440-4151a5aca1df
honnef.co/go/tools v0.3.2
mvdan.cc/gofumpt v0.3.1
diff --git a/internal/lsp/debug/info.go b/internal/lsp/debug/info.go
index bcc2f4f..dec7d18 100644
--- a/internal/lsp/debug/info.go
+++ b/internal/lsp/debug/info.go
@@ -29,7 +29,7 @@
)
// Version is a manually-updated mechanism for tracking versions.
-const Version = "master"
+const Version = "v0.9.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.
diff --git a/internal/lsp/diff/lcs/labels.go b/internal/lsp/diff/lcs/labels.go
index 0689f1e..39fe9f2 100644
--- a/internal/lsp/diff/lcs/labels.go
+++ b/internal/lsp/diff/lcs/labels.go
@@ -8,7 +8,8 @@
"fmt"
)
-// For each D, vec[D] has length D+1,
+// For each D, vec[D] has length D+1,
+//
// and the label for (D, k) is stored in vec[D][(D+k)/2].
type label struct {
vec [][]int
diff --git a/internal/lsp/source/hover.go b/internal/lsp/source/hover.go
index b2524c4..c5af019 100644
--- a/internal/lsp/source/hover.go
+++ b/internal/lsp/source/hover.go
@@ -879,7 +879,7 @@
// or Ellipsis.Elt, the field is returned, along with the innermost
// enclosing Decl, which could be only loosely related---consider:
//
-// var decl = f( func(field int) {} )
+// var decl = f( func(field int) {} )
//
// It returns (nil, nil) if no Field or Decl is found at pos.
func FindDeclAndField(files []*ast.File, pos token.Pos) (decl ast.Decl, field *ast.Field) {
