From 080f746dd5800035e088dd37b9cd00972505f907 Mon Sep 17 00:00:00 2001
From: sigoden <sigoden@gmail.com>
Date: Thu, 15 Feb 2024 10:19:55 +0800
Subject: [PATCH] feat: support `--argc-shell-path` (#299)

---
 README.md                              |  2 +-
 src/bin/argc/completions/completion.sh |  3 ++-
 src/bin/argc/main.rs                   |  9 +++++++--
 src/matcher.rs                         |  4 ++--
 tests/cli.rs                           | 10 ++++++++++
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 154bf8f0..c19fc117 100644
--- a/README.md
+++ b/README.md
@@ -257,7 +257,7 @@ Here are some value notation that will affect the shell completion.
 
 ## Build
 
-Generate a single standalone bash script without argc dependency.
+Build a single standalone bash script without argc dependency.
 
 ```
 argc --argc-build <SCRIPT> [OUTPATH]
diff --git a/src/bin/argc/completions/completion.sh b/src/bin/argc/completions/completion.sh
index d72cfd1b..95386076 100644
--- a/src/bin/argc/completions/completion.sh
+++ b/src/bin/argc/completions/completion.sh
@@ -2,12 +2,13 @@
 
 # @option --argc-eval~ <FILE> <ARGS>                                Use `eval "$(argc --argc-eval "$0" "$@")"`
 # @option --argc-create~ <TASKS>                                    Create a boilerplate argcfile
-# @option --argc-build <FILE> [OUTPATH]                             Build standalone bash script without depending on argc
+# @option --argc-build <FILE> [OUTPATH]                             Build bash script without argc dependency
 # @option --argc-completions~[`_choice_completion`] <SHELL> <CMDS>  Generate shell completion scripts
 # @option --argc-compgen~[`_choice_compgen`] <SHELL> <FILE> <ARGS>  Dynamically generating completion candidates
 # @option --argc-export <FILE>                                      Export command line definitions as json
 # @option --argc-parallel~ <FILE> <ARGS>                            Execute argc functions in parallel
 # @flag --argc-script-path                                          Print current argcfile path
+# @flag --argc-shell-path                                           Print current shell path
 # @flag --argc-help                                                 Print help information
 # @flag --argc-version                                              Print version information
 
diff --git a/src/bin/argc/main.rs b/src/bin/argc/main.rs
index f9854bc8..3b187b14 100644
--- a/src/bin/argc/main.rs
+++ b/src/bin/argc/main.rs
@@ -138,7 +138,11 @@ fn run() -> Result<i32> {
             "--argc-script-path" => {
                 let (_, script_file) =
                     get_script_path(true).ok_or_else(|| anyhow!("Argcfile not found."))?;
-                print!("{}", script_file.display());
+                println!("{}", script_file.display());
+            }
+            "--argc-shell-path" => {
+                let shell = get_shell_path()?;
+                println!("{}", shell.display());
             }
             "--argc-help" => {
                 println!("{}", get_argc_help())
@@ -252,12 +256,13 @@ fn get_argc_help() -> String {
 USAGE:
     argc --argc-eval <SCRIPT> [ARGS]...             Use `eval "$(argc --argc-eval "$0" "$@")"`
     argc --argc-create [TASKS]...                   Create a boilerplate argcfile
-    argc --argc-build <SCRIPT> [OUTPATH]            Build standalone bash script without depending on argc
+    argc --argc-build <SCRIPT> [OUTPATH]            Build bash script without argc dependency
     argc --argc-completions <SHELL> [CMDS]...       Generate shell completion scripts
     argc --argc-compgen <SHELL> <SCRIPT> <ARGS>...  Dynamically generating completion candidates
     argc --argc-export <SCRIPT>                     Export command line definitions as json
     argc --argc-parallel <SCRIPT> <ARGS>...         Execute argc functions in parallel
     argc --argc-script-path                         Print current argcfile path
+    argc --argc-shell-path                          Print current shell path
     argc --argc-help                                Print help information
     argc --argc-version                             Print version information
 "###
diff --git a/src/matcher.rs b/src/matcher.rs
index d496679e..0953b1ae 100644
--- a/src/matcher.rs
+++ b/src/matcher.rs
@@ -549,7 +549,7 @@ impl<'a, 'b> Matcher<'a, 'b> {
                 }
                 match *name {
                     Some(name) => {
-                        missing_flag_options.remove(name);
+                        missing_flag_options.swap_remove(name);
                         flag_option_map.entry(name).or_insert(vec![]).push(i);
                     }
                     None => return Some(MatchError::UnknownArgument(level, key.to_string())),
@@ -898,7 +898,7 @@ pub(crate) type CompItem = (String, String, bool, CompColor);
 fn find_subcommand<'a>(
     cmd: &'a Command,
     arg: &str,
-    positional_args: &Vec<&str>,
+    positional_args: &[&str],
 ) -> Option<&'a Command> {
     cmd.find_subcommand(arg).and_then(|v| {
         if positional_args.is_empty() {
diff --git a/tests/cli.rs b/tests/cli.rs
index 5c0e5984..95714833 100644
--- a/tests/cli.rs
+++ b/tests/cli.rs
@@ -214,6 +214,16 @@ fn script_path() {
         .success();
 }
 
+#[test]
+fn shell_path() {
+    Command::cargo_bin("argc")
+        .unwrap()
+        .arg("--argc-shell-path")
+        .assert()
+        .stdout(predicates::str::contains("bash"))
+        .success();
+}
+
 #[test]
 fn run_argcfile() {
     let tmpdir = tmpdir_argcfiles();