fix(complete): Don't complete files for any value

epage · epage · commit 244578e9e279 · 2024-10-07T21:01:03.000-05:00
We now need to opt-in to path completions for values, which can be as
simple as setting the value parser to be for `PathBuf`s.

We'll now show a lot less irrelevant completions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,7 @@ cargo-util = { version = "0.2.14", path = "crates/cargo-util" }
 cargo-util-schemas = { version = "0.7.0", path = "crates/cargo-util-schemas" }
 cargo_metadata = "0.18.1"
 clap = "4.5.18"
-clap_complete = { version = "4.5.29", features = ["unstable-dynamic"] }
+clap_complete = { version = "4.5.32", features = ["unstable-dynamic"] }
 color-print = "0.3.6"
 core-foundation = { version = "0.10.0", features = ["mac_os_10_7_support"] }
 crates-io = { version = "0.40.4", path = "crates/crates-io" }
diff --git a/src/bin/cargo/main.rs b/src/bin/cargo/main.rs
@@ -34,8 +34,11 @@ fn main() {
         let _span = tracing::span!(tracing::Level::TRACE, "completions").entered();
         let args = std::env::args_os();
         let current_dir = std::env::current_dir().ok();
-        let completer =
-            clap_complete::CompleteEnv::with_factory(|| cli::cli(&mut gctx)).var("CARGO_COMPLETE");
+        let completer = clap_complete::CompleteEnv::with_factory(|| {
+            let mut gctx = GlobalContext::default().expect("already loaded without errors");
+            cli::cli(&mut gctx)
+        })
+        .var("CARGO_COMPLETE");
         if completer
             .try_complete(args, current_dir.as_deref())
             .unwrap_or_else(|e| {
