-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5568 from tesuji/fish-nested-sub
fish/complete: Generate helper functions to check for subcommands
- Loading branch information
Showing
9 changed files
with
588 additions
and
277 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,36 @@ | ||
complete -c my-app -n "__fish_use_subcommand" -s c | ||
complete -c my-app -n "__fish_use_subcommand" -s v | ||
complete -c my-app -n "__fish_use_subcommand" -s h -l help -d 'Print help' | ||
complete -c my-app -n "__fish_use_subcommand" -f -a "test" -d 'Subcommand with a second line' | ||
complete -c my-app -n "__fish_use_subcommand" -f -a "help" -d 'Print this message or the help of the given subcommand(s)' | ||
complete -c my-app -n "__fish_seen_subcommand_from test" -s d | ||
complete -c my-app -n "__fish_seen_subcommand_from test" -s c | ||
complete -c my-app -n "__fish_seen_subcommand_from test" -s h -l help -d 'Print help' | ||
complete -c my-app -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from test help" -f -a "test" -d 'Subcommand with a second line' | ||
complete -c my-app -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from test help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)' | ||
# Print an optspec for argparse to handle cmd's options that are independent of any subcommand. | ||
function __fish_my_app_global_optspecs | ||
string join \n c v h/help | ||
end | ||
|
||
function __fish_my_app_needs_command | ||
# Figure out if the current invocation already has a command. | ||
set -l cmd (commandline -opc) | ||
set -e cmd[1] | ||
argparse -s (__fish_my_app_global_optspecs) -- $cmd 2>/dev/null | ||
or return | ||
if set -q argv[1] | ||
# Also print the command, so this can be used to figure out what it is. | ||
echo $argv[1] | ||
return 1 | ||
end | ||
return 0 | ||
end | ||
|
||
function __fish_my_app_using_subcommand | ||
set -l cmd (__fish_my_app_needs_command) | ||
test -z "$cmd" | ||
and return 1 | ||
contains -- $cmd[1] $argv | ||
end | ||
|
||
complete -c my-app -n "__fish_my_app_needs_command" -s c | ||
complete -c my-app -n "__fish_my_app_needs_command" -s v | ||
complete -c my-app -n "__fish_my_app_needs_command" -s h -l help -d 'Print help' | ||
complete -c my-app -n "__fish_my_app_needs_command" -f -a "test" -d 'Subcommand with a second line' | ||
complete -c my-app -n "__fish_my_app_needs_command" -f -a "help" -d 'Print this message or the help of the given subcommand(s)' | ||
complete -c my-app -n "__fish_my_app_using_subcommand test" -s d | ||
complete -c my-app -n "__fish_my_app_using_subcommand test" -s c | ||
complete -c my-app -n "__fish_my_app_using_subcommand test" -s h -l help -d 'Print help' | ||
complete -c my-app -n "__fish_my_app_using_subcommand help; and not __fish_seen_subcommand_from test help" -f -a "test" -d 'Subcommand with a second line' | ||
complete -c my-app -n "__fish_my_app_using_subcommand help; and not __fish_seen_subcommand_from test help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,36 @@ | ||
complete -c bin-name -n "__fish_use_subcommand" -s c | ||
complete -c bin-name -n "__fish_use_subcommand" -s v | ||
complete -c bin-name -n "__fish_use_subcommand" -s h -l help -d 'Print help' | ||
complete -c bin-name -n "__fish_use_subcommand" -f -a "test" -d 'Subcommand with a second line' | ||
complete -c bin-name -n "__fish_use_subcommand" -f -a "help" -d 'Print this message or the help of the given subcommand(s)' | ||
complete -c bin-name -n "__fish_seen_subcommand_from test" -s d | ||
complete -c bin-name -n "__fish_seen_subcommand_from test" -s c | ||
complete -c bin-name -n "__fish_seen_subcommand_from test" -s h -l help -d 'Print help' | ||
complete -c bin-name -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from test help" -f -a "test" -d 'Subcommand with a second line' | ||
complete -c bin-name -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from test help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)' | ||
# Print an optspec for argparse to handle cmd's options that are independent of any subcommand. | ||
function __fish_bin_name_global_optspecs | ||
string join \n c v h/help | ||
end | ||
|
||
function __fish_bin_name_needs_command | ||
# Figure out if the current invocation already has a command. | ||
set -l cmd (commandline -opc) | ||
set -e cmd[1] | ||
argparse -s (__fish_bin_name_global_optspecs) -- $cmd 2>/dev/null | ||
or return | ||
if set -q argv[1] | ||
# Also print the command, so this can be used to figure out what it is. | ||
echo $argv[1] | ||
return 1 | ||
end | ||
return 0 | ||
end | ||
|
||
function __fish_bin_name_using_subcommand | ||
set -l cmd (__fish_bin_name_needs_command) | ||
test -z "$cmd" | ||
and return 1 | ||
contains -- $cmd[1] $argv | ||
end | ||
|
||
complete -c bin-name -n "__fish_bin_name_needs_command" -s c | ||
complete -c bin-name -n "__fish_bin_name_needs_command" -s v | ||
complete -c bin-name -n "__fish_bin_name_needs_command" -s h -l help -d 'Print help' | ||
complete -c bin-name -n "__fish_bin_name_needs_command" -f -a "test" -d 'Subcommand with a second line' | ||
complete -c bin-name -n "__fish_bin_name_needs_command" -f -a "help" -d 'Print this message or the help of the given subcommand(s)' | ||
complete -c bin-name -n "__fish_bin_name_using_subcommand test" -s d | ||
complete -c bin-name -n "__fish_bin_name_using_subcommand test" -s c | ||
complete -c bin-name -n "__fish_bin_name_using_subcommand test" -s h -l help -d 'Print help' | ||
complete -c bin-name -n "__fish_bin_name_using_subcommand help; and not __fish_seen_subcommand_from test help" -f -a "test" -d 'Subcommand with a second line' | ||
complete -c bin-name -n "__fish_bin_name_using_subcommand help; and not __fish_seen_subcommand_from test help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,36 @@ | ||
complete -c my-app -n "__fish_use_subcommand" -s c -s C -l config -l conf -d 'some config file' | ||
complete -c my-app -n "__fish_use_subcommand" -s h -l help -d 'Print help' | ||
complete -c my-app -n "__fish_use_subcommand" -s V -l version -d 'Print version' | ||
complete -c my-app -n "__fish_use_subcommand" -a "test" -d 'tests things' | ||
complete -c my-app -n "__fish_use_subcommand" -a "help" -d 'Print this message or the help of the given subcommand(s)' | ||
complete -c my-app -n "__fish_seen_subcommand_from test" -l case -d 'the case to test' -r | ||
complete -c my-app -n "__fish_seen_subcommand_from test" -s h -l help -d 'Print help' | ||
complete -c my-app -n "__fish_seen_subcommand_from test" -s V -l version -d 'Print version' | ||
complete -c my-app -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from test help" -f -a "test" -d 'tests things' | ||
complete -c my-app -n "__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from test help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)' | ||
# Print an optspec for argparse to handle cmd's options that are independent of any subcommand. | ||
function __fish_my_app_global_optspecs | ||
string join \n c/config h/help V/version | ||
end | ||
|
||
function __fish_my_app_needs_command | ||
# Figure out if the current invocation already has a command. | ||
set -l cmd (commandline -opc) | ||
set -e cmd[1] | ||
argparse -s (__fish_my_app_global_optspecs) -- $cmd 2>/dev/null | ||
or return | ||
if set -q argv[1] | ||
# Also print the command, so this can be used to figure out what it is. | ||
echo $argv[1] | ||
return 1 | ||
end | ||
return 0 | ||
end | ||
|
||
function __fish_my_app_using_subcommand | ||
set -l cmd (__fish_my_app_needs_command) | ||
test -z "$cmd" | ||
and return 1 | ||
contains -- $cmd[1] $argv | ||
end | ||
|
||
complete -c my-app -n "__fish_my_app_needs_command" -s c -s C -l config -l conf -d 'some config file' | ||
complete -c my-app -n "__fish_my_app_needs_command" -s h -l help -d 'Print help' | ||
complete -c my-app -n "__fish_my_app_needs_command" -s V -l version -d 'Print version' | ||
complete -c my-app -n "__fish_my_app_needs_command" -a "test" -d 'tests things' | ||
complete -c my-app -n "__fish_my_app_needs_command" -a "help" -d 'Print this message or the help of the given subcommand(s)' | ||
complete -c my-app -n "__fish_my_app_using_subcommand test" -l case -d 'the case to test' -r | ||
complete -c my-app -n "__fish_my_app_using_subcommand test" -s h -l help -d 'Print help' | ||
complete -c my-app -n "__fish_my_app_using_subcommand test" -s V -l version -d 'Print version' | ||
complete -c my-app -n "__fish_my_app_using_subcommand help; and not __fish_seen_subcommand_from test help" -f -a "test" -d 'tests things' | ||
complete -c my-app -n "__fish_my_app_using_subcommand help; and not __fish_seen_subcommand_from test help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)' |
Oops, something went wrong.