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

fix: CLI_ARGS completion for fish and zsh (#1843) #1844

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: CLI_ARGS completion for fish and zsh (#1843) #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions completion/fish/task.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ function __task_get_tasks --description "Prints all available tasks with their d
end
end

complete -c $GO_TASK_PROGNAME -d 'Runs the specified task(s). Falls back to the "default" task if no task name was specified, or lists all tasks if an unknown task name was
specified.' -xa "(__task_get_tasks)"
complete -c $GO_TASK_PROGNAME \
-d 'Runs the specified task(s). Falls back to the "default" task if no task name was specified, or lists all tasks if an unknown task name was specified.' \
-xa "(__task_get_tasks)" \
-n "not __fish_seen_subcommand_from --"

complete -c $GO_TASK_PROGNAME -s c -l color -d 'colored output (default true)'
complete -c $GO_TASK_PROGNAME -s d -l dir -d 'sets directory of execution'
Expand Down
20 changes: 14 additions & 6 deletions completion/zsh/_task
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ function __task_list() {
taskfile=${(Qv)opt_args[(i)-t|--taskfile]}
taskfile=${taskfile//\~/$HOME}

for arg in "${words[@]:0:$CURRENT}"; do
if [[ "$arg" = "--" ]]; then
# Use default completion for words after `--` as they are CLI_ARGS.
_default
return 0
fi
done

if [[ -n "$taskfile" && -f "$taskfile" ]]; then
enabled=1
Expand All @@ -40,6 +47,7 @@ function __task_list() {

_task() {
_arguments \
-S \
'(-C --concurrency)'{-C,--concurrency}'[limit number of concurrent tasks]: ' \
'(-p --parallel)'{-p,--parallel}'[run command-line tasks in parallel]' \
'(-f --force)'{-f,--force}'[run even if task is up-to-date]' \
Expand All @@ -55,13 +63,13 @@ _task() {
'(-t --taskfile)'{-t,--taskfile}'[specify a different taskfile]:taskfile:_files' \
'(-v --verbose)'{-v,--verbose}'[verbose mode]' \
'(-w --watch)'{-w,--watch}'[watch-mode for given tasks, re-run when inputs change]' \
'(operation)*: :__task_list' \
+ '(operation)' \
Comment on lines +66 to 67
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Task-name completions didn't work except for the first positional argument in zsh, but this has been fixed as well.

(Argument specifications after + '(operation)' become mutually exclusive options. In the previous code, *: :__task_list also prevented other task names from being suggested when one task name is specified in a command line.)

{-l,--list}'[list describable tasks]' \
{-a,--list-all}'[list all tasks]' \
{-i,--init}'[create new Taskfile.yml]' \
'(-*)'{-h,--help}'[show help]' \
'(-*)--version[show version and exit]' \
'*: :__task_list'
'(*)'{-l,--list}'[list describable tasks]' \
'(*)'{-a,--list-all}'[list all tasks]' \
'(*)'{-i,--init}'[create new Taskfile.yml]' \
'(- *)'{-h,--help}'[show help]' \
'(- *)--version[show version and exit]' \
Comment on lines -62 to +72
Copy link
Author

@boiledfroginthewell boiledfroginthewell Sep 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

- (-*)--version
+ (- *)--version

I suppose (- *) is the intended one. This prevents all options and positional arguments from being suggested when the --version option is supplied.

(The parentheses specify groups of arguments to prevent suggestions. - and * are special group names for options and rest positional arguments, respectively. I think the -* group is not defined here.)

}

# don't run the completion function when being source-ed or eval-ed
Expand Down