Merge pull request #3261 from carapace-sh/complete-variants

complete all variants for empty name

Author: rsteube

cmd/carapace/cmd/choice.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/carapace-sh/carapace"
 	"github.com/carapace-sh/carapace-bin/cmd/carapace/cmd/completers"
@@ -66,6 +67,10 @@ func init() {
 				return carapace.ActionValuesDescribed(vals...).FilterArgs()
 			}
 
+			if strings.HasPrefix(c.Value, "/") || strings.HasPrefix(c.Value, "@") {
+				return carapace.ActionValues()
+			}
+
 			return carapace.ActionMultiPartsN("@", 2, func(c carapace.Context) carapace.Action {
 				switch len(c.Parts) {
 				case 0:

pkg/actions/tools/carapace/completer.go

@@ -62,29 +62,23 @@ func ActionNames() carapace.Action {
 }
 
 func ActionVariants(name string) carapace.Action {
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		if name == "" {
-			return carapace.ActionValues()
-		}
-
-		return actionCompleters(name, func(m completer.CompleterMap) carapace.Action {
-			// TODO slow
-			batch := carapace.Batch()
-			for _, variants := range m {
-				for _, v := range variants {
-					if v.Variant == "" {
-						continue
-					}
-					switch name {
-					case "":
-						batch = append(batch, carapace.ActionValues(v.Variant).Tag(completerTag(v)))
-					default:
-						batch = append(batch, carapace.ActionStyledValuesDescribed(v.Variant, v.Description, completerStyle(v)).Tag(completerTag(v)))
-					}
+	return actionCompleters(name, func(m completer.CompleterMap) carapace.Action {
+		// TODO slow
+		batch := carapace.Batch()
+		for _, variants := range m {
+			for _, v := range variants {
+				if v.Variant == "" {
+					continue
+				}
+				switch name {
+				case "":
+					batch = append(batch, carapace.ActionValues(v.Variant).Tag(completerTag(v)))
+				default:
+					batch = append(batch, carapace.ActionStyledValuesDescribed(v.Variant, v.Description, completerStyle(v)).Tag(completerTag(v)))
 				}
 			}
-			return batch.ToA()
-		})
+		}
+		return batch.ToA()
 	})
 }