Add functions for formatting code and frame

Author: rocky

trepan/lib/format.py

@@ -27,7 +27,7 @@
 from pygments.formatter import Formatter
 from pygments.formatters import Terminal256Formatter, TerminalFormatter
 from pygments.formatters.terminal import TERMINAL_COLORS
-from pygments.lexers import RstLexer
+from pygments.lexers import PythonLexer, RstLexer
 from pygments.token import (
     Comment,
     Generic,
@@ -397,8 +397,18 @@ def format_unencoded(self, tokensource, outfile):
 rst_lex.add_filter(rst_filt)
 color_tf = RSTTerminalFormatter(colorscheme=color_scheme)
 mono_tf = MonoRSTTerminalFormatter()
+python_lexer = PythonLexer()
 
 
+def format_python(python_str: str, style) -> str:
+    """Add terminial formatting for a Python string
+    ``python_str``, using pygments style ``style``.
+    """
+    if style is None:
+        return python_str
+    terminal_formatter = Terminal256Formatter(style=style)
+    return highlight(python_str, python_lexer, terminal_formatter)
+
 def rst_text(text, mono, width=80):
     if mono:
         tf = mono_tf

trepan/lib/stack.py

@@ -37,6 +37,7 @@
     Function,
     LineNumber,
     Return,
+    format_python,
     format_token,
 )
 from trepan.lib.pp import pp
@@ -156,14 +157,16 @@ def format_function_and_parameters(frame, debugger, style: str) -> Tuple[bool, s
         is_module = False
         try:
             params = inspect.formatargvalues(args, varargs, varkw, local_vars)
+            formatted_params = format_python(params, style=style)
         except Exception:
             pass
         else:
             maxargstrsize = debugger.settings["maxargstrsize"]
             if len(params) >= maxargstrsize:
                 params = f"{params[0:maxargstrsize]}...)"
+                formatted_params = format_python(params, style=style)
                 pass
-            s += params
+            s += formatted_params
         pass
 
     return is_module, s

trepan/processor/command/info_subcmd/frame.py

@@ -21,6 +21,7 @@
 from trepan.lib.complete import complete_token
 from trepan.lib.stack import format_function_name
 from trepan.processor import frame as Mframe
+from trepan.processor.print import format_code, format_frame
 
 # Our local modules
 from trepan.processor.command import base_subcmd as Mbase_subcmd
@@ -137,12 +138,12 @@ def run(self, args):
         if line_text is None:
             self.msg(f"  current line number: {frame.f_lineno}")
         else:
-            formatted_text = highlight_string(line_text.strip())
+            formatted_text = highlight_string(line_text.strip(), style=style)
             self.msg(f"  current line number: {frame.f_lineno}: {formatted_text}")
 
         self.msg(f"  last instruction: {frame.f_lasti}")
-        self.msg(f"  code: {code}")
-        self.msg(f"  previous frame: {frame.f_back}")
+        self.msg(f"  code: {format_code(code, style)}")
+        self.msg(f"  previous frame: {format_frame(frame.f_back, style)}")
         self.msg(f"  tracing function: {frame.f_trace}")
 
         if is_verbose:

trepan/processor/print.py

@@ -21,13 +21,22 @@
 import sys
 from inspect import ismodule
 from tempfile import NamedTemporaryFile
+from types import CodeType
 
 import pyficache
 
 from trepan.lib.stack import check_path_with_frame, frame2file
 from trepan.processor import cmdfns
 from trepan.processor.cmdfns import deparse_fn
 
+from trepan.lib.format import (  # Opcode,
+    Filename,
+    Hex,
+    LineNumber,
+    Symbol,
+    format_token,
+)
+
 try:
     from trepan.lib.deparse import deparse_and_cache
 
@@ -39,6 +48,35 @@
 warned_file_mismatches = set()
 
 
+def format_code(code_object: CodeType, style) -> str:
+    """
+    Format according to "style" a Python code object. The
+    formatted string is returned.
+    """
+    formatted_line = format_token(LineNumber, str(code_object.co_firstlineno), style=style)
+    formatted_id = format_token(Hex, hex(id(code_object)), style=style)
+    formatted_name = format_token(Symbol, code_object.co_name, style=style)
+    formatted_filename = format_token(Filename, code_object.co_filename, style=style)
+    return (
+        f"<code object {formatted_name} at {formatted_id} "
+        f"file {formatted_filename}, line {formatted_line}"
+    )
+
+
+def format_frame(frame_object, style) -> str:
+    """
+    Format according to "style" a Python frame object. The
+    formatted string is returned.
+    """
+    formatted_line = format_token(LineNumber, str(frame_object.f_lineno), style=style)
+    formatted_id = format_token(Hex, hex(id(frame_object)), style=style)
+    formatted_filename = format_token(Filename, frame_object.f_code.co_filename, style=style)
+    return (
+        f"<frame at {formatted_id} "
+        f"file {formatted_filename}, line {formatted_line}"
+    )
+
+
 def print_source_line(msg, lineno, line, event_str=None):
     """Print out a source line of text , e.g. the second
     line in: