Modify

casey · Jun 8, 2024 · 012efa1 · 012efa1
1 parent 0c1321d
commit 012efa1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/completions.rs b/src/completions.rs
@@ -14,12 +14,12 @@ pub(crate) enum Shell {
 impl Shell {
   pub(crate) fn script(self) -> RunResult<'static, String> {
     match self {
-      completions::Shell::Bash => completions::clap(clap_complete::Shell::Bash),
-      completions::Shell::Elvish => completions::clap(clap_complete::Shell::Elvish),
-      completions::Shell::Fish => completions::clap(clap_complete::Shell::Fish),
-      completions::Shell::Nushell => Ok(completions::NUSHELL_COMPLETION_SCRIPT.into()),
-      completions::Shell::Powershell => completions::clap(clap_complete::Shell::PowerShell),
-      completions::Shell::Zsh => completions::clap(clap_complete::Shell::Zsh),
+      Self::Bash => completions::clap(clap_complete::Shell::Bash),
+      Self::Elvish => completions::clap(clap_complete::Shell::Elvish),
+      Self::Fish => completions::clap(clap_complete::Shell::Fish),
+      Self::Nushell => Ok(completions::NUSHELL_COMPLETION_SCRIPT.into()),
+      Self::Powershell => completions::clap(clap_complete::Shell::PowerShell),
+      Self::Zsh => completions::clap(clap_complete::Shell::Zsh),
     }
   }
 }

diff --git a/src/config.rs b/src/config.rs
@@ -381,8 +381,7 @@ impl Config {
       .arg(
         Arg::new(cmd::COMPLETIONS)
           .long("completions")
-          .action(ArgAction::Append)
-          .num_args(1..)
+          .action(ArgAction::Set)
           .value_name("SHELL")
           .value_parser(value_parser!(completions::Shell))
           .ignore_case(true)
@@ -1544,15 +1543,15 @@ mod tests {
   }
 
   error_matches! {
-    name: completions_arguments,
-    args: ["--completions", "zsh", "foo"],
+    name: completions_argument,
+    args: ["--completions", "foo"],
     error: error,
     check: {
       assert_eq!(error.kind(), clap::error::ErrorKind::InvalidValue);
       assert_eq!(error.context().collect::<Vec<_>>(), vec![
         (
           ContextKind::InvalidArg,
-          &ContextValue::String("--completions <SHELL>...".into())),
+          &ContextValue::String("--completions <SHELL>".into())),
         (
           ContextKind::InvalidValue,
           &ContextValue::String("foo".into()),