rfunctionality for completions and manpages remove test files accidently committed

tweaking

Author: raghavtan

Library/Homebrew/commands.rb

@@ -251,10 +251,64 @@ def self.named_args_type(command)
     cmd_parser = Homebrew::CLI::Parser.from_cmd_path(path)
     return if cmd_parser.blank?
 
-    Array(cmd_parser.named_args_type)
+    named_args = Array(cmd_parser.named_args_type)
+    if path.file? && path.extname == ".rb"
+      begin
+        content = path.read
+        if content.include?("include AbstractSubcommandMod")
+          named_args_match = content.match(/named_args\s+%w\[(.*?)\]/m)
+          if named_args_match && named_args_match[1].present?
+            subcommands = named_args_match[1].split(/\s+/).uniq
+            named_args.concat(subcommands)
+            named_args.uniq!
+          end
+        end
+      rescue
+      end
+    end
+
+    named_args
+  end
+
+  def self.subcommand_options(command, subcommand)
+    path = self.path(command)
+    return {} if path.blank?
+
+    return {} unless path.file?
+    return {} if path.extname != ".rb"
+
+    begin
+      content = path.read
+      return {} unless content.include?("include AbstractSubcommandMod")
+
+      pattern = /(?:^|[-_])([a-z])/
+      subcommand_class = subcommand.gsub(pattern) { T.must(::Regexp.last_match(1)).upcase }.gsub(/[-_]/, "")
+      subcommand_class_match = content.match(
+        /class\s+#{subcommand_class}Subcommand\s+<\s+AbstractSubcommand(.*?)end\s+end/m,
+      )
+      return {} unless subcommand_class_match
+
+      subcommand_def = subcommand_class_match[0]
+      cmd_args_match = subcommand_def.match(/cmd_args\s+do(.*?)end/m)
+      return {} unless cmd_args_match
+
+      cmd_args_block = cmd_args_match[1]
+      options = {}
+      flag_matches = cmd_args_block.scan(/flag\s+["']([^"']+)["'],?\s*(?:description:|desc:)\s*["']([^"']+)["']/m)
+      flag_matches.each do |flag, desc|
+        options[flag] = desc
+      end
+      switch_matches = cmd_args_block.scan(/switch\s+["']([^"']+)["'],?\s*(?:description:|desc:)\s*["']([^"']+)["']/m)
+      switch_matches.each do |switch, desc|
+        options[switch] = desc
+      end
+
+      options
+    rescue
+      {}
+    end
   end
 
-  # Returns the conflicts of a given `option` for `command`.
   def self.option_conflicts(command, option)
     path = self.path(command)
     return if path.blank?

Library/Homebrew/completions.rb

@@ -144,9 +144,10 @@ def self.format_description(description, fish: false)
       description.gsub(/[<>]/, "").tr("\n", " ").chomp(".")
     end
 
-    sig { params(command: String).returns(T::Hash[String, String]) }
-    def self.command_options(command)
+    sig { params(command: String, subcommand: T.nilable(String)).returns(T::Hash[String, String]) }
+    def self.command_options(command, subcommand = nil)
       options = {}
+
       Commands.command_options(command)&.each do |option|
         next if option.blank?
 
@@ -159,6 +160,19 @@ def self.command_options(command)
           options[name] = desc
         end
       end
+
+      if subcommand.present?
+        subcommand_options = Commands.subcommand_options(command, subcommand)
+        subcommand_options.each do |name, desc|
+          if name.start_with? "--[no-]"
+            options[name.gsub("[no-]", "")] = desc
+            options[name.sub("[no-]", "no-")] = desc
+          else
+            options[name] = desc
+          end
+        end
+      end
+
       options
     end
 
@@ -176,7 +190,67 @@ def self.generate_bash_subcommand_completion(command)
           named_completion_string += "\n  #{BASH_NAMED_ARGS_COMPLETION_FUNCTION_MAPPING[type]}"
         end
 
-        named_completion_string += "\n  __brewcomp \"#{named_args_strings.join(" ")}\"" if named_args_strings.any?
+        if named_args_strings.any?
+          named_completion_string += "\n  __brewcomp \"#{named_args_strings.join(" ")}\""
+          subcommand_functions = []
+          named_args_strings.each do |subcommand|
+            subcommand_options = command_options(command, subcommand)
+            next if subcommand_options.empty?
+            subcommand_functions << <<~SUBCOMPLETION
+              _brew_#{Commands.method_name command}_#{subcommand.tr("-", "_")}() {
+                local cur="${COMP_WORDS[COMP_CWORD]}"
+                case "${cur}" in
+                  -*)
+                    __brewcomp "
+                    #{subcommand_options.keys.sort.join("\n        ")}
+                    "
+                    return
+                    ;;
+                  *) ;;
+                esac
+              }
+            SUBCOMPLETION
+          end
+
+          if subcommand_functions.any?
+            named_completion_string += "\n\n  # Handle subcommands"
+            named_completion_string += "\n  local subcmd_idx=1"
+            named_completion_string += "\n  for ((; subcmd_idx < COMP_CWORD; subcmd_idx++))"
+            named_completion_string += "\n  do"
+            named_completion_string += "\n    local subcmd=\"${COMP_WORDS[subcmd_idx]}\""
+            named_completion_string += "\n    case \"${subcmd}\" in"
+
+            named_args_strings.each do |subcommand|
+              next if command_options(command, subcommand).empty?
+
+              named_completion_string += "\n      #{subcommand})"
+              named_completion_string += "\n        _brew_#{Commands.method_name command}_#{subcommand.tr("-", "_")}"
+              named_completion_string += "\n        return"
+              named_completion_string += "\n        ;;"
+            end
+
+            named_completion_string += "\n      *) ;; # Default case"
+            named_completion_string += "\n    esac"
+            named_completion_string += "\n  done"
+
+            return <<~COMPLETION
+              #{subcommand_functions.join("\n")}
+
+              _brew_#{Commands.method_name command}() {
+                local cur="${COMP_WORDS[COMP_CWORD]}"
+                case "${cur}" in
+                  -*)
+                    __brewcomp "
+                    #{command_options(command).keys.sort.join("\n      ")}
+                    "
+                    return
+                    ;;
+                  *) ;;
+                esac#{named_completion_string}
+              }
+            COMPLETION
+          end
+        end
       end
 
       <<~COMPLETION
@@ -218,6 +292,8 @@ def self.generate_zsh_subcommand_completion(command)
       options = command_options(command)
 
       args_options = []
+      subcommand_completions = []
+
       if (types = Commands.named_args_type(command))
         named_args_strings, named_args_types = types.partition { |type| type.is_a? String }
 
@@ -244,6 +320,25 @@ def self.generate_zsh_subcommand_completion(command)
         if named_args_strings.any?
           args_options << "- subcommand"
           args_options << "*::subcommand:(#{named_args_strings.join(" ")})"
+          named_args_strings.each do |subcommand|
+            subcommand_opts = command_options(command, subcommand)
+            next if subcommand_opts.empty?
+
+            formatted_opts = subcommand_opts.sort.map do |opt, desc|
+              next opt if desc.blank?
+
+              conflicts = generate_zsh_option_exclusions(command, opt)
+              "#{conflicts}#{opt}[#{format_description desc}]"
+            end
+
+            subcommand_completions << <<~SUBCOMPLETION
+              # brew #{command} #{subcommand}
+              _brew_#{Commands.method_name command}_#{subcommand.tr("-", "_")}() {
+                _arguments \\
+                  #{formatted_opts.map { |opt| "'#{opt}'" }.join(" \\\n    ")}
+              }
+            SUBCOMPLETION
+          end
         end
       end
 
@@ -255,11 +350,33 @@ def self.generate_zsh_subcommand_completion(command)
       end
       options += args_options
 
+      return <<~COMPLETION if subcommand_completions.any?
+
+        #{subcommand_completions.join("\n\n")}
+
+        # brew #{command}
+        _brew_#{Commands.method_name command}() {
+          if (( CURRENT > 2 )); then
+            local subcmd=${words[2]}
+            case "$subcmd" in
+              #{named_args_strings.reject { |s| command_options(command, s).empty? }
+                                .map { |s| "#{s}) _brew_#{Commands.method_name command}_#{s.tr("-", "_")} ;;" }
+                                .join("\n          ")}
+              *) _arguments \\
+                 #{options.map { |opt| opt.start_with?("- ") ? opt : "'#{opt}'" }.join(" \\\n    ")} ;;
+            esac
+          else
+            _arguments \\
+              #{options.map { |opt| opt.start_with?("- ") ? opt : "'#{opt}'" }.join(" \\\n    ")}
+          fi
+        }
+      COMPLETION
+
       <<~COMPLETION
         # brew #{command}
         _brew_#{Commands.method_name command}() {
           _arguments \\
-            #{options.map! { |opt| opt.start_with?("- ") ? opt : "'#{opt}'" }.join(" \\\n    ")}
+            #{options.map { |opt| opt.start_with?("- ") ? opt : "'#{opt}'" }.join(" \\\n    ")}
         }
       COMPLETION
     end
@@ -318,6 +435,8 @@ def self.generate_fish_subcommand_completion(command)
 
       subcommands = []
       named_args = []
+      subcommand_options = []
+
       if (types = Commands.named_args_type(command))
         named_args_strings, named_args_types = types.partition { |type| type.is_a? String }
 
@@ -341,10 +460,22 @@ def self.generate_fish_subcommand_completion(command)
 
         named_args_strings.each do |subcommand|
           subcommands << "__fish_brew_complete_sub_cmd '#{command}' '#{subcommand}'"
+          
+          subcmd_options = command_options(command, subcommand)
+          next if subcmd_options.empty?
+
+          subcmd_options.sort.each do |opt, desc|
+            arg_line = "# #{subcommand} subcommand options"
+            subcommand_options << arg_line unless subcommand_options.include?(arg_line)
+
+            arg_line = "__fish_brew_complete_sub_arg '#{command}' '#{subcommand}' -l #{opt.sub(/^-+/, "")}"
+            arg_line += " -d '#{format_description desc, fish: true}'" if desc.present?
+            subcommand_options << arg_line
+          end
         end
       end
 
-      lines += subcommands + options + named_args
+      lines += subcommands + options + named_args + subcommand_options
       <<~COMPLETION
         #{lines.join("\n").chomp}
       COMPLETION

Library/Homebrew/completions/fish.erb

@@ -191,7 +191,8 @@ end
 function __fish_brew_complete_sub_arg -a cmd sub -d "A shortcut for defining brew subcommand arguments completions"
     set -e argv[1..2]
     # NOTE: $sub can be just a name of a subcommand (or several) or additionally any other condition
-    complete -f -c brew -n "__fish_brew_subcommand $cmd $sub" $argv
+    # This supports both traditional subcommands and AbstractSubcommand framework
+    complete -f -c brew -n "begin; __fish_brew_subcommand $cmd $sub; or begin; __fish_brew_command $cmd; and string match -q -- '$sub' (__fish_brew_args)[2]; end; end" $argv
 end
 
 

Library/Homebrew/manpages.rb

@@ -112,6 +112,61 @@ def self.cmd_parser_manpage_lines(cmd_parser)
 
         generate_option_doc(short, long, desc)
       end
+
+      command_name = cmd_parser.instance_variable_get(:@command_name)
+      return lines unless command_name
+      cmd_path = Commands.path(command_name)
+      if cmd_path&.file? && cmd_path.extname == ".rb"
+        begin
+          content = cmd_path.read
+          if content.include?("include AbstractSubcommandMod") && content.include?("< AbstractSubcommand")
+            named_args_match = content.match(/named_args\s+%w\[(.*?)\]/m)
+            if named_args_match && named_args_match[1].present?
+              subcommands = named_args_match[1].split(/\s+/).uniq
+              lines << "\n#### Subcommands\n\n"
+              subcommands.each do |subcommand|
+                subcommand_class = subcommand.gsub(/(?:^|[-_])([a-z])/) do
+                  T.must(::Regexp.last_match(1)).upcase
+                end.gsub(/[-_]/, "")
+
+                subcommand_class_match = content.match(
+                  /class\s+#{subcommand_class}Subcommand\s+<\s+AbstractSubcommand(.*?)end\s+class/m,
+                )
+                next unless subcommand_class_match
+                subcommand_def = subcommand_class_match[0]
+                cmd_args_match = subcommand_def.match(/cmd_args\s+do(.*?)end/m)
+                next unless cmd_args_match
+
+                cmd_args_block = cmd_args_match[1]
+                subcommand_lines = ["**`#{subcommand}`**"]
+                flag_matches = cmd_args_block.scan(
+                  /flag\s+["']([^"']+)["'],?\s*(?:description:|desc:)\s*["']([^"']+)["']/m,
+                )
+                switch_matches = cmd_args_block.scan(
+                  /switch\s+["']([^"']+)["'],?\s*(?:description:|desc:)\s*["']([^"']+)["']/m,
+                )
+
+                option_docs = flag_matches.map do |flag, desc|
+                  generate_option_doc(nil, flag, desc)
+                end
+
+                switch_matches.each do |switch, desc|
+                  option_docs << generate_option_doc(nil, switch, desc)
+                end
+
+                if option_docs.any?
+                  subcommand_lines << "\n*Subcommand options:*\n\n"
+                  subcommand_lines.concat(option_docs)
+                end
+
+                lines << subcommand_lines.join
+              end
+            end
+          end
+        rescue
+        end
+      end
+
       lines
     end
 

Library/Homebrew/test/Library/Application Support/Cursor/logs/20250405T104508/cli.log

@@ -0,0 +1,3 @@
+2025-04-05 10:45:08.599 [info] CLI main {"_":[],"diff":false,"merge":false,"add":false,"goto":false,"new-window":false,"reuse-window":false,"wait":false,"help":false,"list-extensions":true,"show-versions":false,"pre-release":false,"update-extensions":false,"version":false,"verbose":false,"status":false,"prof-startup":false,"no-cached-data":false,"prof-v8-extensions":false,"disable-extensions":false,"disable-lcd-text":false,"disable-gpu":false,"disable-chromium-sandbox":false,"sandbox":false,"telemetry":false,"debugRenderer":false,"enable-smoke-test-driver":false,"logExtensionHostCommunication":false,"skip-release-notes":false,"skip-welcome":false,"skip-onboarding":false,"disable-telemetry":false,"disable-updates":false,"use-inmemory-secretstorage":false,"disable-workspace-trust":false,"disable-crash-reporter":false,"skip-add-to-recently-opened":false,"open-url":false,"file-write":false,"file-chmod":false,"force":false,"do-not-sync":false,"trace":false,"trace-memory-infra":false,"preserve-env":false,"force-user-env":false,"force-disable-user-env":false,"open-devtools":false,"disable-gpu-sandbox":false,"__enable-file-policy":false,"enable-coi":false,"no-proxy-server":false,"no-sandbox":false,"nolazy":false,"force-renderer-accessibility":false,"ignore-certificate-errors":false,"allow-insecure-localhost":false,"disable-dev-shm-usage":false,"profile-temp":false,"hmr":false,"logsPath":"/opt/homebrew/Library/Homebrew/test/Library/Application Support/Cursor/logs/20250405T104508"}
+2025-04-05 10:45:08.607 [info] Started initializing default profile extensions in extensions installation folder. file:///opt/homebrew/Library/Homebrew/test/.cursor/extensions
+2025-04-05 10:45:08.639 [info] Completed initializing default profile extensions in extensions installation folder. file:///opt/homebrew/Library/Homebrew/test/.cursor/extensions

Library/Homebrew/test/Library/Application Support/Cursor/machineid

@@ -0,0 +1 @@
+e68d460a-022e-4fb4-9e74-489c10addb6c

Library/Homebrew/test/Library/Application Support/Microsoft/DeveloperTools/deviceid

@@ -0,0 +1 @@
+e6fb08ab-c726-4029-b5cd-dad9134c4739