itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-25 11:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(cli): Allow completions for third-party subcommand names

Browse Source
This commit is contained in:
Ed Page 2025-09-12 14:28:35 -05:00
parent 082a278fc2
commit e64e8aad03
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/cargo/cli.rs
View File

@ -11,6 +11,7 @@ use std::fmt::Write;
use super::commands;
use super::list_commands;
use super::third_party_subcommands;
use super::user_defined_aliases;
use crate::command_prelude::*;
use crate::util::is_rustup;
@ -729,7 +730,8 @@ fn get_toolchains_from_rustup() -> Vec<String> {
}
fn get_command_candidates(gctx: &GlobalContext) -> Vec<clap_complete::CompletionCandidate> {
let commands = user_defined_aliases(gctx);
let mut commands = user_defined_aliases(gctx);
commands.extend(third_party_subcommands(gctx));
commands
.iter()
.map(|(name, cmd_info)| {
@ -745,8 +747,8 @@ fn get_command_candidates(gctx: &GlobalContext) -> Vec<clap_complete::Completion
CommandInfo::BuiltIn { .. } => {
unreachable!("BuiltIn command shouldn't appear in alias map")
}
CommandInfo::External { .. } => {
unreachable!("External command shouldn't appear in alias map")
CommandInfo::External { path } => {
format!("from {}", path.display())
}
};
clap_complete::CompletionCandidate::new(name.clone()).help(Some(help_text.into()))