From 373692af87b177d48898c89ad53b6054f5b339bf Mon Sep 17 00:00:00 2001
From: Alec Thomas <alec@swapoff.org>
Date: Fri, 1 Nov 2024 11:55:27 +1100
Subject: [PATCH] refactor: reuse callAnyFunction for callFunction

Rather than duplicating basically identical calling logic
---
 callbacks.go | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/callbacks.go b/callbacks.go
index 45ef0d25..2d6507a2 100644
--- a/callbacks.go
+++ b/callbacks.go
@@ -78,28 +78,19 @@ func callFunction(f reflect.Value, bindings bindings) error {
 	if f.Kind() != reflect.Func {
 		return fmt.Errorf("expected function, got %s", f.Type())
 	}
-	in := []reflect.Value{}
 	t := f.Type()
 	if t.NumOut() != 1 || !t.Out(0).Implements(callbackReturnSignature) {
 		return fmt.Errorf("return value of %s must implement \"error\"", t)
 	}
-	for i := 0; i < t.NumIn(); i++ {
-		pt := t.In(i)
-		if argf, ok := bindings[pt]; ok {
-			argv, err := argf()
-			if err != nil {
-				return err
-			}
-			in = append(in, argv)
-		} else {
-			return fmt.Errorf("couldn't find binding of type %s for parameter %d of %s(), use kong.Bind(%s)", pt, i, t, pt)
-		}
+	out, err := callAnyFunction(f, bindings)
+	if err != nil {
+		return err
 	}
-	out := f.Call(in)
-	if out[0].IsNil() {
+	ferr := out[0]
+	if ferrv := reflect.ValueOf(ferr); !ferrv.IsValid() || ferrv.IsNil() {
 		return nil
 	}
-	return out[0].Interface().(error) //nolint
+	return ferr.(error) //nolint:forcetypeassert
 }
 
 func callAnyFunction(f reflect.Value, bindings bindings) (out []any, err error) {