test: Add test codebase for shell completions

src/bin/cargo/commands/add.rs

@@ -146,7 +146,8 @@ This is the catch all, handling hashes to named references in remote repositorie
                 .value_name("NAME")
                 .help("Package registry for this dependency")
                 .add(clap_complete::ArgValueCandidates::new(|| {
-                    let candidates = get_registry_candidates();
+                    let cwd = std::env::current_dir();
+                    let candidates = get_registry_candidates(cwd.ok());
                     candidates.unwrap_or_default()
                 })),
         ])

src/bin/cargo/commands/uninstall.rs

@@ -45,7 +45,7 @@ pub fn exec(gctx: &mut GlobalContext, args: &ArgMatches) -> CliResult {
     Ok(())
 }
 
-fn get_installed_crates() -> Vec<clap_complete::CompletionCandidate> {
+pub fn get_installed_crates() -> Vec<clap_complete::CompletionCandidate> {
     get_installed_crates_().unwrap_or_default()
 }
 

src/bin/cargo/commands/update.rs

@@ -14,9 +14,10 @@ pub fn cli() -> Command {
             .help_heading(heading::PACKAGE_SELECTION)
             .group("package-group")
             .help("Package to update")
-            .add(clap_complete::ArgValueCandidates::new(
-                get_pkg_id_spec_candidates,
-            ))])
+            .add(clap_complete::ArgValueCandidates::new(|| {
+                let cwd = std::env::current_dir();
+                get_pkg_id_spec_candidates(cwd.ok())
+            }))])
         .arg(
             optional_multi_opt("package", "SPEC", "Package to update")
                 .short('p')

src/cargo/util/command_prelude.rs

@@ -22,6 +22,7 @@ use cargo_util_schemas::manifest::RegistryName;
 use cargo_util_schemas::manifest::StringOrVec;
 use clap::builder::UnknownArgumentValueParser;
 use home::cargo_home_with_cwd;
+use itertools::Itertools;
 use semver::Version;
 use std::collections::HashMap;
 use std::ffi::{OsStr, OsString};
@@ -163,13 +164,19 @@ pub trait CommandExt: Sized {
             ._arg(
                 optional_multi_opt("test", "NAME", test)
                     .help_heading(heading::TARGET_SELECTION)
-                    .add(clap_complete::ArgValueCandidates::new(get_test_candidates)),
+                    .add(clap_complete::ArgValueCandidates::new(|| {
+                        let cwd = std::env::current_dir();
+                        get_test_candidates(cwd.ok())
+                    })),
             )
             ._arg(flag("benches", benches).help_heading(heading::TARGET_SELECTION))
             ._arg(
                 optional_multi_opt("bench", "NAME", bench)
                     .help_heading(heading::TARGET_SELECTION)
-                    .add(clap_complete::ArgValueCandidates::new(get_bench_candidates)),
+                    .add(clap_complete::ArgValueCandidates::new(|| {
+                        let cwd = std::env::current_dir();
+                        get_bench_candidates(cwd.ok())
+                    })),
             )
             ._arg(flag("all-targets", all).help_heading(heading::TARGET_SELECTION))
     }
@@ -187,15 +194,19 @@ pub trait CommandExt: Sized {
             ._arg(
                 optional_multi_opt("bin", "NAME", bin)
                     .help_heading(heading::TARGET_SELECTION)
-                    .add(clap_complete::ArgValueCandidates::new(get_bin_candidates)),
+                    .add(clap_complete::ArgValueCandidates::new(|| {
+                        let cwd = std::env::current_dir();
+                        get_bin_candidates(cwd.ok())
+                    })),
             )
             ._arg(flag("examples", examples).help_heading(heading::TARGET_SELECTION))
             ._arg(
                 optional_multi_opt("example", "NAME", example)
                     .help_heading(heading::TARGET_SELECTION)
-                    .add(clap_complete::ArgValueCandidates::new(
-                        get_example_candidates,
-                    )),
+                    .add(clap_complete::ArgValueCandidates::new(|| {
+                        let cwd = std::env::current_dir();
+                        get_example_candidates(cwd.ok())
+                    })),
             )
     }
 
@@ -209,15 +220,19 @@ pub trait CommandExt: Sized {
         self._arg(
             optional_multi_opt("bin", "NAME", bin)
                 .help_heading(heading::TARGET_SELECTION)
-                .add(clap_complete::ArgValueCandidates::new(get_bin_candidates)),
+                .add(clap_complete::ArgValueCandidates::new(|| {
+                    let cwd = std::env::current_dir();
+                    get_bin_candidates(cwd.ok())
+                })),
         )
         ._arg(flag("bins", bins).help_heading(heading::TARGET_SELECTION))
         ._arg(
             optional_multi_opt("example", "NAME", example)
                 .help_heading(heading::TARGET_SELECTION)
-                .add(clap_complete::ArgValueCandidates::new(
-                    get_example_candidates,
-                )),
+                .add(clap_complete::ArgValueCandidates::new(|| {
+                    let cwd = std::env::current_dir();
+                    get_example_candidates(cwd.ok())
+                })),
         )
         ._arg(flag("examples", examples).help_heading(heading::TARGET_SELECTION))
     }
@@ -226,14 +241,18 @@ pub trait CommandExt: Sized {
         self._arg(
             optional_multi_opt("bin", "NAME", bin)
                 .help_heading(heading::TARGET_SELECTION)
-                .add(clap_complete::ArgValueCandidates::new(get_bin_candidates)),
+                .add(clap_complete::ArgValueCandidates::new(|| {
+                    let cwd = std::env::current_dir();
+                    get_bin_candidates(cwd.ok())
+                })),
         )
         ._arg(
             optional_multi_opt("example", "NAME", example)
                 .help_heading(heading::TARGET_SELECTION)
-                .add(clap_complete::ArgValueCandidates::new(
-                    get_example_candidates,
-                )),
+                .add(clap_complete::ArgValueCandidates::new(|| {
+                    let cwd = std::env::current_dir();
+                    get_example_candidates(cwd.ok())
+                })),
         )
     }
 
@@ -294,7 +313,10 @@ pub trait CommandExt: Sized {
         self._arg(
             optional_multi_opt("target", "TRIPLE", target)
                 .help_heading(heading::COMPILATION_OPTIONS)
-                .add(clap_complete::ArgValueCandidates::new(get_target_triples)),
+                .add(clap_complete::ArgValueCandidates::new(|| {
+                    let cwd = std::env::current_dir();
+                    get_target_triples(cwd.ok())
+                })),
         )
         ._arg(unsupported_short_arg)
     }
@@ -367,8 +389,12 @@ pub trait CommandExt: Sized {
             .value_parser(["git", "hg", "pijul", "fossil", "none"]),
         )
         ._arg(
-            flag("bin", "Use a binary (application) template [default]")
-                .add(clap_complete::ArgValueCandidates::new(get_bin_candidates)),
+            flag("bin", "Use a binary (application) template [default]").add(
+                clap_complete::ArgValueCandidates::new(|| {
+                    let cwd = std::env::current_dir();
+                    get_bin_candidates(cwd.ok())
+                }),
+            ),
         )
         ._arg(flag("lib", "Use a library template"))
         ._arg(
@@ -388,7 +414,8 @@ pub trait CommandExt: Sized {
     fn arg_registry(self, help: &'static str) -> Self {
         self._arg(opt("registry", help).value_name("REGISTRY").add(
             clap_complete::ArgValueCandidates::new(|| {
-                let candidates = get_registry_candidates();
+                let cwd = std::env::current_dir();
+                let candidates = get_registry_candidates(cwd.ok());
                 candidates.unwrap_or_default()
             }),
         ))
@@ -1068,23 +1095,26 @@ pub fn lockfile_path(
     return Ok(Some(path));
 }
 
-pub fn get_registry_candidates() -> CargoResult<Vec<clap_complete::CompletionCandidate>> {
-    let gctx = new_gctx_for_completions()?;
+pub fn get_registry_candidates(
+    cwd: Option<PathBuf>,
+) -> CargoResult<Vec<clap_complete::CompletionCandidate>> {
+    let gctx = new_gctx_for_completions(cwd)?;
 
     if let Ok(Some(registries)) =
         gctx.get::<Option<HashMap<String, HashMap<String, String>>>>("registries")
     {
         Ok(registries
             .keys()
+            .sorted()
             .map(|name| clap_complete::CompletionCandidate::new(name.to_owned()))
             .collect())
     } else {
         Ok(vec![])
     }
 }
 
-fn get_example_candidates() -> Vec<clap_complete::CompletionCandidate> {
-    get_targets_from_metadata()
+pub fn get_example_candidates(cwd: Option<PathBuf>) -> Vec<clap_complete::CompletionCandidate> {
+    get_targets_from_metadata(cwd)
         .unwrap_or_default()
         .into_iter()
         .filter_map(|target| match target.kind() {
@@ -1094,8 +1124,8 @@ fn get_example_candidates() -> Vec<clap_complete::CompletionCandidate> {
         .collect::<Vec<_>>()
 }
 
-fn get_bench_candidates() -> Vec<clap_complete::CompletionCandidate> {
-    get_targets_from_metadata()
+pub fn get_bench_candidates(cwd: Option<PathBuf>) -> Vec<clap_complete::CompletionCandidate> {
+    get_targets_from_metadata(cwd)
         .unwrap_or_default()
         .into_iter()
         .filter_map(|target| match target.kind() {
@@ -1105,8 +1135,8 @@ fn get_bench_candidates() -> Vec<clap_complete::CompletionCandidate> {
         .collect::<Vec<_>>()
 }
 
-fn get_test_candidates() -> Vec<clap_complete::CompletionCandidate> {
-    get_targets_from_metadata()
+pub fn get_test_candidates(cwd: Option<PathBuf>) -> Vec<clap_complete::CompletionCandidate> {
+    get_targets_from_metadata(cwd)
         .unwrap_or_default()
         .into_iter()
         .filter_map(|target| match target.kind() {
@@ -1116,8 +1146,8 @@ fn get_test_candidates() -> Vec<clap_complete::CompletionCandidate> {
         .collect::<Vec<_>>()
 }
 
-fn get_bin_candidates() -> Vec<clap_complete::CompletionCandidate> {
-    get_targets_from_metadata()
+pub fn get_bin_candidates(cwd: Option<PathBuf>) -> Vec<clap_complete::CompletionCandidate> {
+    get_targets_from_metadata(cwd)
         .unwrap_or_default()
         .into_iter()
         .filter_map(|target| match target.kind() {
@@ -1127,10 +1157,9 @@ fn get_bin_candidates() -> Vec<clap_complete::CompletionCandidate> {
         .collect::<Vec<_>>()
 }
 
-fn get_targets_from_metadata() -> CargoResult<Vec<Target>> {
-    let cwd = std::env::current_dir()?;
-    let gctx = GlobalContext::new(shell::Shell::new(), cwd.clone(), cargo_home_with_cwd(&cwd)?);
-    let ws = Workspace::new(&find_root_manifest_for_wd(&cwd)?, &gctx)?;
+fn get_targets_from_metadata(cwd: Option<PathBuf>) -> CargoResult<Vec<Target>> {
+    let gctx = new_gctx_for_completions(cwd)?;
+    let ws = Workspace::new(&find_root_manifest_for_wd(gctx.cwd())?, &gctx)?;
 
     let packages = ws.members().collect::<Vec<_>>();
 
@@ -1142,15 +1171,15 @@ fn get_targets_from_metadata() -> CargoResult<Vec<Target>> {
     Ok(targets)
 }
 
-fn get_target_triples() -> Vec<clap_complete::CompletionCandidate> {
+pub fn get_target_triples(cwd: Option<PathBuf>) -> Vec<clap_complete::CompletionCandidate> {
     let mut candidates = Vec::new();
 
     if let Ok(targets) = get_target_triples_from_rustup() {
         candidates = targets;
     }
 
     if candidates.is_empty() {
-        if let Ok(targets) = get_target_triples_from_rustc() {
+        if let Ok(targets) = get_target_triples_from_rustc(cwd) {
             candidates = targets;
         }
     }
@@ -1182,10 +1211,11 @@ fn get_target_triples_from_rustup() -> CargoResult<Vec<clap_complete::Completion
         .collect())
 }
 
-fn get_target_triples_from_rustc() -> CargoResult<Vec<clap_complete::CompletionCandidate>> {
-    let cwd = std::env::current_dir()?;
-    let gctx = GlobalContext::new(shell::Shell::new(), cwd.clone(), cargo_home_with_cwd(&cwd)?);
-    let ws = Workspace::new(&find_root_manifest_for_wd(&PathBuf::from(&cwd))?, &gctx);
+fn get_target_triples_from_rustc(
+    cwd: Option<PathBuf>,
+) -> CargoResult<Vec<clap_complete::CompletionCandidate>> {
+    let gctx = new_gctx_for_completions(cwd)?;
+    let ws = Workspace::new(&find_root_manifest_for_wd(gctx.cwd())?, &gctx);
 
     let rustc = gctx.load_global_rustc(ws.as_ref().ok())?;
 
@@ -1198,12 +1228,12 @@ fn get_target_triples_from_rustc() -> CargoResult<Vec<clap_complete::CompletionC
         .collect())
 }
 
-pub fn get_pkg_id_spec_candidates() -> Vec<clap_complete::CompletionCandidate> {
+pub fn get_pkg_id_spec_candidates(cwd: Option<PathBuf>) -> Vec<clap_complete::CompletionCandidate> {
     let mut candidates = vec![];
 
     let package_map = HashMap::<&str, Vec<Package>>::new();
     let package_map =
-        get_packages()
+        get_packages(cwd)
             .unwrap_or_default()
             .into_iter()
             .fold(package_map, |mut map, package| {
@@ -1285,8 +1315,8 @@ pub fn get_pkg_id_spec_candidates() -> Vec<clap_complete::CompletionCandidate> {
     candidates
 }
 
-fn get_packages() -> CargoResult<Vec<Package>> {
-    let gctx = new_gctx_for_completions()?;
+fn get_packages(cwd: Option<PathBuf>) -> CargoResult<Vec<Package>> {
+    let gctx = new_gctx_for_completions(cwd)?;
 
     let ws = Workspace::new(&find_root_manifest_for_wd(gctx.cwd())?, &gctx)?;
 
@@ -1318,8 +1348,8 @@ fn get_packages() -> CargoResult<Vec<Package>> {
     Ok(packages)
 }
 
-fn new_gctx_for_completions() -> CargoResult<GlobalContext> {
-    let cwd = std::env::current_dir()?;
+pub fn new_gctx_for_completions(cwd: Option<PathBuf>) -> CargoResult<GlobalContext> {
+    let cwd = cwd.unwrap_or(std::env::current_dir()?);
     let mut gctx = GlobalContext::new(shell::Shell::new(), cwd.clone(), cargo_home_with_cwd(&cwd)?);
 
     let verbose = 0;

tests/testsuite/main.rs

@@ -167,6 +167,7 @@ mod rustflags;
 mod rustup;
 mod script;
 mod search;
+mod shell_completions;
 mod shell_quoting;
 mod source_replacement;
 mod ssh;