Skip to content

use TypeAwareMarkerCollectionForField to collect markers #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2025
+81 −1
Merged

use TypeAwareMarkerCollectionForField to collect markers #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/analysis/ssatags/analyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func (a *analyzer) checkField(pass *analysis.Pass, field *ast.Field, markersAcce
return
}

fieldMarkers := markersAccess.FieldMarkers(field)
fieldMarkers := utils.TypeAwareMarkerCollectionForField(pass, markersAccess, field)
if fieldMarkers == nil {
return
}
Expand Down
16 changes: 16 additions & 0 deletions pkg/analysis/ssatags/testdata/src/a/a.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package a

import (
"a/aa"
)

type TestObject struct {
Name string `json:"name"`
ID int `json:"id"`
Expand All @@ -22,11 +26,23 @@ type StringArrayAlias = []string
type ByteArray []byte
type ByteArrayAlias = []byte

// +listType=atomic
type StringArrayAtomic StringArray

type SSATagsTestSpec struct {
// Valid atomic list - should pass
// +listType=atomic
AtomicStringList []string `json:"atomicStringList,omitempty"`

// Valid atomic object list - should pass
StringArrayAtomic StringArrayAtomic `json:"stringArrayAtomic,omitempty"`

// Valid atomic object list from another file - should pass
OtherFileStringArrayAtomic OtherFileStringArrayAtomic `json:"otherFileStringArrayAtomic,omitempty"`

// Valid atomic object list from another package - should pass
OtherPackageStringArrayAtomic aa.OtherPackageStringArrayAtomic `json:"otherPackageStringArrayAtomic,omitempty"`

// Valid atomic object list - should pass
// +listType=atomic
AtomicObjectList []TestObject `json:"atomicObjectList,omitempty"`
Expand Down
16 changes: 16 additions & 0 deletions pkg/analysis/ssatags/testdata/src/a/a.go.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package a

import (
"a/aa"
)

type TestObject struct {
Name string `json:"name"`
ID int `json:"id"`
Expand All @@ -22,11 +26,23 @@ type StringArrayAlias = []string
type ByteArray []byte
type ByteArrayAlias = []byte

// +listType=atomic
type StringArrayAtomic StringArray

type SSATagsTestSpec struct {
// Valid atomic list - should pass
// +listType=atomic
AtomicStringList []string `json:"atomicStringList,omitempty"`

// Valid atomic object list - should pass
StringArrayAtomic StringArrayAtomic `json:"stringArrayAtomic,omitempty"`

// Valid atomic object list from another file - should pass
OtherFileStringArrayAtomic OtherFileStringArrayAtomic `json:"otherFileStringArrayAtomic,omitempty"`

// Valid atomic object list from another package - should pass
OtherPackageStringArrayAtomic aa.OtherPackageStringArrayAtomic `json:"otherPackageStringArrayAtomic,omitempty"`

// Valid atomic object list - should pass
// +listType=atomic
AtomicObjectList []TestObject `json:"atomicObjectList,omitempty"`
Expand Down
4 changes: 4 additions & 0 deletions pkg/analysis/ssatags/testdata/src/a/aa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package a

// +listType=atomic
type OtherFileStringArrayAtomic []string
4 changes: 4 additions & 0 deletions pkg/analysis/ssatags/testdata/src/a/aa/aa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package aa

// +listType=atomic
type OtherPackageStringArrayAtomic []string
16 changes: 16 additions & 0 deletions pkg/analysis/ssatags/testdata/src/b/b.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package b

import (
"b/bb"
)

type TestObject struct {
Name string `json:"name"`
ID int `json:"id"`
Expand All @@ -22,11 +26,23 @@ type StringArrayAlias = []string
type ByteArray []byte
type ByteArrayAlias = []byte

// +listType=atomic
type StringArrayAtomic StringArray

type SSATagsTestSpec struct {
// Valid atomic list - should pass
// +listType=atomic
AtomicStringList []string `json:"atomicStringList,omitempty"`

// Valid atomic object list - should pass
StringArrayAtomic StringArrayAtomic `json:"stringArrayAtomic,omitempty"`

// Valid atomic object list from another file - should pass
OtherFileStringArrayAtomic OtherFileStringArrayAtomic `json:"otherFileStringArrayAtomic,omitempty"`

// Valid atomic object list from another package - should pass
OtherPackageStringArrayAtomic bb.OtherPackageStringArrayAtomic `json:"otherPackageStringArrayAtomic,omitempty"`

// Valid atomic object list - should pass
// +listType=atomic
AtomicObjectList []TestObject `json:"atomicObjectList,omitempty"`
Expand Down
16 changes: 16 additions & 0 deletions pkg/analysis/ssatags/testdata/src/b/b.go.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package b

import (
"b/bb"
)

type TestObject struct {
Name string `json:"name"`
ID int `json:"id"`
Expand All @@ -22,11 +26,23 @@ type StringArrayAlias = []string
type ByteArray []byte
type ByteArrayAlias = []byte

// +listType=atomic
type StringArrayAtomic StringArray

type SSATagsTestSpec struct {
// Valid atomic list - should pass
// +listType=atomic
AtomicStringList []string `json:"atomicStringList,omitempty"`

// Valid atomic object list - should pass
StringArrayAtomic StringArrayAtomic `json:"stringArrayAtomic,omitempty"`

// Valid atomic object list from another file - should pass
OtherFileStringArrayAtomic OtherFileStringArrayAtomic `json:"otherFileStringArrayAtomic,omitempty"`

// Valid atomic object list from another package - should pass
OtherPackageStringArrayAtomic bb.OtherPackageStringArrayAtomic `json:"otherPackageStringArrayAtomic,omitempty"`

// Valid atomic object list - should pass
// +listType=atomic
AtomicObjectList []TestObject `json:"atomicObjectList,omitempty"`
Expand Down
4 changes: 4 additions & 0 deletions pkg/analysis/ssatags/testdata/src/b/bb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package b

// +listType=atomic
type OtherFileStringArrayAtomic []string
4 changes: 4 additions & 0 deletions pkg/analysis/ssatags/testdata/src/b/bb/bb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package bb

// +listType=atomic
type OtherPackageStringArrayAtomic []string