Fix more tests

dearchap · Jun 26, 2023 · 983228e · 983228e
1 parent afdcf77
commit 983228e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/context.go b/context.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"log"
 	"strings"
 )
 
@@ -156,6 +157,10 @@ func (cCtx *Context) Value(name string) interface{} {
 		if g, ok := f.(ValueGetter); ok {
 			return g.GetFlagValue().Get()
 		}
+		if g, ok := f.(flag.Getter); ok {
+			log.Printf("%v", g.Get())
+			return g.Get()
+		}
 	}
 	return nil
 }

diff --git a/flag_impl.go b/flag_impl.go
@@ -29,7 +29,13 @@ type fnValue struct {
 
 func (f fnValue) Get() any           { return f.v.Get() }
 func (f fnValue) Set(s string) error { return f.fn(s) }
-func (f fnValue) String() string     { return f.v.String() }
+func (f fnValue) String() string {
+	if f.v == nil {
+		return ""
+	}
+	return f.v.String()
+}
+
 func (f fnValue) Serialize() string {
 	if s, ok := f.v.(Serializer); ok {
 		return s.Serialize()