Skip to content

build(deps): bump github.com/nunnatsa/ginkgolinter from 0.19.1 to 0.20.0 #5932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 12, 2025
+32 −21
Merged

build(deps): bump github.com/nunnatsa/ginkgolinter from 0.19.1 to 0.20.0 #5932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac8737c
build(deps): bump github.com/nunnatsa/ginkgolinter from 0.19.1 to 0.20.0
dependabot[bot] Jul 10, 2025
fc25e31
chore: update implementation
ldez Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .golangci.next.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,10 @@ linters:
# Default: false
force-succeed: true

# Force adding assertion descriptions to gomega matchers.
# Default: false
force-assertion-description: true

gochecksumtype:
# Presence of `default` case in switch statements satisfies exhaustiveness, if all members are not listed.
# Default: true
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ require (
github.com/nakabonne/nestif v0.3.1
github.com/nishanths/exhaustive v0.12.0
github.com/nishanths/predeclared v0.2.2
github.com/nunnatsa/ginkgolinter v0.19.1
github.com/nunnatsa/ginkgolinter v0.20.0
github.com/pelletier/go-toml/v2 v2.2.4
github.com/polyfloyd/go-errorlint v1.8.0
github.com/quasilyte/go-ruleguard/dsl v0.3.22
Expand Down Expand Up @@ -213,7 +213,7 @@ require (
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
golang.org/x/exp/typeparams v0.0.0-20250620022241-b7579e27df2b // indirect
golang.org/x/text v0.26.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions jsonschema/golangci.next.jsonschema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,6 +1509,11 @@
"description": "Force using the Succeed matcher for error functions, and the HaveOccurred matcher for non-function error values.",
"type": "boolean",
"default": false
},
"force-assertion-description": {
"description": "Force adding assertion descriptions to gomega matchers.",
"type": "boolean",
"default": false
}
}
},
Expand Down
1 change: 1 addition & 0 deletions pkg/config/linters_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ type GinkgoLinterSettings struct {
ValidateAsyncIntervals bool `mapstructure:"validate-async-intervals"`
ForbidSpecPollution bool `mapstructure:"forbid-spec-pollution"`
ForceSucceedForFuncs bool `mapstructure:"force-succeed"`
ForceAssertionDescription bool `mapstructure:"force-assertion-description"`
}

type GoChecksumTypeSettings struct {
Expand Down
31 changes: 16 additions & 15 deletions pkg/golinters/ginkgolinter/ginkgolinter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,30 @@ package ginkgolinter

import (
"github.com/nunnatsa/ginkgolinter"
"github.com/nunnatsa/ginkgolinter/types"
glconfig "github.com/nunnatsa/ginkgolinter/config"

"github.com/golangci/golangci-lint/v2/pkg/config"
"github.com/golangci/golangci-lint/v2/pkg/goanalysis"
)

func New(settings *config.GinkgoLinterSettings) *goanalysis.Linter {
cfg := &types.Config{}
cfg := &glconfig.Config{}

if settings != nil {
cfg = &types.Config{
SuppressLen: settings.SuppressLenAssertion,
SuppressNil: settings.SuppressNilAssertion,
SuppressErr: settings.SuppressErrAssertion,
SuppressCompare: settings.SuppressCompareAssertion,
SuppressAsync: settings.SuppressAsyncAssertion,
ForbidFocus: settings.ForbidFocusContainer,
SuppressTypeCompare: settings.SuppressTypeCompareWarning,
AllowHaveLen0: settings.AllowHaveLenZero,
ForceExpectTo: settings.ForceExpectTo,
ValidateAsyncIntervals: settings.ValidateAsyncIntervals,
ForbidSpecPollution: settings.ForbidSpecPollution,
ForceSucceedForFuncs: settings.ForceSucceedForFuncs,
cfg = &glconfig.Config{
SuppressLen: settings.SuppressLenAssertion,
SuppressNil: settings.SuppressNilAssertion,
SuppressErr: settings.SuppressErrAssertion,
SuppressCompare: settings.SuppressCompareAssertion,
SuppressAsync: settings.SuppressAsyncAssertion,
ForbidFocus: settings.ForbidFocusContainer,
SuppressTypeCompare: settings.SuppressTypeCompareWarning,
AllowHaveLen0: settings.AllowHaveLenZero,
ForceExpectTo: settings.ForceExpectTo,
ValidateAsyncIntervals: settings.ValidateAsyncIntervals,
ForbidSpecPollution: settings.ForbidSpecPollution,
ForceSucceedForFuncs: settings.ForceSucceedForFuncs,
ForceAssertionDescription: settings.ForceAssertionDescription,
}
}

Expand Down
Loading