feat: vcs, color, and message format native completion

nooma-42 · nooma-42 · commit d929d4735ac3 · 2025-03-18T16:29:55.000+08:00
diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs
@@ -635,7 +635,14 @@ See '<cyan,bold>cargo help</> <cyan><<command>></>' for more information on a sp
         .arg(
             opt("color", "Coloring: auto, always, never")
                 .value_name("WHEN")
-                .global(true),
+                .global(true)
+                .add(clap_complete::ArgValueCandidates::new(|| {
+                    vec![
+                        clap_complete::CompletionCandidate::new("auto"),
+                        clap_complete::CompletionCandidate::new("always"),
+                        clap_complete::CompletionCandidate::new("never"),
+                    ]
+                })),
         )
         .arg(
             Arg::new("directory")
diff --git a/src/bin/cargo/commands/config.rs b/src/bin/cargo/commands/config.rs
@@ -16,7 +16,13 @@ pub fn cli() -> Command {
                 .arg(
                     opt("format", "Display format")
                         .value_parser(cargo_config::ConfigFormat::POSSIBLE_VALUES)
-                        .default_value("toml"),
+                        .default_value("toml")
+                        .add(clap_complete::ArgValueCandidates::new(|| {
+                            cargo_config::ConfigFormat::POSSIBLE_VALUES
+                                .iter()
+                                .map(|&value| clap_complete::CompletionCandidate::new(value))
+                                .collect()
+                        })),
                 )
                 .arg(flag(
                     "show-origin",
@@ -25,7 +31,13 @@ pub fn cli() -> Command {
                 .arg(
                     opt("merged", "Whether or not to merge config values")
                         .value_parser(["yes", "no"])
-                        .default_value("yes"),
+                        .default_value("yes")
+                        .add(clap_complete::ArgValueCandidates::new(|| {
+                            vec![
+                                clap_complete::CompletionCandidate::new("yes"),
+                                clap_complete::CompletionCandidate::new("no"),
+                            ]
+                        })),
                 ),
         )
 }
diff --git a/src/bin/cargo/commands/locate_project.rs b/src/bin/cargo/commands/locate_project.rs
@@ -12,7 +12,13 @@ pub fn cli() -> Command {
                 "message-format",
                 "Output representation [possible values: json, plain]",
             )
-            .value_name("FMT"),
+            .value_name("FMT")
+            .add(clap_complete::ArgValueCandidates::new(|| {
+                vec![
+                    clap_complete::CompletionCandidate::new("json"),
+                    clap_complete::CompletionCandidate::new("plain"),
+                ]
+            })),
         )
         .arg_silent_suggestion()
         .arg_manifest_path()
diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs
@@ -361,7 +361,18 @@ pub trait CommandExt: Sized {
     }
 
     fn arg_message_format(self) -> Self {
-        self._arg(multi_opt("message-format", "FMT", "Error format"))
+        self._arg(multi_opt("message-format", "FMT", "Error format").add(
+            clap_complete::ArgValueCandidates::new(|| {
+                vec![
+                    clap_complete::CompletionCandidate::new("human"),
+                    clap_complete::CompletionCandidate::new("short"),
+                    clap_complete::CompletionCandidate::new("json"),
+                    clap_complete::CompletionCandidate::new("json-diagnostic-short"),
+                    clap_complete::CompletionCandidate::new("json-diagnostic-rendered-ansi"),
+                    clap_complete::CompletionCandidate::new("json-render-diagnostics"),
+                ]
+            }),
+        ))
     }
 
     fn arg_build_plan(self) -> Self {
@@ -387,7 +398,16 @@ pub trait CommandExt: Sized {
                  a global configuration.",
             )
             .value_name("VCS")
-            .value_parser(["git", "hg", "pijul", "fossil", "none"]),
+            .value_parser(["git", "hg", "pijul", "fossil", "none"])
+            .add(clap_complete::ArgValueCandidates::new(|| {
+                vec![
+                    clap_complete::CompletionCandidate::new("git"),
+                    clap_complete::CompletionCandidate::new("hg"),
+                    clap_complete::CompletionCandidate::new("pijul"),
+                    clap_complete::CompletionCandidate::new("fossil"),
+                    clap_complete::CompletionCandidate::new("none"),
+                ]
+            })),
         )
         ._arg(
             flag("bin", "Use a binary (application) template [default]")
