tmp

internal/pflagfork/flag.go

@@ -53,10 +53,9 @@ func (f Flag) IsRepeatable() bool {
 	return false
 }
 
-func (f Flag) Split(arg string) (prefix, optarg string) {
+func (f Flag) Split(arg string) []string {
 	delimiter := string(f.OptargDelimiter())
-	splitted := strings.SplitN(arg, delimiter, 2)
-	return splitted[0] + delimiter, splitted[1]
+	return strings.SplitAfterN(arg, delimiter, 2)
 }
 
 func (f Flag) Matches(arg string, posix bool) bool {

traverse.go

@@ -82,7 +82,7 @@ loop:
 
 			if inFlag.Flag == nil {
 				LOG.Printf("flag %#v is unknown", arg)
-			} else if splitted := strings.SplitN(arg, string(inFlag.OptargDelimiter()), 2); len(splitted) > 1 {
+			} else if splitted := inFlag.Flag.Split(arg); len(splitted) > 1 {
 				inFlag.Args = append(inFlag.Args, splitted[1])
 			}
 			continue
@@ -164,7 +164,7 @@ loop:
 	case !c.DisableFlagParsing && strings.HasPrefix(context.Value, "-") && (fs.IsInterspersed() || len(inPositionals) == 0):
 		if f := fs.LookupArg(context.Value); f != nil && strings.Contains(context.Value, string(f.OptargDelimiter())) {
 			LOG.Printf("completing optional flag argument for arg %#v\n", context.Value)
-			prefix, _ := f.Split(context.Value)
+			prefix := f.Split(context.Value)[0]
 
 			switch f.Value.Type() {
 			case "bool":