refactor: prefixed option supports multi/non-multi

src/param.rs

@@ -246,7 +246,10 @@ impl FlagOptionParam {
     }
 
     pub(crate) fn prefixed(&self) -> Option<String> {
-        if self.data.modifer != Modifier::Prefixed {
+        if !matches!(
+            self.data.modifer,
+            Modifier::Prefixed | Modifier::MultiPrefixed
+        ) {
             return None;
         }
 
@@ -570,6 +573,7 @@ pub(crate) enum Modifier {
     MultiCharRequired(char),
     Terminated,
     Prefixed,
+    MultiPrefixed,
 }
 
 impl Modifier {
@@ -582,7 +586,8 @@ impl Modifier {
             Self::MultiCharOptional(_) => true,
             Self::MultiCharRequired(_) => true,
             Self::Terminated => true,
-            Self::Prefixed => true,
+            Self::Prefixed => false,
+            Self::MultiPrefixed => true,
         }
     }
 
@@ -596,6 +601,7 @@ impl Modifier {
             Self::MultiCharRequired(_) => true,
             Self::Terminated => false,
             Self::Prefixed => false,
+            Self::MultiPrefixed => false,
         }
     }
 
@@ -609,6 +615,7 @@ impl Modifier {
             Self::MultiCharRequired(c) => format!("+{c}"),
             Self::Terminated => "~".to_string(),
             Self::Prefixed => "-".to_string(),
+            Self::MultiPrefixed => "-*".to_string(),
         }
     }
 }

src/parser.rs

@@ -348,18 +348,17 @@ fn parse_param_modifer(input: &str) -> nom::IResult<&str, ParamData> {
         map(
             pair(parse_param_name, preceded(tag("*"), opt(parse_multi_char))),
             |(mut arg, multi_char)| {
-                let modifier = match multi_char {
-                    Some(c) => Modifier::MultiCharOptional(c),
+                match multi_char {
+                    Some(c) => arg.modifer = Modifier::MultiCharOptional(c),
                     None => {
                         if let Some(name) = arg.name.strip_suffix('-') {
                             arg.name = name.to_string();
-                            Modifier::Prefixed
+                            arg.modifer = Modifier::MultiPrefixed
                         } else {
-                            Modifier::MultipleOptional
+                            arg.modifer = Modifier::MultipleOptional
                         }
                     }
                 };
-                arg.modifer = modifier;
                 arg
             },
         ),
@@ -374,7 +373,13 @@ fn parse_param_modifer(input: &str) -> nom::IResult<&str, ParamData> {
                 arg
             },
         ),
-        parse_param_name,
+        map(parse_param_name, |mut arg| {
+            if let Some(name) = arg.name.strip_suffix('-') {
+                arg.name = name.to_string();
+                arg.modifer = Modifier::Prefixed;
+            }
+            arg
+        }),
     ))(input)
 }
 
@@ -740,6 +745,8 @@ mod tests {
         assert_parse_option_arg!("--foo+,");
         assert_parse_option_arg!("--foo*,");
         assert_parse_option_arg!("--foo!");
+        assert_parse_option_arg!("--foo-*");
+        assert_parse_option_arg!("--foo-");
         assert_parse_option_arg!("--foo=a");
         assert_parse_option_arg!("--foo=`_foo`");
         assert_parse_option_arg!("--foo[a|b]");
@@ -774,6 +781,8 @@ mod tests {
         assert_parse_option_arg!("-foo+");
         assert_parse_option_arg!("-foo*");
         assert_parse_option_arg!("-foo!");
+        assert_parse_option_arg!("-foo-*");
+        assert_parse_option_arg!("-foo-");
         assert_parse_option_arg!("-foo=a");
         assert_parse_option_arg!("-foo=`_foo`");
         assert_parse_option_arg!("-foo[a|b]");

tests/compgen.rs

@@ -596,6 +596,7 @@ fn option_prefixed() {
     let script = r###"
 # @option -D-*[`_choice_fn`]
 # @option -X --ox-*[`_choice_fn`]
+# @option -s-[`_choice_fn`]
 _choice_fn() {
     echo VAR1=value1 
     echo VAR2=value2
@@ -610,8 +611,11 @@ _choice_fn() {
             vec!["prog", "-DVAR1"],
             vec!["prog", "-X"],
             vec!["prog", "-XVAR1"],
+            vec!["prog", "-XVAR3", "-"],
             vec!["prog", "--ox"],
             vec!["prog", "--ox", "VAR1"],
+            vec!["prog", "-s"],
+            vec!["prog", "-sVAR3", "-"],
         ]
     );
 }

tests/snapshots/integration__spec__option_prefixed.snap

@@ -3,11 +3,12 @@ source: tests/spec.rs
 expression: data
 ---
 RUN
-prog -D v1 -Dv2=foo
+prog -D v1 -Dv2=foo -o1
 
 OUTPUT
+argc_o=1
 argc_D=( v1 'v2=foo' )
-argc__args=( prog -D v1 '-Dv2=foo' )
+argc__args=( prog -D v1 '-Dv2=foo' -o1 )
 argc__cmd_arg_index=0
 argc__positionals=(  )
 

tests/spec.rs

@@ -198,9 +198,10 @@ fn option_terminated() {
 #[test]
 fn option_prefixed() {
     let script = r###"
+# @option -o-
 # @option -D-*
 "###;
-    snapshot!(script, &["prog", "-D", "v1", "-Dv2=foo"]);
+    snapshot!(script, &["prog", "-D", "v1", "-Dv2=foo", "-o1"]);
 }
 
 #[test]