cmplint -> ptrequality

eikemeier · eikemeier · commit 4291cde9a183 · 2025-06-08T17:16:52.000+02:00
Signed-off-by: Oliver Eikemeier &lt;eikemeier@fillmore-labs.com&gt;
diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
@@ -728,7 +728,6 @@
             "bidichk",
             "bodyclose",
             "canonicalheader",
-            "cmplint",
             "containedctx",
             "contextcheck",
             "copyloopvar",
@@ -805,6 +804,7 @@
             "predeclared",
             "promlinter",
             "protogetter",
+            "ptrequality",
             "reassign",
             "recvcheck",
             "revive",
@@ -946,17 +946,6 @@
             }
           }
         },
-        "cmplintSettings": {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "check-is": {
-              "description": "Suppress check for errors with \"Is\" method",
-              "type": "boolean",
-              "default": true
-            }
-          }
-        },
         "cyclopSettings": {
           "type": "object",
           "additionalProperties": false,
@@ -2893,6 +2882,17 @@
             }
           }
         },
+        "ptrequalitySettings": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "check-is": {
+              "description": "Suppress check for errors with \"Is\" method",
+              "type": "boolean",
+              "default": true
+            }
+          }
+        },
         "reviveSettings": {
           "type": "object",
           "additionalProperties": false,
@@ -4374,9 +4374,6 @@
             "bidichk": {
               "$ref": "#/definitions/settings/definitions/bidichkSettings"
             },
-            "cmplint": {
-              "$ref": "#/definitions/settings/definitions/cmplintSettings"
-            },
             "cyclop": {
               "$ref": "#/definitions/settings/definitions/cyclopSettings"
             },
@@ -4545,6 +4542,9 @@
             "protogetter": {
               "$ref": "#/definitions/settings/definitions/protogetterSettings"
             },
+            "ptrequality": {
+              "$ref": "#/definitions/settings/definitions/ptrequalitySettings"
+            },
             "revive": {
               "$ref": "#/definitions/settings/definitions/reviveSettings"
             },
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -12,9 +12,6 @@ var defaultLintersSettings = LintersSettings{
 	Asasalint: AsasalintSettings{
 		UseBuiltinExclusions: true,
 	},
-	Cmplint: CmplintSettings{
-		CheckIs: true,
-	},
 	Decorder: DecorderSettings{
 		DecOrder:                  []string{"type", "const", "var", "func"},
 		DisableDecNumCheck:        true,
@@ -140,6 +137,9 @@ var defaultLintersSettings = LintersSettings{
 	Predeclared: PredeclaredSettings{
 		Qualified: false,
 	},
+	PtrEquality: PtrEqualitySettings{
+		CheckIs: true,
+	},
 	SlogLint: SlogLintSettings{
 		NoMixedArgs:    true,
 		KVOnly:         false,
@@ -212,7 +212,6 @@ type LintersSettings struct {
 	BiDiChk                  BiDiChkSettings                  `mapstructure:"bidichk"`
 	CopyLoopVar              CopyLoopVarSettings              `mapstructure:"copyloopvar"`
 	Cyclop                   CyclopSettings                   `mapstructure:"cyclop"`
-	Cmplint                  CmplintSettings                  `mapstructure:"cmplint"`
 	Decorder                 DecorderSettings                 `mapstructure:"decorder"`
 	Depguard                 DepGuardSettings                 `mapstructure:"depguard"`
 	Dogsled                  DogsledSettings                  `mapstructure:"dogsled"`
@@ -267,6 +266,7 @@ type LintersSettings struct {
 	Predeclared              PredeclaredSettings              `mapstructure:"predeclared"`
 	Promlinter               PromlinterSettings               `mapstructure:"promlinter"`
 	ProtoGetter              ProtoGetterSettings              `mapstructure:"protogetter"`
+	PtrEquality              PtrEqualitySettings              `mapstructure:"ptrequality"`
 	Reassign                 ReassignSettings                 `mapstructure:"reassign"`
 	Recvcheck                RecvcheckSettings                `mapstructure:"recvcheck"`
 	Revive                   ReviveSettings                   `mapstructure:"revive"`
@@ -323,10 +323,6 @@ type BiDiChkSettings struct {
 	PopDirectionalIsolate    bool `mapstructure:"pop-directional-isolate"`
 }
 
-type CmplintSettings struct {
-	CheckIs bool `mapstructure:"check-is"`
-}
-
 type CopyLoopVarSettings struct {
 	CheckAlias bool `mapstructure:"check-alias"`
 }
@@ -769,6 +765,10 @@ type ProtoGetterSettings struct {
 	ReplaceFirstArgInAppend bool     `mapstructure:"replace-first-arg-in-append"`
 }
 
+type PtrEqualitySettings struct {
+	CheckIs bool `mapstructure:"check-is"`
+}
+
 type ReassignSettings struct {
 	Patterns []string `mapstructure:"patterns"`
 }
diff --git a/pkg/golinters/cmplint/cmplint.go b/pkg/golinters/cmplint/cmplint.go
diff --git a/pkg/golinters/ptrequality/ptrequality.go b/pkg/golinters/ptrequality/ptrequality.go
@@ -0,0 +1,30 @@
+package ptrequality
+
+import (
+	"fillmore-labs.com/cmplint/analyzer"
+
+	"github.com/golangci/golangci-lint/v2/pkg/config"
+	"github.com/golangci/golangci-lint/v2/pkg/goanalysis"
+)
+
+const (
+	Name = "ptrequality"
+	Doc  = "Detect new pointers used within equality comparisons, making the result always false or undefined"
+)
+
+func New(settings *config.PtrEqualitySettings) *goanalysis.Linter {
+	a := *analyzer.Analyzer
+	a.Name = Name
+	a.Doc = Doc
+
+	var cfg map[string]any
+	if settings != nil {
+		cfg = map[string]any{
+			"check-is": settings.CheckIs,
+		}
+	}
+
+	return goanalysis.NewLinterFromAnalyzer(&a).
+		WithConfig(cfg).
+		WithLoadMode(goanalysis.LoadModeTypesInfo)
+}
diff --git a/pkg/golinters/ptrequality/ptrequality_integration_test.go b/pkg/golinters/ptrequality/ptrequality_integration_test.go
@@ -1,4 +1,4 @@
-package cmplint
+package ptrequality
 
 import (
 	"testing"
diff --git a/pkg/golinters/ptrequality/testdata/ptrequality.go b/pkg/golinters/ptrequality/testdata/ptrequality.go
@@ -1,5 +1,5 @@
-//golangcitest:args -Ecmplint
-//golangcitest:config_path testdata/cmplint.yml
+//golangcitest:args -Eptrequality
+//golangcitest:config_path testdata/ptrequality.yml
 package main
 
 import (
diff --git a/pkg/golinters/ptrequality/testdata/ptrequality.yml b/pkg/golinters/ptrequality/testdata/ptrequality.yml
@@ -2,5 +2,5 @@ version: "2"
 
 linters:
   settings:
-    cmplint:
+    ptrequality:
       check-is: false
diff --git a/pkg/lint/lintersdb/builder_linter.go b/pkg/lint/lintersdb/builder_linter.go
@@ -9,7 +9,6 @@ import (
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/bidichk"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/bodyclose"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/canonicalheader"
-	"github.com/golangci/golangci-lint/v2/pkg/golinters/cmplint"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/containedctx"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/contextcheck"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/copyloopvar"
@@ -90,6 +89,7 @@ import (
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/predeclared"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/promlinter"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/protogetter"
+	"github.com/golangci/golangci-lint/v2/pkg/golinters/ptrequality"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/reassign"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/recvcheck"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/revive"
@@ -169,11 +169,6 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
 			WithAutoFix().
 			WithURL("https://github.com/lasiar/canonicalheader"),
 
-		linter.NewConfig(cmplint.New(&cfg.Linters.Settings.Cmplint)).
-			WithSince("v2.2.0").
-			WithLoadForGoAnalysis().
-			WithURL("https://github.com/fillmore-labs/cmplint"),
-
 		linter.NewConfig(containedctx.New()).
 			WithSince("v1.44.0").
 			WithLoadForGoAnalysis().
@@ -561,6 +556,11 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
 			WithAutoFix().
 			WithURL("https://github.com/ghostiam/protogetter"),
 
+		linter.NewConfig(ptrequality.New(&cfg.Linters.Settings.PtrEquality)).
+			WithSince("v2.2.0").
+			WithLoadForGoAnalysis().
+			WithURL("https://github.com/fillmore-labs/cmplint"),
+
 		linter.NewConfig(reassign.New(&cfg.Linters.Settings.Reassign)).
 			WithSince("v1.49.0").
 			WithLoadForGoAnalysis().

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cmplint`
	`1`	`+package ptrequality`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"testing"`