Skip to content

Commit 484a195

Browse files
committed
extension/src/goTools: add golangci-lint and gofumpt version mapping
Latest golangci-lint v1.56.x requires go1.21+. And update gofumpt default pinned version. Gofumpt v0.6.0 requires go1.20+. Fixes #3171 Change-Id: Ic2cb9dd188fa220ea87e93b513c56c765ed152d1 Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/563362 Commit-Queue: Hyang-Ah Hana Kim <[email protected]> Reviewed-by: Robert Findley <[email protected]> TryBot-Result: kokoro <[email protected]>
1 parent 1d634bf commit 484a195

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

extension/src/goTools.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,13 @@ export function getImportPathWithVersion(
7575
}
7676
if (tool.name === 'gofumpt') {
7777
if (goVersion.lt('1.18')) return importPath + '@v0.2.1';
78+
if (goVersion.lt('1.19')) return importPath + '@v0.4.0';
79+
if (goVersion.lt('1.20')) return importPath + '@v0.5.0';
7880
}
7981
if (tool.name === 'golangci-lint') {
8082
if (goVersion.lt('1.18')) return importPath + '@v1.47.3';
8183
if (goVersion.lt('1.20')) return importPath + '@v1.53.3';
84+
if (goVersion.lt('1.21')) return importPath + '@v1.55.2';
8285
}
8386
if (tool.defaultVersion) {
8487
return importPath + '@' + tool.defaultVersion;

extension/src/goToolsInformation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const allToolsInformation: { [key: string]: Tool } = {
3939
replacedByGopls: true,
4040
isImportant: false,
4141
description: 'Formatter',
42-
defaultVersion: 'v0.5.0'
42+
defaultVersion: 'v0.6.0'
4343
},
4444
'goimports': {
4545
name: 'goimports',

extension/test/integration/install.test.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,19 +205,18 @@ suite('Installation Tests', function () {
205205
const gofumptDefault = allToolsInformation['gofumpt'].defaultVersion!;
206206
test('Install gofumpt with old go', async () => {
207207
await runTest(
208-
[{ name: 'gofumpt', versions: ['v0.2.1', gofumptDefault], wantVersion: 'v0.2.1' }],
208+
[{ name: 'gofumpt', versions: ['v0.4.0', 'v0.5.0', gofumptDefault], wantVersion: 'v0.5.0' }],
209209
true, // LOCAL PROXY
210210
true, // GOBIN
211-
'go1.17' // Go Version
211+
'go1.19' // Go Version
212212
);
213213
});
214-
215214
test('Install gofumpt with new go', async () => {
216215
await runTest(
217-
[{ name: 'gofumpt', versions: ['v0.2.1', gofumptDefault], wantVersion: gofumptDefault }],
216+
[{ name: 'gofumpt', versions: ['v0.4.0', 'v0.5.0', gofumptDefault], wantVersion: gofumptDefault }],
218217
true, // LOCAL PROXY
219218
true, // GOBIN
220-
'go1.18' // Go Version
219+
'go1.22' // Go Version
221220
);
222221
});
223222
test('Install all tools via GOPROXY', async () => {

0 commit comments

Comments
 (0)