Fix printing implementation.

Author: samuel-williams-shopify

data/toolbox/command.py

@@ -157,55 +157,55 @@ def parse(self, argument_string):
 		# Return new Arguments with converted options
 		return Arguments(arguments.expressions, arguments.flags, converted_options)
 
-	def help_text(self, command_name, terminal):
-		"""Generate help text from usage specification.
+	def print_to(self, terminal, command_name):
+		"""Print help text from usage specification.
 		
 		Args:
-			command_name: Name of the command (e.g., "rb-print")
 			terminal: Terminal for colored output
-		
-		Returns:
-			Formatted help string with usage, parameters, options, and flags
+			command_name: Name of the command (e.g., "rb-print")
 		"""
 		import format as fmt
 
 		# Summary with color
-		lines = [terminal.print(fmt.bold, self.summary, fmt.reset), ""]
+		terminal.print(fmt.bold, self.summary, fmt.reset)
+		terminal.print()
 
-		# Build usage line
-		usage_parts = [terminal.print(fmt.bold, command_name, fmt.reset)]
+		# Print usage line
+		terminal.print("Usage: ", end='')
+		terminal.print(fmt.bold, command_name, fmt.reset, end='')
 
 		for param_name, _ in self.parameters:
-			usage_parts.append(terminal.print(fmt.placeholder, f"<{param_name}>", fmt.reset))
+			terminal.print(' ', end='')
+			terminal.print(fmt.placeholder, f"<{param_name}>", fmt.reset, end='')
 
 		# Add option placeholders
 		for option_name in self.options.keys():
-			opt_placeholder = f"[--{option_name} N]"
-			usage_parts.append(terminal.print(fmt.placeholder, opt_placeholder, fmt.reset))
+			terminal.print(' ', end='')
+			terminal.print(fmt.placeholder, f"[--{option_name} N]", fmt.reset, end='')
 
 		# Add flag placeholders
 		for flag_name, _ in self.flags:
-			flag_placeholder = f"[--{flag_name}]"
-			usage_parts.append(terminal.print(fmt.placeholder, flag_placeholder, fmt.reset))
+			terminal.print(' ', end='')
+			terminal.print(fmt.placeholder, f"[--{flag_name}]", fmt.reset, end='')
 
-		lines.append(f"Usage: {' '.join(usage_parts)}")
-		lines.append("")
+		terminal.print()
+		terminal.print()
 
 		# Parameter descriptions
 		if self.parameters:
-			lines.append(terminal.print(fmt.title, "Parameters:", fmt.reset))
+			terminal.print(fmt.title, "Parameters:", fmt.reset)
 
 			for param_name, param_desc in self.parameters:
-				param_str = terminal.print(fmt.symbol, param_name, fmt.reset)
+				terminal.print("  ", fmt.symbol, param_name, fmt.reset, end='')
 				if param_desc:
-					lines.append(f"  {param_str:<15} {param_desc}")
+					terminal.print(f" - {param_desc}")
 				else:
-					lines.append(f"  {param_str}")
-			lines.append("")
+					terminal.print()
+			terminal.print()
 
 		# Option descriptions
 		if self.options:
-			lines.append(terminal.print(fmt.title, "Options:", fmt.reset))
+			terminal.print(fmt.title, "Options:", fmt.reset)
 
 			for option_name, opt_spec in self.options.items():
 				opt_type, opt_default = opt_spec[0], opt_spec[1]
@@ -214,40 +214,34 @@ def help_text(self, command_name, terminal):
 				type_str = opt_type.__name__ if hasattr(opt_type, '__name__') else str(opt_type)
 				default_str = f" (default: {opt_default})" if opt_default is not None else ""
 
-				opt_str = terminal.print(fmt.symbol, f"--{option_name}", fmt.reset)
-				type_part = terminal.print(fmt.placeholder, f" <{type_str}>", fmt.reset)
+				terminal.print("  ", fmt.symbol, f"--{option_name}", fmt.reset, end='')
+				terminal.print(fmt.placeholder, f" <{type_str}>", fmt.reset, end='')
+				terminal.print(default_str)
 
 				if opt_desc:
-					lines.append(f"  {opt_str}{type_part}{default_str}")
-					lines.append(f"      {opt_desc}")
-				else:
-					lines.append(f"  {opt_str}{type_part}{default_str}")
-			lines.append("")
+					terminal.print(f"      {opt_desc}")
+			terminal.print()
 
 		# Flag descriptions
 		if self.flags:
-			lines.append(terminal.print(fmt.title, "Flags:", fmt.reset))
+			terminal.print(fmt.title, "Flags:", fmt.reset)
 
 			for flag_name, flag_desc in self.flags:
-				flag_str = terminal.print(fmt.symbol, f"--{flag_name}", fmt.reset)
+				terminal.print("  ", fmt.symbol, f"--{flag_name}", fmt.reset, end='')
 				if flag_desc:
-					lines.append(f"  {flag_str:<15} {flag_desc}")
+					terminal.print(f" - {flag_desc}")
 				else:
-					lines.append(f"  {flag_str}")
-			lines.append("")
+					terminal.print()
+			terminal.print()
 
 		# Examples section
 		if self.examples:
-			lines.append(terminal.print(fmt.title, "Examples:", fmt.reset))
+			terminal.print(fmt.title, "Examples:", fmt.reset)
 
 			for example_cmd, example_desc in self.examples:
-				cmd_str = terminal.print(fmt.example, f"  {example_cmd}", fmt.reset)
-				lines.append(cmd_str)
+				terminal.print(fmt.example, f"  {example_cmd}", fmt.reset)
 				if example_desc:
-					lines.append(f"      {example_desc}")
-			lines.append("")
-		
-		return '\n'.join(lines)
+					terminal.print(f"      {example_desc}")
 
 class ArgumentParser:
 	"""Parse GDB command arguments handling nested brackets, quotes, and flags.

data/toolbox/context.py

@@ -172,56 +172,58 @@ def print_info(self, terminal):
         errinfo = self.errinfo
         has_exception = self.has_exception
 
-        print("Execution Context:")
-        print(f"  $ec = ", end='')
-        print(terminal.print_type_tag('rb_execution_context_t', int(self.ec), None))
+        terminal.print("Execution Context:")
+        terminal.print(f"  $ec = ", end='')
+        terminal.print_type_tag('rb_execution_context_t', int(self.ec), None)
 
         # VM Stack info
         if vm_stack is not None and vm_stack_size is not None:
-            print(f"  VM Stack: ", end='')
-            print(terminal.print_type_tag('VALUE', int(vm_stack), f'size={vm_stack_size}'))
+            terminal.print(f"  VM Stack: ", end='')
+            terminal.print_type_tag('VALUE', int(vm_stack), f'size={vm_stack_size}')
         else:
-            print(f"  VM Stack: <unavailable>")
+            terminal.print(f"  VM Stack: <unavailable>")
 
         # Control Frame info
         if cfp is not None:
-            print(f"  $cfp = ", end='')
-            print(terminal.print_type_tag('rb_control_frame_t', int(cfp), None))
+            terminal.print(f"  $cfp = ", end='')
+            terminal.print_type_tag('rb_control_frame_t', int(cfp), None)
         else:
-            print(f"  $cfp = <unavailable>")
+            terminal.print(f"  $cfp = <unavailable>")
 
         # Storage info
         if storage is not None and not value.is_nil(storage):
-            print(f"  Storage: ", end='')
-            print(terminal.print_type_tag('VALUE', int(storage), None))
+            terminal.print(f"  Storage: ", end='')
+            terminal.print_type_tag('VALUE', int(storage), None)
 
         # Exception info
         if has_exception:
-            print(f"  $errinfo = ", end='')
-            print(terminal.print_type_tag('VALUE', int(errinfo), None))
-            print("    Exception present!")
+            terminal.print("  $errinfo = ", end='')
+            terminal.print_type_tag('VALUE', int(errinfo), None)
+            terminal.print()
+            terminal.print("    Exception present!")
         else:
             errinfo_int = int(errinfo) if errinfo else 0
             if errinfo_int == 4:  # Qnil
-                print("  Exception: None")
+                terminal.print("  Exception: None")
             elif errinfo_int == 0:  # Qfalse
-                print("  Exception: None (false)")
+                terminal.print("  Exception: None (false)")
             else:
-                print(f"  Exception: None")
+                terminal.print("  Exception: None")
 
         # Tag info (for ensure blocks)
         try:
             tag = self.ec['tag']
             tag_int = int(tag)
             if tag_int != 0:
-                print(f"  Tag: ", end='')
-                print(terminal.print_type_tag('rb_vm_tag', tag_int, None))
+                terminal.print("  Tag: ", end='')
+                terminal.print_type_tag('rb_vm_tag', tag_int, None)
+                terminal.print()
                 try:
                     retval = tag['retval']
                     retval_int = int(retval)
                     is_retval_special = (retval_int & 0x03) != 0 or retval_int == 0
                     if not is_retval_special:
-                        print(f"    $retval available (in ensure block)")
+                        terminal.print("    $retval available (in ensure block)")
                 except Exception:
                     pass
         except Exception:

data/toolbox/debugger/gdb_backend.py

@@ -648,7 +648,7 @@ def invoke(self, arg, from_tty):
 				print(f"Error: {e}")
 				if self.usage_spec:
 					print()
-					print(self.usage_spec.help_text(name, terminal))
+					self.usage_spec.print_to(terminal, name)
 			except Exception as e:
 				print(f"Error: {e}")
 				import traceback

data/toolbox/debugger/lldb_backend.py

@@ -945,7 +945,7 @@ def invoke(self, arg, from_tty):
 				print(f"Error: {e}")
 				if self.usage_spec:
 					print()
-					print(self.usage_spec.help_text(name, terminal))
+					self.usage_spec.print_to(terminal, name)
 			except Exception as e:
 				print(f"Error: {e}")
 				import traceback