@@ -2,29 +2,30 @@ package ginkgolinter
2
2
3
3
import (
4
4
"github.com/nunnatsa/ginkgolinter"
5
- "github.com/nunnatsa/ginkgolinter/types "
5
+ glconfig "github.com/nunnatsa/ginkgolinter/config "
6
6
7
7
"github.com/golangci/golangci-lint/v2/pkg/config"
8
8
"github.com/golangci/golangci-lint/v2/pkg/goanalysis"
9
9
)
10
10
11
11
func New (settings * config.GinkgoLinterSettings ) * goanalysis.Linter {
12
- cfg := & types .Config {}
12
+ cfg := & glconfig .Config {}
13
13
14
14
if settings != nil {
15
- cfg = & types.Config {
16
- SuppressLen : settings .SuppressLenAssertion ,
17
- SuppressNil : settings .SuppressNilAssertion ,
18
- SuppressErr : settings .SuppressErrAssertion ,
19
- SuppressCompare : settings .SuppressCompareAssertion ,
20
- SuppressAsync : settings .SuppressAsyncAssertion ,
21
- ForbidFocus : settings .ForbidFocusContainer ,
22
- SuppressTypeCompare : settings .SuppressTypeCompareWarning ,
23
- AllowHaveLen0 : settings .AllowHaveLenZero ,
24
- ForceExpectTo : settings .ForceExpectTo ,
25
- ValidateAsyncIntervals : settings .ValidateAsyncIntervals ,
26
- ForbidSpecPollution : settings .ForbidSpecPollution ,
27
- ForceSucceedForFuncs : settings .ForceSucceedForFuncs ,
15
+ cfg = & glconfig.Config {
16
+ SuppressLen : settings .SuppressLenAssertion ,
17
+ SuppressNil : settings .SuppressNilAssertion ,
18
+ SuppressErr : settings .SuppressErrAssertion ,
19
+ SuppressCompare : settings .SuppressCompareAssertion ,
20
+ SuppressAsync : settings .SuppressAsyncAssertion ,
21
+ ForbidFocus : settings .ForbidFocusContainer ,
22
+ SuppressTypeCompare : settings .SuppressTypeCompareWarning ,
23
+ AllowHaveLen0 : settings .AllowHaveLenZero ,
24
+ ForceExpectTo : settings .ForceExpectTo ,
25
+ ValidateAsyncIntervals : settings .ValidateAsyncIntervals ,
26
+ ForbidSpecPollution : settings .ForbidSpecPollution ,
27
+ ForceSucceedForFuncs : settings .ForceSucceedForFuncs ,
28
+ ForceAssertionDescription : settings .ForceAssertionDescription ,
28
29
}
29
30
}
30
31
0 commit comments