core: add default config

stevenh · stevenh · commit 5d2af72d8dcf · 2022-11-08T22:40:05.000Z
Add default config, correct want and fix linter name.
diff --git a/go.mod b/go.mod
@@ -93,7 +93,7 @@ require (
 	github.com/spf13/viper v1.12.0
 	github.com/ssgreg/nlreturn/v2 v2.2.1
 	github.com/stbenjam/no-sprintf-host-port v0.1.1
-	github.com/stevenh/go-uncalled v0.7.1
+	github.com/stevenh/go-uncalled v0.7.3
 	github.com/stretchr/testify v1.8.1
 	github.com/tdakkota/asciicheck v0.1.1
 	github.com/tetafro/godot v1.4.11
diff --git a/go.sum b/go.sum
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -109,6 +109,7 @@ var defaultLintersSettings = LintersSettings{
 		SkipRegexp:    `(export|internal)_test\.go`,
 		AllowPackages: []string{"main"},
 	},
+	Uncalled: uncalled.DefaultConfig(),
 	Unparam: UnparamSettings{
 		Algo: "cha",
 	},
diff --git a/test/linters_test.go b/test/linters_test.go
@@ -30,6 +30,7 @@ func TestTypecheck(t *testing.T) {
 func TestSourcesFromTestdataSubDir(t *testing.T) {
 	subDirs := []string{
 		"loggercheck",
+		"uncalled",
 	}
 
 	for _, dir := range subDirs {
diff --git a/test/testdata/uncalled/uncalled.go b/test/testdata/uncalled/uncalled.go
@@ -1,12 +1,12 @@
-//golangcitest:args -Erowserr
+//golangcitest:args -Euncalled
 package testdata
 
 import (
 	"database/sql"
 )
 
 func RowsErrNotChecked(db *sql.DB) {
-	rows, err := db.Query("select id from tb") // want "rows.Err\\(\\) must be checked"
+	rows, err := db.Query("select id from tb") // want "rows.Err\\(\\) must be called"
 	if err != nil {
 		// Handle error.
 	}

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ func TestTypecheck(t *testing.T) {`
`30`	`30`	`func TestSourcesFromTestdataSubDir(t *testing.T) {`
`31`	`31`	`subDirs := []string{`
`32`	`32`	`"loggercheck",`
	`33`	`+ "uncalled",`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`for _, dir := range subDirs {`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-//golangcitest:args -Erowserr`
	`1`	`+//golangcitest:args -Euncalled`
`2`	`2`	`package testdata`
`3`	`3`
`4`	`4`	`import (`
`5`	`5`	`"database/sql"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func RowsErrNotChecked(db *sql.DB) {`
`9`		`- rows, err := db.Query("select id from tb") // want "rows.Err\\(\\) must be checked"`
	`9`	`+ rows, err := db.Query("select id from tb") // want "rows.Err\\(\\) must be called"`
`10`	`10`	`if err != nil {`
`11`	`11`	`// Handle error.`
`12`	`12`	`}`