Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,10 @@ linters-settings:
# Default: false
forbid-spec-pollution: true

# Force using the Succeed matcher for error functions, and the HaveOccurred matcher for non-function error values.
# Default: false
force-succeed: true

gochecksumtype:
# Presence of `default` case in switch statements satisfies exhaustiveness, if all members are not listed.
# Default: true
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,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.17.0
github.com/nunnatsa/ginkgolinter v0.18.0
github.com/pelletier/go-toml/v2 v2.2.3
github.com/polyfloyd/go-errorlint v1.6.0
github.com/quasilyte/go-ruleguard/dsl v0.3.22
Expand Down
4 changes: 2 additions & 2 deletions go.sum

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
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,11 @@
"description": "Trigger a warning for variable assignments in ginkgo containers like `Describe`, `Context` and `When`, instead of in `BeforeEach()`.",
"type": "boolean",
"default": false
},
"force-succeed": {
"description": "Force using the Succeed matcher for error functions, and the HaveOccurred matcher for non-function error values.",
"type": "boolean",
"default": false
}
}
},
Expand Down
1 change: 1 addition & 0 deletions pkg/config/linters_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ type GinkgoLinterSettings struct {
ForceExpectTo bool `mapstructure:"force-expect-to"`
ValidateAsyncIntervals bool `mapstructure:"validate-async-intervals"`
ForbidSpecPollution bool `mapstructure:"forbid-spec-pollution"`
ForceSucceedForFuncs bool `mapstructure:"force-succeed"`
}

type GoChecksumTypeSettings struct {
Expand Down
1 change: 1 addition & 0 deletions pkg/golinters/ginkgolinter/ginkgolinter.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func New(settings *config.GinkgoLinterSettings) *goanalysis.Linter {
ForceExpectTo: types.Boolean(settings.ForceExpectTo),
ValidateAsyncIntervals: types.Boolean(settings.ValidateAsyncIntervals),
ForbidSpecPollution: types.Boolean(settings.ForbidSpecPollution),
ForceSucceedForFuncs: types.Boolean(settings.ForceSucceedForFuncs),
}
}

Expand Down
Loading