Skip to content

Commit 345e674

Browse files
committed
review
1 parent 5ec43d0 commit 345e674

File tree

2 files changed

+35
-2
lines changed

2 files changed

+35
-2
lines changed

pkg/commands/internal/migrate/migrate_linters_settings.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,12 @@ func toGoCriticSettings(old versionone.GoCriticSettings) versiontwo.GoCriticSett
346346
DisabledTags: old.DisabledTags,
347347
}
348348

349-
for k, checkSettings := range settings.SettingsPerCheck {
349+
for k, checkSettings := range old.SettingsPerCheck {
350350
if settings.SettingsPerCheck == nil {
351351
settings.SettingsPerCheck = make(map[string]versiontwo.GoCriticCheckSettings)
352352
}
353353

354-
settings.SettingsPerCheck[k] = checkSettings
354+
settings.SettingsPerCheck[k] = versiontwo.GoCriticCheckSettings(checkSettings)
355355
}
356356

357357
return settings

pkg/commands/internal/migrate/testdata/linters-settings_gocritic.golden.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,3 +230,36 @@ linters:
230230
- performance
231231
- experimental
232232
- opinionated
233+
settings:
234+
captlocal:
235+
paramsonly: false
236+
commentedoutcode:
237+
minlength: 50
238+
elseif:
239+
skipbalanced: false
240+
hugeparam:
241+
sizethreshold: 70
242+
ifelsechain:
243+
minthreshold: 4
244+
nestingreduce:
245+
bodywidth: 4
246+
rangeexprcopy:
247+
sizethreshold: 516
248+
skiptestfuncs: false
249+
rangevalcopy:
250+
sizethreshold: 32
251+
skiptestfuncs: false
252+
ruleguard:
253+
debug: emptyDecl
254+
disable: myGroupName,#myTagName
255+
enable: myGroupName,#myTagName
256+
failon: dsl,import
257+
rules: ${configDir}/ruleguard/rules-*.go,${configDir}/myrule1.go
258+
toomanyresultschecker:
259+
maxresults: 10
260+
truncatecmp:
261+
skiparchdependent: false
262+
underef:
263+
skiprecvderef: false
264+
unnamedresult:
265+
checkexported: true

0 commit comments

Comments
 (0)