diff --git a/.golangci.example.yml b/.golangci.example.yml index 600084187f58..cb8045d635f2 100644 --- a/.golangci.example.yml +++ b/.golangci.example.yml @@ -1065,11 +1065,11 @@ linters-settings: check-receiver: false # Check named return values. (defaults to false) check-return: false - # Ignore "ok" variables that hold the bool return value of a type assertion. (defaults to true) + # Ignore "ok" variables that hold the bool return value of a type assertion. (defaults to false) ignore-type-assert-ok: false - # Ignore "ok" variables that hold the bool return value of a map index. (defaults to true) + # Ignore "ok" variables that hold the bool return value of a map index. (defaults to false) ignore-map-index-ok: false - # Ignore "ok" variables that hold the bool return value of a channel receive. (defaults to true) + # Ignore "ok" variables that hold the bool return value of a channel receive. (defaults to false) ignore-chan-recv-ok: false # Optional list of variable names that should be ignored completely. (defaults to empty list) ignore-names: diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go index 1df16729eb00..338e6b14d3fa 100644 --- a/pkg/config/linters_settings.go +++ b/pkg/config/linters_settings.go @@ -82,11 +82,8 @@ var defaultLintersSettings = LintersSettings{ Algo: "cha", }, Varnamelen: VarnamelenSettings{ - MaxDistance: 5, - MinNameLength: 3, - IgnoreTypeAssertOk: true, - IgnoreMapIndexOk: true, - IgnoreChanRecvOk: true, + MaxDistance: 5, + MinNameLength: 3, }, WSL: WSLSettings{ StrictAppend: true,