From 07561fd5c7ab67a8ae80870f9d3208a21b8820c3 Mon Sep 17 00:00:00 2001 From: Gopher Robot Date: Tue, 25 Feb 2025 08:02:28 -0800 Subject: [PATCH 1/3] [release-v0.46]extension/package.json: update version to 0.46.0 This is an automated CL which updates the package.json and package-lock.json. Change-Id: I8369ae4805fdacf90ac992dd0d35115ef00f62b3 Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/652335 Reviewed-by: Robert Findley Reviewed-by: Hongxiang Jiang LUCI-TryBot-Result: Go LUCI kokoro-CI: kokoro Auto-Submit: Gopher Robot --- extension/package-lock.json | 4 ++-- extension/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extension/package-lock.json b/extension/package-lock.json index fd2cbee086..887853b3d5 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "go", - "version": "0.46.0-dev", + "version": "0.46.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "go", - "version": "0.46.0-dev", + "version": "0.46.0", "license": "MIT", "dependencies": { "diff": "4.0.2", diff --git a/extension/package.json b/extension/package.json index 12755b0c38..768ad26808 100644 --- a/extension/package.json +++ b/extension/package.json @@ -1,7 +1,7 @@ { "name": "go", "displayName": "Go", - "version": "0.46.0-dev", + "version": "0.46.0", "publisher": "golang", "description": "Rich Go language support for Visual Studio Code", "author": { From 17390e59614cae397906364f26359055a91d2b1a Mon Sep 17 00:00:00 2001 From: Hongxiang Jiang Date: Tue, 4 Mar 2025 11:04:18 -0500 Subject: [PATCH 2/3] [release-v0.46]extension/src/language: check token field existence before assertion The error happens when the workspace/executeCommand returns results without any token. vscode-go tried to assert the type of "Token" field without checking for it's existence. Command with token returned (gopls.vulncheck): https://github.com/user-attachments/assets/931524ba-a40b-4a8c-b7af-a350a4c9a135 Command without token returned (gopls.upgrade_dependency): https://github.com/user-attachments/assets/cb23c5bc-7d0b-4e60-aa4e-66ba1fed31d8 For golang/vscode-go#3698 Change-Id: I07183b7e0f30912a6b3f6c0ab53a40624ccd7880 Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/654555 Reviewed-by: Robert Findley LUCI-TryBot-Result: Go LUCI kokoro-CI: kokoro Reviewed-by: Madeline Kalil (cherry picked from commit 7a2c83556ae55ea1067e44c4569faae8b5d71712) Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/654775 --- extension/src/language/goLanguageServer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/src/language/goLanguageServer.ts b/extension/src/language/goLanguageServer.ts index b446e8c0a7..5923aa88f6 100644 --- a/extension/src/language/goLanguageServer.ts +++ b/extension/src/language/goLanguageServer.ts @@ -565,7 +565,7 @@ export async function buildLanguageClient( } const res = await next(command, args); - const progressToken = res.Token; + const progressToken = res?.Token as ProgressToken; // The progressToken from executeCommand indicates that // gopls may trigger a related workDoneProgress // notification, either before or after the command From 53e7613b86ef4e6ac21caf44b08f08066200dd8c Mon Sep 17 00:00:00 2001 From: Gopher Robot Date: Tue, 4 Mar 2025 13:37:02 -0800 Subject: [PATCH 3/3] [release-v0.46]extension/package.json: update version to 0.46.1 This is an automated CL which updates the package.json and package-lock.json. Change-Id: I041d24f8050371b6595a4a33bc94c4f29000d45a Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/654419 kokoro-CI: kokoro Reviewed-by: Madeline Kalil Reviewed-by: Hongxiang Jiang Auto-Submit: Gopher Robot LUCI-TryBot-Result: Go LUCI --- extension/package-lock.json | 4 ++-- extension/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extension/package-lock.json b/extension/package-lock.json index 887853b3d5..8f642a41cf 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "go", - "version": "0.46.0", + "version": "0.46.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "go", - "version": "0.46.0", + "version": "0.46.1", "license": "MIT", "dependencies": { "diff": "4.0.2", diff --git a/extension/package.json b/extension/package.json index 768ad26808..7292277078 100644 --- a/extension/package.json +++ b/extension/package.json @@ -1,7 +1,7 @@ { "name": "go", "displayName": "Go", - "version": "0.46.0", + "version": "0.46.1", "publisher": "golang", "description": "Rich Go language support for Visual Studio Code", "author": {