Merge pull request #22422 from Homebrew/fix-zsh-subcommand-option-completion

Fix zsh nested subcommand option completion

Author: MikeMcQuaid

Library/Homebrew/completions.rb

@@ -435,7 +435,7 @@ def self.generate_zsh_nested_subcommand_completion(command, subcommands)
               _describe -t subcommands 'subcommand' subcommands
               ;;
             args)
-              case "$words[2]" in
+              case "$words[1]" in
         #{subcommand_cases.chomp}
                 *) ;;
               esac

Library/Homebrew/test/completions_spec.rb

@@ -464,6 +464,7 @@ def stub_nested_completion_command(command, subcommands)
         stub_nested_completion_command(nested_completion_command, nested_completion_subcommands)
         completion = klass.generate_zsh_subcommand_completion(nested_completion_command)
 
+        expect(completion).to include('case "$words[1]" in')
         expect(completion).to include("'1:subcommand:->subcommand'")
         expect(completion).to include("  _arguments -C \\\n    '--global[Use the global test file]' \\\n    " \
                                       "'1:subcommand:->subcommand'")

completions/zsh/_brew

@@ -416,7 +416,7 @@ _brew_analytics() {
       _describe -t subcommands 'subcommand' subcommands
       ;;
     args)
-      case "$words[2]" in
+      case "$words[1]" in
 state)
         _arguments \
           '--debug[Display any debugging information]' \
@@ -679,7 +679,7 @@ _brew_bundle() {
       _describe -t subcommands 'subcommand' subcommands
       ;;
     args)
-      case "$words[2]" in
+      case "$words[1]" in
 sh)
         _arguments \
           '--check[Check that all dependencies in the Brewfile are installed before starting the shell. Enabled by default if `$HOMEBREW_BUNDLE_CHECK` is set]' \
@@ -981,7 +981,7 @@ _brew_completions() {
       _describe -t subcommands 'subcommand' subcommands
       ;;
     args)
-      case "$words[2]" in
+      case "$words[1]" in
 unlink)
         _arguments \
           '--debug[Display any debugging information]' \
@@ -1155,7 +1155,7 @@ _brew_developer() {
       _describe -t subcommands 'subcommand' subcommands
       ;;
     args)
-      case "$words[2]" in
+      case "$words[1]" in
 state)
         _arguments \
           '--debug[Display any debugging information]' \
@@ -2056,7 +2056,7 @@ _brew_services() {
       _describe -t subcommands 'subcommand' subcommands
       ;;
     args)
-      case "$words[2]" in
+      case "$words[1]" in
 stop|unload|terminate|term|t|u)
         _arguments \
           '(--file)--all[Stop all services and unregister them from launching at login (or boot), unless `--keep` is specified]' \