all: merge master (03562de) into gopls-release-branch.0.13
Also add back the x/tools replace directive to the gopls module.
For golang/go#61583
Merge List:
+ 2023-07-27 03562de25 refactor/satisfy/find: composite lits may have type parameter type
+ 2023-07-27 bacac1499 gopls/internal/lsp/source: Add SuggestedFix for embeddirective Analyzer
+ 2023-07-27 38606b3e2 gopls/internal/lsp/cache: keep analysis progress reports on one line
Change-Id: I8338e1afa66ddd4985ddd1e4c520aa15e81c92c4
diff --git a/codereview.cfg b/codereview.cfg
index 3f8b14b..03bec7d 100644
--- a/codereview.cfg
+++ b/codereview.cfg
@@ -1 +1,3 @@
issuerepo: golang/go
+branch: gopls-release-branch.0.13
+parent-branch: master
diff --git a/gopls/go.mod b/gopls/go.mod
index b3b6de4..60b9b43 100644
--- a/gopls/go.mod
+++ b/gopls/go.mod
@@ -11,7 +11,7 @@
golang.org/x/sync v0.3.0
golang.org/x/sys v0.10.0
golang.org/x/text v0.11.0
- golang.org/x/tools v0.6.0
+ golang.org/x/tools v0.11.1-0.20230726135247-3ff6127f8513
golang.org/x/vuln v0.0.0-20230110180137-6ad3e3d07815
gopkg.in/yaml.v3 v3.0.1
honnef.co/go/tools v0.4.2
diff --git a/gopls/internal/lsp/debug/info.go b/gopls/internal/lsp/debug/info.go
index 5ce23fc..46adeab 100644
--- a/gopls/internal/lsp/debug/info.go
+++ b/gopls/internal/lsp/debug/info.go
@@ -30,7 +30,7 @@
)
// Version is a manually-updated mechanism for tracking versions.
-const Version = "master"
+const Version = "v0.13.0"
// 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.
