A little more color

Author: samuel-williams-shopify

data/toolbox/command.py

@@ -157,75 +157,139 @@ 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):
+	def help_text(self, command_name, terminal=None):
 		"""Generate help text from usage specification.
 		
 		Args:
 			command_name: Name of the command (e.g., "rb-object-print")
+			terminal: Optional terminal for colored output
 		
 		Returns:
 			Formatted help string with usage, parameters, options, and flags
 		"""
-		lines = [self.summary, ""]
+		# Import format if we have a terminal
+		if terminal:
+			import format as fmt
+		else:
+			fmt = None
+		# Summary with color
+		if terminal:
+			lines = [terminal.print(fmt.bold, self.summary, fmt.reset), ""]
+		else:
+			lines = [self.summary, ""]
 
 		# Build usage line
-		usage_parts = [command_name]
+		usage_parts = [command_name] if not terminal else [terminal.print(fmt.bold, command_name, fmt.reset)]
+		
 		for param_name, _ in self.parameters:
-			usage_parts.append(f"<{param_name}>")
+			if terminal:
+				usage_parts.append(terminal.print(fmt.dim, f"<{param_name}>", fmt.reset))
+			else:
+				usage_parts.append(f"<{param_name}>")
 
 		# Add option placeholders
 		for option_name in self.options.keys():
-			usage_parts.append(f"[--{option_name} N]")
+			placeholder = f"[--{option_name} N]"
+			if terminal:
+				usage_parts.append(terminal.print(fmt.dim, placeholder, fmt.reset))
+			else:
+				usage_parts.append(placeholder)
 
 		# Add flag placeholders
 		for flag_name, _ in self.flags:
-			usage_parts.append(f"[--{flag_name}]")
+			placeholder = f"[--{flag_name}]"
+			if terminal:
+				usage_parts.append(terminal.print(fmt.dim, placeholder, fmt.reset))
+			else:
+				usage_parts.append(placeholder)
 
 		lines.append(f"Usage: {' '.join(usage_parts)}")
 		lines.append("")
 
 		# Parameter descriptions
 		if self.parameters:
-			lines.append("Parameters:")
+			if terminal:
+				lines.append(terminal.print(fmt.title, "Parameters:", fmt.reset))
+			else:
+				lines.append("Parameters:")
+			
 			for param_name, param_desc in self.parameters:
-				if param_desc:
-					lines.append(f"  {param_name:<15} {param_desc}")
+				if terminal:
+					param_str = terminal.print(fmt.symbol, param_name, fmt.reset)
+					if param_desc:
+						lines.append(f"  {param_str:<15} {param_desc}")
+					else:
+						lines.append(f"  {param_str}")
 				else:
-					lines.append(f"  {param_name}")
+					if param_desc:
+						lines.append(f"  {param_name:<15} {param_desc}")
+					else:
+						lines.append(f"  {param_name}")
 			lines.append("")
 
 		# Option descriptions
 		if self.options:
-			lines.append("Options:")
+			if terminal:
+				lines.append(terminal.print(fmt.title, "Options:", fmt.reset))
+			else:
+				lines.append("Options:")
+			
 			for option_name, opt_spec in self.options.items():
 				opt_type, opt_default = opt_spec[0], opt_spec[1]
 				opt_desc = opt_spec[2] if len(opt_spec) > 2 else None
 
 				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 ""
 
+				if terminal:
+					opt_str = terminal.print(fmt.symbol, f"--{option_name}", fmt.reset)
+					type_part = terminal.print(fmt.dim, f" <{type_str}>", fmt.reset)
+				else:
+					opt_str = f"--{option_name}"
+					type_part = f" <{type_str}>"
+				
 				if opt_desc:
-					lines.append(f"  --{option_name} <{type_str}>{default_str}")
+					lines.append(f"  {opt_str}{type_part}{default_str}")
 					lines.append(f"      {opt_desc}")
 				else:
-					lines.append(f"  --{option_name} <{type_str}>{default_str}")
+					lines.append(f"  {opt_str}{type_part}{default_str}")
 			lines.append("")
 
 		# Flag descriptions
 		if self.flags:
-			lines.append("Flags:")
+			if terminal:
+				lines.append(terminal.print(fmt.title, "Flags:", fmt.reset))
+			else:
+				lines.append("Flags:")
+			
 			for flag_name, flag_desc in self.flags:
-				if flag_desc:
-					lines.append(f"  --{flag_name:<15} {flag_desc}")
+				if terminal:
+					flag_str = terminal.print(fmt.symbol, f"--{flag_name}", fmt.reset)
+					if flag_desc:
+						lines.append(f"  {flag_str:<15} {flag_desc}")
+					else:
+						lines.append(f"  {flag_str}")
 				else:
-					lines.append(f"  --{flag_name}")
+					if flag_desc:
+						lines.append(f"  --{flag_name:<15} {flag_desc}")
+					else:
+						lines.append(f"  --{flag_name}")
 			lines.append("")
 
 		# Examples section
 		if self.examples:
-			lines.append("Examples:")
+			if terminal:
+				lines.append(terminal.print(fmt.title, "Examples:", fmt.reset))
+			else:
+				lines.append("Examples:")
+			
 			for example_cmd, example_desc in self.examples:
-				lines.append(f"  {example_cmd}")
+				if terminal:
+					cmd_str = terminal.print(fmt.dim, f"  {example_cmd}", fmt.reset)
+					lines.append(cmd_str)
+				else:
+					lines.append(f"  {example_cmd}")
+				
 				if example_desc:
 					lines.append(f"      {example_desc}")
 			lines.append("")

data/toolbox/context.py

@@ -385,7 +385,7 @@ def invoke(self, arg, from_tty):
             flags_set = {'debug'} if debug else set()
             args_for_printer = command.Arguments([storage_val], flags_set, {'depth': depth})
 
-            printer.invoke(args_for_printer, terminal, from_tty)
+            printer.invoke(args_for_printer, terminal)
 
         except Exception as e:
             print(f"Error: {e}")

data/toolbox/debugger/gdb_backend.py

@@ -3,6 +3,7 @@
 """
 
 import gdb
+import format
 
 # Command categories
 COMMAND_DATA = gdb.COMMAND_DATA
@@ -372,6 +373,8 @@ def __init__(self):
 			self.usage_spec = usage
 
 		def invoke(self, arg, from_tty):
+			terminal = format.create_terminal(from_tty)
+			
 			try:
 				# Parse and validate arguments
 				if self.usage_spec:
@@ -381,23 +384,19 @@ def invoke(self, arg, from_tty):
 					import command as cmd_module
 					arguments = cmd_module.parse_arguments(arg if arg else "")
 
-				# Create terminal for formatting
-				import format
-				terminal = format.create_terminal(from_tty)
-				
 				# Lazy instantiate command class
 				if self.command_instance is None:
 					self.command_instance = command_class()
 
 				# Call command's invoke with parsed Arguments object and terminal
-				self.command_instance.invoke(arguments, terminal, from_tty)
+				self.command_instance.invoke(arguments, terminal)
 
 			except ValueError as e:
 				# Validation error - show usage
 				print(f"Error: {e}")
 				if self.usage_spec:
 					print()
-					print(self.usage_spec.help_text(command_name))
+					print(self.usage_spec.help_text(command_name, terminal))
 			except Exception as e:
 				print(f"Error: {e}")
 				import traceback

data/toolbox/debugger/lldb_backend.py

@@ -6,6 +6,7 @@
 """
 
 import lldb
+import format
 
 # Command categories (LLDB doesn't have exact equivalents, using symbolic constants)
 COMMAND_DATA = 0
@@ -497,6 +498,8 @@ def __init__(self):
 			self.usage_spec = usage
 
 		def invoke(self, arg, from_tty):
+			terminal = format.create_terminal(from_tty)
+			
 			try:
 				# Parse and validate arguments
 				if self.usage_spec:
@@ -506,23 +509,19 @@ def invoke(self, arg, from_tty):
 					import command as cmd_module
 					arguments = cmd_module.parse_arguments(arg if arg else "")
 
-				# Create terminal for formatting
-				import format
-				terminal = format.create_terminal(from_tty)
-				
 				# Lazy instantiate command class
 				if self.command_instance is None:
 					self.command_instance = command_class()
 
 				# Call command's invoke with parsed Arguments object and terminal
-				self.command_instance.invoke(arguments, terminal, from_tty)
+				self.command_instance.invoke(arguments, terminal)
 
 			except ValueError as e:
 				# Validation error - show usage
 				print(f"Error: {e}")
 				if self.usage_spec:
 					print()
-					print(self.usage_spec.help_text(command_name))
+					print(self.usage_spec.help_text(command_name, terminal))
 			except Exception as e:
 				print(f"Error: {e}")
 				import traceback

data/toolbox/format.py

@@ -28,6 +28,7 @@ def __repr__(self):
 error = Style('error')
 bold = Style('bold')
 dim = Style('dim')
+title = Style('title')  # For section headers in help text
 
 class Text:
 	"""Plain text output without any formatting."""
@@ -127,6 +128,7 @@ def __init__(self):
 			error: self.RED,
 			bold: self.BOLD,
 			dim: self.DIM,
+			title: self.BOLD,  # Section headers in help text
 		}
 
 	def print(self, *args):

data/toolbox/print.py

@@ -37,13 +37,12 @@ class RubyObjectPrinter:
 		]
 	)
 
-	def invoke(self, arguments, terminal, from_tty):
-		"""Execute the inspect command.
+	def invoke(self, arguments, terminal):
+		"""Execute the print command.
 		
 		Args:
 			arguments: Parsed Arguments object
-			terminal: Terminal formatter
-			from_tty: True if called from TTY
+			terminal: Terminal formatter (already configured for TTY/non-TTY)
 		"""
 		# Get options
 		max_depth = arguments.get_option('depth', 1)