typechecker uses qualifiedFieldName

Author: krishagarwal278

pkg/analysis/numericbounds/analyzer.go

@@ -71,6 +71,7 @@ func run(pass *analysis.Pass) (any, error) {
 
 	inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markershelper.Markers, qualifiedFieldName string) {
 		// Create TypeChecker with closure capturing markersAccess and qualifiedFieldName
+		// Ignore TypeChecker's prefix since we use qualifiedFieldName from inspector
 		typeChecker := utils.NewTypeChecker(func(pass *analysis.Pass, ident *ast.Ident, node ast.Node, _ string) {
 			checkNumericType(pass, ident, node, markersAccess, qualifiedFieldName)
 		})

pkg/analysis/numericbounds/testdata/src/a/a.go

@@ -145,10 +145,6 @@ type SliceFields struct {
 	InvalidSlice []int32 // want "SliceFields.InvalidSlice is missing minimum bound validation marker" "SliceFields.InvalidSlice is missing maximum bound validation marker"
 
 	InvalidSlice64 []int64 // want "SliceFields.InvalidSlice64 is missing minimum bound validation marker" "SliceFields.InvalidSlice64 is missing maximum bound validation marker"
-
-	// +kubebuilder:validation:items:Minimum=0
-	// +kubebuilder:validation:items:Maximum=100
-	ValidSliceWithBounds []int32
 }
 
 // TypeAliasFields with type aliases should be checked

pkg/analysis/utils/type_check.go

@@ -31,16 +31,14 @@ type TypeChecker interface {
 }
 
 // NewTypeChecker returns a new TypeChecker with the provided checkFunc.
-func NewTypeChecker(isTypeFunc func(pass *analysis.Pass, ident ast.Expr) bool, checkFunc func(pass *analysis.Pass, expr ast.Expr, node ast.Node, prefix string)) TypeChecker {
+func NewTypeChecker(checkFunc func(pass *analysis.Pass, ident *ast.Ident, node ast.Node, qualifiedFieldName string)) TypeChecker {
 	return &typeChecker{
-		isTypeFunc: isTypeFunc,
-		checkFunc:  checkFunc,
+		checkFunc: checkFunc,
 	}
 }
 
 type typeChecker struct {
-	isTypeFunc func(pass *analysis.Pass, expr ast.Expr) bool
-	checkFunc  func(pass *analysis.Pass, expr ast.Expr, node ast.Node, prefix string)
+	checkFunc func(pass *analysis.Pass, ident *ast.Ident, node ast.Node, qualifiedFieldName string)
 }
 
 // CheckNode checks the provided node for built-in types.
@@ -86,11 +84,6 @@ func (t *typeChecker) checkTypeSpec(pass *analysis.Pass, tSpec *ast.TypeSpec, no
 }
 
 func (t *typeChecker) checkTypeExpr(pass *analysis.Pass, typeExpr ast.Expr, node ast.Node, prefix string) {
-	if t.isTypeFunc(pass, typeExpr) {
-		t.checkFunc(pass, typeExpr, node, prefix)
-		return
-	}
-
 	switch typ := typeExpr.(type) {
 	case *ast.Ident:
 		t.checkIdent(pass, typ, node, prefix)
@@ -109,6 +102,12 @@ func (t *typeChecker) checkTypeExpr(pass *analysis.Pass, typeExpr ast.Expr, node
 // checkIdent calls the checkFunc with the ident, when we have hit a built-in type.
 // If the ident is not a built in, we look at the underlying type until we hit a built-in type.
 func (t *typeChecker) checkIdent(pass *analysis.Pass, ident *ast.Ident, node ast.Node, prefix string) {
+	if IsBasicType(pass, ident) {
+		// We've hit a built-in type, no need to check further.
+		t.checkFunc(pass, ident, node, prefix)
+		return
+	}
+
 	tSpec, ok := LookupTypeSpec(pass, ident)
 	if !ok {
 		return