tmp

carapace-sh · Jan 3, 2023 · f0d2325 · f0d2325
1 parent 2e7866b
commit f0d2325
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/internal/pflagfork/flagset.go b/internal/pflagfork/flagset.go
@@ -40,14 +40,14 @@ func (f *FlagSet) VisitAll(fn func(*Flag)) {
 
 }
 
-func (fs FlagSet) LookupArg(arg string) (result *flag) {
+func (fs FlagSet) LookupArg(arg string) (result *Flag) {
 	fs.FlagSet.VisitAll(func(f *pflag.Flag) {
 		if result != nil {
 			return
 		}
 
-		if Flag(f).Matches(arg, fs.IsPosix()) { // TODO handle posix
-			result = Flag(f)
+		if flag := (&Flag{f}); flag.Matches(arg, fs.IsPosix()) { // TODO handle posix
+			result = flag
 		}
 	})
 	return

diff --git a/traverse.go b/traverse.go
@@ -14,7 +14,7 @@ type InFlag struct {
 }
 
 func (f InFlag) Consumes(arg string) bool {
-	pflagfork.Flag(f.Flag)
+	//pflagfork.Flag{f.Flag}
 
 	return false // TODO
 }
@@ -24,9 +24,9 @@ func actionTraverse(c *cobra.Command, args []string) (Action, Context) {
 
 	inArgs := []string{} // args consumed by current command
 	var inFlag *InFlag
-	fs := pflagfork.FlagSet(c.Flags())
+	fs := pflagfork.FlagSet{FlagSet: c.Flags()}
 
-	context := newContext(args)
+	context := NewContext(args)
 	for i, arg := range context.Args {
 		switch {
 		// flag argument