lib/irb/command/help.rb in irb-1.13.0 vs lib/irb/command/help.rb in irb-1.13.1

@@ -26,36 +26,44 @@
         commands_info = IRB::Command.all_commands_info
         helper_methods_info = IRB::HelperMethod.all_helper_methods_info
         commands_grouped_by_categories = commands_info.group_by { |cmd| cmd[:category] }
         commands_grouped_by_categories["Helper methods"] = helper_methods_info
 
-        user_aliases = irb_context.instance_variable_get(:@user_aliases)
-
-        commands_grouped_by_categories["Aliases"] = user_aliases.map do |alias_name, target|
-          { display_name: alias_name, description: "Alias for `#{target}`" }
-        end
-
         if irb_context.with_debugger
           # Remove the original "Debugging" category
           commands_grouped_by_categories.delete("Debugging")
-          # Add an empty "Debugging (from debug.gem)" category at the end
-          commands_grouped_by_categories["Debugging (from debug.gem)"] = []
         end
 
         longest_cmd_name_length = commands_info.map { |c| c[:display_name].length }.max
 
         output = StringIO.new
 
         help_cmds = commands_grouped_by_categories.delete("Help")
+        no_category_cmds = commands_grouped_by_categories.delete("No category")
+        aliases = irb_context.instance_variable_get(:@user_aliases).map do |alias_name, target|
+          { display_name: alias_name, description: "Alias for `#{target}`" }
+        end
 
+        # Display help commands first
         add_category_to_output("Help", help_cmds, output, longest_cmd_name_length)
 
+        # Display the rest of the commands grouped by categories
         commands_grouped_by_categories.each do |category, cmds|
           add_category_to_output(category, cmds, output, longest_cmd_name_length)
         end
 
+        # Display commands without a category
+        if no_category_cmds
+          add_category_to_output("No category", no_category_cmds, output, longest_cmd_name_length)
+        end
+
+        # Display aliases
+        add_category_to_output("Aliases", aliases, output, longest_cmd_name_length)
+
         # Append the debugger help at the end
         if irb_context.with_debugger
+          # Add "Debugging (from debug.gem)" category as title
+          add_category_to_output("Debugging (from debug.gem)", [], output, longest_cmd_name_length)
           output.puts DEBUGGER__.help
         end
 
         output.string
       end