psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename last arg helper function to current arg for clarity

Browse source
This commit is contained in:
Isaac 2023-05-06 11:42:32 -07:00
parent c8f4344f89
commit efb81fc2c1
No known key found for this signature in database
GPG key ID: E69FB5A841448A48
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
borgmatic/commands/completion.py
View file

@ -129,13 +129,13 @@ def exact_options_completion(action: Action):
args = ' '.join(action.option_strings) args = ' '.join(action.option_strings)
if has_file_options(action): if has_file_options(action):
return f'''\ncomplete -c borgmatic -Fr -n "__borgmatic_last_arg {args}"''' return f'''\ncomplete -c borgmatic -Fr -n "__borgmatic_current_arg {args}"'''
if has_choice_options(action): if has_choice_options(action):
return f'''\ncomplete -c borgmatic -f -a '{' '.join(map(str, action.choices))}' -n "__borgmatic_last_arg {args}"''' return f'''\ncomplete -c borgmatic -f -a '{' '.join(map(str, action.choices))}' -n "__borgmatic_current_arg {args}"'''
if has_unknown_required_param_options(action): if has_unknown_required_param_options(action):
return f'''\ncomplete -c borgmatic -x -n "__borgmatic_last_arg {args}"''' return f'''\ncomplete -c borgmatic -x -n "__borgmatic_current_arg {args}"'''
raise ValueError( raise ValueError(
f'Unexpected action: {action} passes has_exact_options but has no choices produced' f'Unexpected action: {action} passes has_exact_options but has no choices produced'
@ -189,7 +189,7 @@ def fish_completion():
end end
__borgmatic_check_version __borgmatic_check_version
function __borgmatic_last_arg --description 'Check if any of the given arguments are the last on the command line before the cursor' function __borgmatic_current_arg --description 'Check if any of the given arguments are the last on the command line before the cursor'
set -l all_args (commandline -poc) set -l all_args (commandline -poc)
# premature optimization to avoid iterating all args if there aren't enough # premature optimization to avoid iterating all args if there aren't enough
# to have a last arg beyond borgmatic # to have a last arg beyond borgmatic
@ -205,7 +205,7 @@ def fish_completion():
end end
set --local subparser_condition "not __fish_seen_subcommand_from {all_subparsers}" set --local subparser_condition "not __fish_seen_subcommand_from {all_subparsers}"
set --local exact_option_condition "not __borgmatic_last_arg {' '.join(exact_option_args)}" set --local exact_option_condition "not __borgmatic_current_arg {' '.join(exact_option_args)}"
''' '''
) )
+ ('\n# subparser completions',) + ('\n# subparser completions',)