ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

Fix shell completion generation

Browse source 
Generating shell completions shouldn't require any Hive config.
Now `colmena gen-completions` gets included in the completions which
will be fixed later.
This commit is contained in:
Zhaofeng Li 2023-11-05 01:00:05 -07:00
parent 3538f18b30
commit 15a95d6de5
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cli.rs
View file

@ -278,6 +278,11 @@ pub async fn run() {
set_color_pref(&opts.color); set_color_pref(&opts.color);
init_logging(); init_logging();
if let Command::GenCompletions { shell } = opts.command {
print_completions(shell, &mut Opts::command());
return;
}
let hive = get_hive(&opts).await.expect("Failed to get flake or hive"); let hive = get_hive(&opts).await.expect("Failed to get flake or hive");
use crate::troubleshooter::run_wrapped as r; use crate::troubleshooter::run_wrapped as r;
@ -306,15 +311,19 @@ pub async fn run() {
}; };
r(command::apply::run(hive, args), opts.config).await r(command::apply::run(hive, args), opts.config).await
} }
Command::GenCompletions { shell } => print_completions(shell, &mut Opts::command()), Command::GenCompletions { .. } => unreachable!(),
} }
} }
fn print_completions(shell: Shell, cmd: &mut clap::Command) { fn print_completions(shell: Shell, cmd: &mut clap::Command) {
let bin_name = cmd.get_bin_name()
.expect("Must have a bin_name")
.to_string();
clap_complete::generate( clap_complete::generate(
shell, shell,
cmd, cmd,
cmd.get_name().to_string(), bin_name,
&mut std::io::stdout(), &mut std::io::stdout(),
); );
} }