fix(completions): Return leading dash on short args

clap-rs · Jul 28, 2023 · e480dda · e480dda
1 parent 3442567
commit e480dda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/clap_complete/src/dynamic/completer.rs b/clap_complete/src/dynamic/completer.rs
@@ -133,12 +133,17 @@ fn complete_arg(
         }
 
         if arg.is_empty() || arg.is_stdio() || arg.is_short() {
+            let dash_or_arg = if arg.is_empty() {
+                "-".into()
+            } else {
+                arg.to_value_os().to_string_lossy()
+            };
             // HACK: Assuming knowledge of is_stdio
             completions.extend(
                 crate::generator::utils::shorts_and_visible_aliases(cmd)
                     .into_iter()
                     // HACK: Need better `OsStr` manipulation
-                    .map(|f| format!("{}{}", arg.to_value_os().to_string_lossy(), f).into()),
+                    .map(|f| format!("{}{}", dash_or_arg, f).into()),
             );
         }
     }

diff --git a/clap_complete/tests/testsuite/fish.rs b/clap_complete/tests/testsuite/fish.rs
@@ -170,10 +170,10 @@ fn complete_dynamic() {
 
     let input = "test-dynamic \t";
     let expected = r#"% test-dynamic
-action         cmd-brackets       complete  last    two       --help
-alias          cmd-double-quotes  h         one     V         --version
-cmd-backslash  cmd-expansions     help      pacman  value
-cmd-backticks  cmd-single-quotes  hint      quote   --global"#;
+action         cmd-brackets       complete  one     value     --help
+alias          cmd-double-quotes  help      pacman  -h        --version
+cmd-backslash  cmd-expansions     hint      quote   -V
+cmd-backticks  cmd-single-quotes  last      two     --global"#;
     let actual = runtime.complete(input, &term).unwrap();
     snapbox::assert_eq(expected, actual);
 }