feat: err113 analyzer name (#4567)

golangci · Mar 28, 2024 · a7868b3 · a7868b3
1 parent 07ffe48
commit a7868b3
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 30 deletions.
diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml
@@ -2525,6 +2525,7 @@ linters:
     - dupl
     - dupword
     - durationcheck
+    - err113
     - errcheck
     - errchkjson
     - errname
@@ -2548,7 +2549,6 @@ linters:
     - gocyclo
     - godot
     - godox
-    - goerr113
     - gofmt
     - gofumpt
     - goheader
@@ -2638,6 +2638,7 @@ linters:
     - dupl
     - dupword
     - durationcheck
+    - err113
     - errcheck
     - errchkjson
     - errname
@@ -2661,7 +2662,6 @@ linters:
     - gocyclo
     - godot
     - godox
-    - goerr113
     - gofmt
     - gofumpt
     - goheader

diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
@@ -250,7 +250,7 @@
             "gocyclo",
             "godot",
             "godox",
-            "goerr113",
+            "err113",
             "gofmt",
             "gofumpt",
             "goheader",

diff --git a/pkg/golinters/goerr113.go → pkg/golinters/err113.go b/pkg/golinters/goerr113.go → pkg/golinters/err113.go
@@ -7,11 +7,13 @@ import (
 	"github.com/golangci/golangci-lint/pkg/goanalysis"
 )
 
-func NewGoerr113() *goanalysis.Linter {
+func NewErr113() *goanalysis.Linter {
+	a := err113.NewAnalyzer()
+
 	return goanalysis.NewLinter(
-		"goerr113",
+		a.Name,
 		"Go linter to check the errors handling expressions",
-		[]*analysis.Analyzer{err113.NewAnalyzer()},
+		[]*analysis.Analyzer{a},
 		nil,
 	).WithLoadMode(goanalysis.LoadModeTypesInfo)
 }
diff --git a/pkg/lint/lintersdb/builder_linter.go b/pkg/lint/lintersdb/builder_linter.go
@@ -252,10 +252,11 @@ func (b LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
 			WithPresets(linter.PresetStyle, linter.PresetComment).
 			WithURL("https://github.com/matoous/godox"),
 
-		linter.NewConfig(golinters.NewGoerr113()).
+		linter.NewConfig(golinters.NewErr113()).
 			WithSince("v1.26.0").
 			WithPresets(linter.PresetStyle, linter.PresetError).
 			WithLoadForGoAnalysis().
+			WithAlternativeNames("goerr113").
 			WithURL("https://github.com/Djarvur/go-err113"),
 
 		linter.NewConfig(golinters.NewGofmt(&cfg.LintersSettings.Gofmt)).

diff --git a/pkg/printers/testdata/golden-json.json b/pkg/printers/testdata/golden-json.json
diff --git a/pkg/printers/testdata/in-report-data.json b/pkg/printers/testdata/in-report-data.json
@@ -135,7 +135,7 @@
         "Name": "godox"
       },
       {
-        "Name": "goerr113"
+        "Name": "err113"
       },
       {
         "Name": "gofmt",

diff --git a/test/testdata/err113.go b/test/testdata/err113.go
@@ -0,0 +1,21 @@
+//golangcitest:args -Eerr113
+package testdata
+
+import "os"
+
+func SimpleEqual(e1, e2 error) bool {
+	return e1 == e2 // want `do not compare errors directly "e1 == e2", use "errors.Is\(e1, e2\)" instead`
+}
+
+func SimpleNotEqual(e1, e2 error) bool {
+	return e1 != e2 // want `do not compare errors directly "e1 != e2", use "!errors.Is\(e1, e2\)" instead`
+}
+
+func CheckGoerr13Import(e error) bool {
+	f, err := os.Create("f.txt")
+	if err != nil {
+		return err == e // want `do not compare errors directly "err == e", use "errors.Is\(err, e\)" instead`
+	}
+	f.Close()
+	return false
+}
diff --git a/test/testdata/goerr113.go b/test/testdata/goerr113.go