combine markers

Signed-off-by: sivchari <shibuuuu5@gmail.com>

Author: sivchari

pkg/analysis/duplicatemarkers/analyzer.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"go/ast"
 	"go/token"
+	"go/types"
 
 	"golang.org/x/tools/go/analysis"
 
@@ -63,20 +64,46 @@ func checkField(pass *analysis.Pass, field *ast.Field, markersAccess markers.Mar
 		return
 	}
 
-	fieldMarkers := markersAccess.FieldMarkers(field)
+	markerSet := collectMarkers(pass, markersAccess, field)
 
-	markerSet := markers.NewMarkerSet()
+	seen := markers.NewMarkerSet()
 
-	for _, marker := range fieldMarkers.UnsortedList() {
-		if !markerSet.HasWithValue(marker.String()) {
-			markerSet.Insert(marker)
+	for _, marker := range markerSet.UnsortedList() {
+		if !seen.HasWithValue(marker.String()) {
+			seen.Insert(marker)
 			continue
 		}
 
 		report(pass, field.Pos(), field.Names[0].Name, marker)
 	}
 }
 
+func collectMarkers(pass *analysis.Pass, markersAccess markers.Markers, field *ast.Field) markers.MarkerSet {
+	markers := markersAccess.FieldMarkers(field)
+
+	if _, ok := pass.TypesInfo.TypeOf(field.Type).(*types.Basic); ok {
+		return markers
+	}
+
+	ident, ok := field.Type.(*ast.Ident)
+	if !ok {
+		return markers
+	}
+
+	typeSpec, ok := ident.Obj.Decl.(*ast.TypeSpec)
+	if !ok {
+		return markers
+	}
+
+	typeMarkers := markersAccess.TypeMarkers(typeSpec)
+
+	// duplicatemarkers removes duplicate markers without the first line.
+	// By inserting the field markers after the type markers, it allows the markers to be removed from the field.
+	typeMarkers.Insert(markers.UnsortedList()...)
+
+	return typeMarkers
+}
+
 func checkTypeSpec(pass *analysis.Pass, typeSpec *ast.TypeSpec, markersAccess markers.Markers) {
 	if typeSpec == nil {
 		return

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

@@ -55,6 +55,9 @@ type DuplicateMarkerSpec struct { // want "DuplicateMarkerSpec has duplicated ma
 	// +kubebuilder:validation:MaxLength=10
 	DuplicatedMaxLength int `json:"duplicatedMaxLength"` // want "DuplicatedMaxLength has duplicated markers kubebuilder:validation:MaxLength=10"
 
+	// +kubebuilder:validation:MaxLength=10
+	DuplicatedMaxLengthIncludingTypeMarker MaxLength `json:"duplicatedMaxLengthIncludingTypeMarker"` // want "DuplicatedMaxLengthIncludingTypeMarker has duplicated markers kubebuilder:validation:MaxLength=10"
+
 	// +listType=map
 	// +listMapKey=primaryKey
 	// +listMapKey=secondaryKey

pkg/analysis/duplicatemarkers/testdata/src/a/a.go.golden

@@ -49,6 +49,8 @@ type DuplicateMarkerSpec struct { // want "DuplicateMarkerSpec has duplicated ma
 	// +kubebuilder:validation:MaxLength=10
 	DuplicatedMaxLength int `json:"duplicatedMaxLength"` // want "DuplicatedMaxLength has duplicated markers kubebuilder:validation:MaxLength=10"
 
+	DuplicatedMaxLengthIncludingTypeMarker MaxLength `json:"duplicatedMaxLengthIncludingTypeMarker"` // want "DuplicatedMaxLengthIncludingTypeMarker has duplicated markers kubebuilder:validation:MaxLength=10"
+
 	// +listType=map
 	// +listMapKey=primaryKey
 	// +listMapKey=secondaryKey