#595 Added overloads for choice type to accept list (#596)

Fixes #595

Author: Jacob3075

clikt/api/clikt.api

@@ -1261,15 +1261,19 @@ public final class com/github/ajalt/clikt/parameters/types/BooleanKt {
 }
 
 public final class com/github/ajalt/clikt/parameters/types/ChoiceKt {
+	public static final fun choice (Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;Ljava/lang/Iterable;Z)Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;
 	public static final fun choice (Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;Ljava/util/Map;Z)Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;
 	public static final fun choice (Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;[Ljava/lang/String;Z)Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;
 	public static final fun choice (Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;[Lkotlin/Pair;Z)Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;
+	public static final fun choice (Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;Ljava/lang/Iterable;Ljava/lang/String;Z)Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;
 	public static final fun choice (Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;Ljava/util/Map;Ljava/lang/String;Z)Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;
 	public static final fun choice (Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;[Ljava/lang/String;Ljava/lang/String;Z)Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;
 	public static final fun choice (Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;[Lkotlin/Pair;Ljava/lang/String;Z)Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;
+	public static synthetic fun choice$default (Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;Ljava/lang/Iterable;ZILjava/lang/Object;)Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;
 	public static synthetic fun choice$default (Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;Ljava/util/Map;ZILjava/lang/Object;)Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;
 	public static synthetic fun choice$default (Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;[Ljava/lang/String;ZILjava/lang/Object;)Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;
 	public static synthetic fun choice$default (Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;[Lkotlin/Pair;ZILjava/lang/Object;)Lcom/github/ajalt/clikt/parameters/arguments/ProcessedArgument;
+	public static synthetic fun choice$default (Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;Ljava/lang/Iterable;Ljava/lang/String;ZILjava/lang/Object;)Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;
 	public static synthetic fun choice$default (Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;Ljava/util/Map;Ljava/lang/String;ZILjava/lang/Object;)Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;
 	public static synthetic fun choice$default (Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;[Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;
 	public static synthetic fun choice$default (Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;[Lkotlin/Pair;Ljava/lang/String;ZILjava/lang/Object;)Lcom/github/ajalt/clikt/parameters/options/OptionWithValues;

clikt/src/commonMain/kotlin/com/github/ajalt/clikt/parameters/types/choice.kt

@@ -78,6 +78,26 @@ fun RawArgument.choice(
     return choice(choices.associateBy { it }, ignoreCase)
 }
 
+
+/**
+ * Restrict the argument to a fixed set of values.
+ *
+ * If [ignoreCase] is `true`, the argument will accept values as any mix of upper and lower case.
+ * The argument's final value will always match the case of the corresponding value in [choices].
+ *
+ * ### Example:
+ *
+ * ```
+ * argument().choice(listOf("foo", "bar"))
+ * ```
+ */
+fun RawArgument.choice(
+    choices: Iterable<String>,
+    ignoreCase: Boolean = false,
+): ProcessedArgument<String, String> {
+    return choice(choices.associateBy { it }, ignoreCase)
+}
+
 // options
 
 /**
@@ -145,3 +165,23 @@ fun RawOption.choice(
 ): NullableOption<String, String> {
     return choice(choices.associateBy { it }, metavar, ignoreCase)
 }
+
+/**
+ * Restrict the option to a fixed set of values.
+ *
+ * If [ignoreCase] is `true`, the option will accept values as any mix of upper and lower case.
+ * The option's final value will always match the case of the corresponding value in [choices].
+ *
+ * ### Example:
+ *
+ * ```
+ * option().choice(listOf("foo", "bar"))
+ * ```
+ */
+fun RawOption.choice(
+    choices: Iterable<String>,
+    metavar: String = mvar(choices.asIterable()),
+    ignoreCase: Boolean = false,
+): NullableOption<String, String> {
+    return choice(choices.associateBy { it }, metavar, ignoreCase)
+}