From 170d3dccf763e7e4fff0d5ca35cf61c0ff9ac4ac Mon Sep 17 00:00:00 2001 From: "Hana (Hyang-Ah) Kim" Date: Wed, 22 Feb 2023 17:36:38 -0500 Subject: [PATCH] src/goTools: install staticcheck@v0.3.3 when building with go1.18 staticcheck@v0.4.* requires go1.19+. Change-Id: I1299b276f8c39fc7ea6f38a0ddf9ba3108ca759f Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/470475 Run-TryBot: Hyang-Ah Hana Kim Reviewed-by: Suzy Mueller TryBot-Result: kokoro (cherry picked from commit d7419f47be7833eb3ca08007264d06771f5bbccb) Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/470636 Run-TryBot: Suzy Mueller Reviewed-by: Hyang-Ah Hana Kim --- src/goTools.ts | 2 +- tools/installtools/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/goTools.ts b/src/goTools.ts index 9b23e725fa..ef6f4440ed 100644 --- a/src/goTools.ts +++ b/src/goTools.ts @@ -88,7 +88,7 @@ export function getImportPathWithVersion( } if (tool.name === 'staticcheck') { if (goVersion.lt('1.17')) return importPath + '@v0.2.2'; - if (goVersion.lt('1.18')) return importPath + '@v0.3.3'; + if (goVersion.lt('1.19')) return importPath + '@v0.3.3'; } if (tool.name === 'gofumpt') { if (goVersion.lt('1.18')) return importPath + '@v0.2.1'; diff --git a/tools/installtools/main.go b/tools/installtools/main.go index 18d070e83a..3faf1d8c84 100644 --- a/tools/installtools/main.go +++ b/tools/installtools/main.go @@ -47,7 +47,7 @@ var tools = []struct { {"github.com/sqs/goreturns", "", false, nil}, {"github.com/uudashr/gopkgs/v2/cmd/gopkgs", "", false, nil}, {"github.com/zmb3/gogetdoc", "", false, nil}, - {"honnef.co/go/tools/cmd/staticcheck", "", false, []finalVersion{{16, "v0.2.2"}, {17, "v0.3.3"}}}, + {"honnef.co/go/tools/cmd/staticcheck", "", false, []finalVersion{{16, "v0.2.2"}, {18, "v0.3.3"}}}, {"golang.org/x/tools/cmd/gorename", "", false, nil}, {"github.com/go-delve/delve/cmd/dlv", "", false, []finalVersion{{16, "v1.8.3"}, {17, "v1.9.1"}}}, }