diff --git a/pkg/golinters/nosnakecase.go b/pkg/golinters/nosnakecase.go deleted file mode 100644 index 26d5d6d4c84f..000000000000 --- a/pkg/golinters/nosnakecase.go +++ /dev/null @@ -1,19 +0,0 @@ -package golinters - -import ( - "github.com/sivchari/nosnakecase" - "golang.org/x/tools/go/analysis" - - "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" -) - -func NewNoSnakeCase() *goanalysis.Linter { - a := nosnakecase.Analyzer - - return goanalysis.NewLinter( - a.Name, - a.Doc, - []*analysis.Analyzer{a}, - nil, - ).WithLoadMode(goanalysis.LoadModeSyntax) -} diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go index 755dfdebe149..c0124e3e9187 100644 --- a/pkg/lint/lintersdb/manager.go +++ b/pkg/lint/lintersdb/manager.go @@ -637,11 +637,6 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { WithPresets(linter.PresetStyle). WithURL("https://github.com/firefart/nonamedreturns"), - linter.NewConfig(golinters.NewNoSnakeCase()). - WithSince("v1.47.0"). - WithPresets(linter.PresetStyle). - WithURL("https://github.com/sivchari/nosnakecase"), - linter.NewConfig(golinters.NewNoSprintfHostPort()). WithSince("v1.46.0"). WithPresets(linter.PresetStyle). diff --git a/test/run_test.go b/test/run_test.go index cf1f55496912..6f909bcd8a80 100644 --- a/test/run_test.go +++ b/test/run_test.go @@ -95,7 +95,7 @@ func TestTestsAreLintedByDefault(t *testing.T) { } func TestCgoOk(t *testing.T) { - testshared.NewLintRunner(t).Run("--no-config", "--enable-all", "-D", "nosnakecase,gci", getTestDataDir("cgo")).ExpectNoIssues() + testshared.NewLintRunner(t).Run("--no-config", "--enable-all", getTestDataDir("cgo")).ExpectNoIssues() } func TestCgoWithIssues(t *testing.T) { diff --git a/test/testdata/nosnakecase.go b/test/testdata/nosnakecase.go deleted file mode 100644 index 05d48a1d9677..000000000000 --- a/test/testdata/nosnakecase.go +++ /dev/null @@ -1,149 +0,0 @@ -//golangcitest:args -Enosnakecase -package testdata - -import ( - _ "fmt" - f_m_t "fmt" // ERROR "f_m_t contains underscore. You should use mixedCap or MixedCap." -) - -// global variable name with underscore. -var v_v = 0 // ERROR "v_v contains underscore. You should use mixedCap or MixedCap." - -// global constant name with underscore. -const c_c = 0 // ERROR "c_c contains underscore. You should use mixedCap or MixedCap." - -// struct name with underscore. -type S_a struct { // ERROR "S_a contains underscore. You should use mixedCap or MixedCap." - fi int -} - -// non-exported struct field name with underscore. -type Sa struct { - fi_a int // // ERROR "fi_a contains underscore. You should use mixedCap or MixedCap." -} - -// function as struct field, with parameter name with underscore. -type Sb struct { - fib func(p_a int) // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." -} - -// exported struct field with underscore. -type Sc struct { - Fi_A int // ERROR "Fi_A contains underscore. You should use mixedCap or MixedCap." -} - -// function as struct field, with return name with underscore. -type Sd struct { - fib func(p int) (r_a int) // ERROR "r_a contains underscore. You should use mixedCap or MixedCap." -} - -// interface name with underscore. -type I_a interface { // ERROR "I_a contains underscore. You should use mixedCap or MixedCap." - fn(p int) -} - -// interface with parameter name with underscore. -type Ia interface { - fn(p_a int) // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." -} - -// interface with parameter name with underscore. -type Ib interface { - Fn(p_a int) // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." -} - -// function as struct field, with return name with underscore. -type Ic interface { - Fn_a() // ERROR "Fn_a contains underscore. You should use mixedCap or MixedCap." -} - -// interface with return name with underscore. -type Id interface { - Fn() (r_a int) // ERROR "r_a contains underscore. You should use mixedCap or MixedCap." -} - -// function name with underscore. -func f_a() {} // ERROR "f_a contains underscore. You should use mixedCap or MixedCap." - -// function's parameter name with underscore. -func fb(p_a int) {} // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." - -// named return with underscore. -func fc() (r_b int) { // ERROR "r_b contains underscore. You should use mixedCap or MixedCap." - return 0 -} - -// local variable (short declaration) with underscore. -func fd(p int) int { - v_b := p * 2 // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." - - return v_b // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." -} - -// local constant with underscore. -func fe(p int) int { - const v_b = 2 // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." - - return v_b * p // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." -} - -// local variable with underscore. -func ff(p int) int { - var v_b = 2 // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." - - return v_b * p // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." -} - -// inner function, parameter name with underscore. -func fg() { - fgl := func(p_a int) {} // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." - fgl(1) -} - -type Foo struct{} - -// method name with underscore. -func (f Foo) f_a() {} // ERROR "f_a contains underscore. You should use mixedCap or MixedCap." - -// method's parameter name with underscore. -func (f Foo) fb(p_a int) {} // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." - -// named return with underscore. -func (f Foo) fc() (r_b int) { return 0 } // ERROR "r_b contains underscore. You should use mixedCap or MixedCap." - -// local variable (short declaration) with underscore. -func (f Foo) fd(p int) int { - v_b := p * 2 // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." - - return v_b // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." -} - -// local constant with underscore. -func (f Foo) fe(p int) int { - const v_b = 2 // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." - - return v_b * p // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." -} - -// local variable with underscore. -func (f Foo) ff(p int) int { - var v_b = 2 // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." - - return v_b * p // ERROR "v_b contains underscore. You should use mixedCap or MixedCap." -} - -func fna(a, p_a int) {} // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." - -func fna1(a string, p_a int) {} // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." - -func fnb(a, b, p_a int) {} // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." - -func fnb1(a, b string, p_a int) {} // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." - -func fnd( - p_a int, // ERROR "p_a contains underscore. You should use mixedCap or MixedCap." - p_b int, // ERROR "p_b contains underscore. You should use mixedCap or MixedCap." - p_c int, // ERROR "p_c contains underscore. You should use mixedCap or MixedCap." -) { - f_m_t.Println("") // ERROR "f_m_t contains underscore. You should use mixedCap or MixedCap." -}