Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fish/complete: Generate helper functions to check for subcommands #5568

Merged
merged 9 commits into from
Jul 11, 2024
Merged

fish/complete: Generate helper functions to check for subcommands #5568

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a6ac45f
feat(fish): Support nested subcommand completion
tesuji Jul 5, 2024
2167fee
fix(fish): Don't handle level 3 nested subcommand
tesuji Jul 6, 2024
6c706d5
chore: Use get_action to filter out help/version flags
tesuji Jul 6, 2024
e276fc4
fix: Fix conditions to generate helpers
tesuji Jul 6, 2024
1dd1056
fix: Check for real optional arguments
tesuji Jul 6, 2024
eba26a9
chore: Explain why -lt 3 levels of subcommands
tesuji Jul 8, 2024
0462be6
doc: Explain why we fallback to the old behavior
tesuji Jul 9, 2024
76b9c46
style: Prefer matching with enum name
tesuji Jul 9, 2024
6243d65
fix: Only generate stubs if has subcommands
tesuji Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions clap_complete/src/shells/fish.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,15 @@ impl Generator for Fish {
}

fn generate(&self, cmd: &Command, buf: &mut dyn Write) {
use clap::ArgAction::{Help, HelpLong, HelpShort, Version};
tesuji marked this conversation as resolved.
Show resolved Hide resolved
let bin_name = cmd
.get_bin_name()
.expect("crate::generate should have set the bin_name");

let has_global_flags = {
let n_args = cmd.get_arguments().filter(|a| !a.is_positional()).count();
// `-h` and `-v` behaves as command, not regular flags/options that modifies subcommand behaviors.
match (
cmd.is_disable_help_flag_set(),
cmd.is_disable_version_flag_set(),
) {
(false, false) => n_args > 2,
(true, true) => n_args > 0,
_ => n_args > 1,
}
};
// `-h` and `-v` behaves as command, not regular flags/options that modifies subcommand behaviors.
let has_global_flags = cmd.get_arguments().any(|a| {
!a.is_positional() && !matches!(a.get_action(), Help | HelpShort | HelpLong | Version)
epage marked this conversation as resolved.
Show resolved Hide resolved
});

let name = escape_name(bin_name);
let mut needs_fn_name = &format!("__fish_{name}_needs_command")[..];
Expand Down
Loading