fix zsh

Author: vmaerten

completion/fish/task.fish

@@ -82,9 +82,11 @@ if __task_is_experiment_enabled GENTLE_FORCE
 end
 
 if __task_is_experiment_enabled REMOTE_TASKFILES
-    complete -c $GO_TASK_PROGNAME -l download                    -d 'download remote Taskfile'
+    # Options
     complete -c $GO_TASK_PROGNAME -l offline                     -d 'use only local or cached Taskfiles'
     complete -c $GO_TASK_PROGNAME -l timeout                     -d 'timeout for remote Taskfile downloads'
-    complete -c $GO_TASK_PROGNAME -l clear-cache                 -d 'clear remote Taskfile cache'
     complete -c $GO_TASK_PROGNAME -l expiry                      -d 'cache expiry duration'
+    # Operations
+    complete -c $GO_TASK_PROGNAME -l download                    -d 'download remote Taskfile'
+    complete -c $GO_TASK_PROGNAME -l clear-cache                 -d 'clear remote Taskfile cache'
 end

completion/ps/task.ps1

@@ -68,11 +68,13 @@ Register-ArgumentCompleter -CommandName task -ScriptBlock {
 		}
 
 		if ($experiments -match '\* REMOTE_TASKFILES:.*on') {
-			$completions += [CompletionResult]::new('--download', '--download', [CompletionResultType]::ParameterName, 'download remote Taskfile')
+			# Options
 			$completions += [CompletionResult]::new('--offline', '--offline', [CompletionResultType]::ParameterName, 'use cached Taskfiles')
 			$completions += [CompletionResult]::new('--timeout', '--timeout', [CompletionResultType]::ParameterName, 'download timeout')
-			$completions += [CompletionResult]::new('--clear-cache', '--clear-cache', [CompletionResultType]::ParameterName, 'clear cache')
 			$completions += [CompletionResult]::new('--expiry', '--expiry', [CompletionResultType]::ParameterName, 'cache expiry')
+			# Operations
+			$completions += [CompletionResult]::new('--download', '--download', [CompletionResultType]::ParameterName, 'download remote Taskfile')
+			$completions += [CompletionResult]::new('--clear-cache', '--clear-cache', [CompletionResultType]::ParameterName, 'clear cache')
 		}
 
 		return $completions.Where{ $_.CompletionText.StartsWith($commandName) }

completion/zsh/_task

@@ -42,8 +42,9 @@ function __task_list() {
 }
 
 _task() {
-    local -a args
-    args=(
+    local -a standard_args operation_args
+
+    standard_args=(
         '(-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]'
@@ -72,31 +73,43 @@ _task() {
         '(-v --verbose)'{-v,--verbose}'[verbose mode]'
         '(-w --watch)'{-w,--watch}'[watch-mode for given tasks, re-run when inputs change]'
         '(-y --yes)'{-y,--yes}'[assume yes to all prompts]'
-        + '(operation)'
-            {-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'
     )
 
     # Experimental flags (dynamically added based on enabled experiments)
+    # Options (modify behavior)
     if __task_is_experiment_enabled "GENTLE_FORCE"; then
-        args+=('(--force-all)--force-all[force execution of task and all dependencies]')
+        standard_args+=('(--force-all)--force-all[force execution of task and all dependencies]')
     fi
 
     if __task_is_experiment_enabled "REMOTE_TASKFILES"; then
-        args+=(
-            '(--download)--download[download remote Taskfile]'
+        standard_args+=(
             '(--offline)--offline[use only local or cached Taskfiles]'
             '(--timeout)--timeout[timeout for remote Taskfile downloads]:duration: '
-            '(--clear-cache)--clear-cache[clear remote Taskfile cache]'
             '(--expiry)--expiry[cache expiry duration]:duration: '
         )
     fi
 
-    _arguments $args
+    operation_args=(
+        + '(operation)'
+            {-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]'
+    )
+
+    # Experimental operations (dynamically added based on enabled experiments)
+    if __task_is_experiment_enabled "REMOTE_TASKFILES"; then
+        operation_args+=(
+            '--download[download remote Taskfile]'
+            '--clear-cache[clear remote Taskfile cache]'
+        )
+    fi
+
+    # Task names completion (must be last)
+    operation_args+=('*: :__task_list')
+
+    _arguments $standard_args $operation_args
 }
 
 # don't run the completion function when being source-ed or eval-ed