Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion callbacks.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,19 @@ func getMethods(value reflect.Value, name string) []reflect.Value {
for i := 0; i < value.NumField(); i++ {
field := value.Field(i)
fieldType := t.Field(i)
if fieldType.IsExported() && fieldType.Anonymous {
if !fieldType.IsExported() {
continue
}

// Hooks on exported embedded fields should be called.
if fieldType.Anonymous {
receivers = append(receivers, field)
continue
}

// Hooks on exported fields that are not exported,
// but are tagged with `embed:""` should be called.
if _, ok := fieldType.Tag.Lookup("embed"); ok {
receivers = append(receivers, field)
}
}
Expand Down
15 changes: 14 additions & 1 deletion kong_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2413,9 +2413,19 @@ func (e *EmbeddedCallback) AfterApply() error {
return nil
}

type taggedEmbeddedCallback struct {
Tagged bool
}

func (e *taggedEmbeddedCallback) AfterApply() error {
e.Tagged = true
return nil
}

type EmbeddedRoot struct {
EmbeddedCallback
Root bool
Tagged taggedEmbeddedCallback `embed:""`
Root bool
}

func (e *EmbeddedRoot) AfterApply() error {
Expand All @@ -2432,6 +2442,9 @@ func TestEmbeddedCallbacks(t *testing.T) {
EmbeddedCallback: EmbeddedCallback{
Embedded: true,
},
Tagged: taggedEmbeddedCallback{
Tagged: true,
},
Root: true,
}
assert.Equal(t, expected, actual)
Expand Down