Improve pyasm listing...

fix bug in going into Python when terminal handling does not allow.

Author: rocky

trepan/processor/command/list.py

@@ -152,6 +152,8 @@ def run(self, args):
             "output": self.settings["highlight"],
             "strip_nl": False,
         }
+        style = self.settings.get("style", "plain")
+        is_plain = style in ("plain", "none")
 
         for field in ("highlight", "style"):
             if field in self.settings:
@@ -161,17 +163,28 @@ def run(self, args):
             if is_pyasm:
                 lineno = first
                 opts["strip_nl"] = True
+                opts["style"] = "plain"
 
                 # FIXME add approximate
-                line, pyasm_line_index = pyficache.get_pyasm_line(filename, lineno, is_source_line=True, opts=opts)
+                line, pyasm_line_index = pyficache.get_pyasm_line(
+                    filename, lineno, is_source_line=True, opts=opts
+                )
                 proc.list_lineno = lineno
                 if line is None:
                     self.errmsg(f"cannot find assembly for line number {lineno}")
                     return
                 while lineno <= last:
+                    if not is_plain:
+                        line = pyficache.highlight_string(
+                                line, lexer=pyficache.pyasm_lexer, style=style
+                            )
+                        if line.endswith("\n"):
+                            line = line[:-1]
                     self.msg(line)
                     pyasm_line_index += 1
-                    line, pyasm_line_index = pyficache.get_pyasm_line(filename, pyasm_line_index, is_source_line=False, opts=opts)
+                    line, pyasm_line_index = pyficache.get_pyasm_line(
+                        filename, pyasm_line_index, is_source_line=False, opts=opts
+                    )
                     if line is None:
                         break
             else:
@@ -246,7 +259,7 @@ def doit(cmd, args):
     # doit(lcmd, ['list', "python3-trepan/test/example/00_chained-compare-cpython-314.pyasm:3"])
 
     # Note: osp is defined above
-    doit(lcmd, ['list', "osp:1"])
+    doit(lcmd, ["list", "osp:1"])
     # print('--' * 10)
 
     print("--" * 10)

trepan/processor/command/python.py

@@ -199,7 +199,6 @@ def console_runcode(code_obj):
     if use_pyrepl:
         if not pyrepl_console:
             pyrepl_console = InteractiveColoredConsole(my_locals, filename="<trepan>")
-
             pyrepl_console.runcode = console_runcode
             setattr(pyrepl_console, "globals", my_globals)
             if readfunc is not None:
@@ -213,9 +212,9 @@ def console_runcode(code_obj):
             errmsg_func(
                 "Colored PyREPL can't be used here; using standard Python shell"
             )
-
-        msg_func(banner)
-        run_multiline_interactive_console(pyrepl_console)
+        else:
+            msg_func(banner)
+            run_multiline_interactive_console(pyrepl_console)
 
     # Fancy color pyrepl console can't be used, so use InteractiveConsole.
     if not pyrepl_console:

trepan/processor/print.py

@@ -307,6 +307,13 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
             if remapped_line_number >= 0:
                 # FIXME: +1 is because getlines is 0 origin.
                 remapped_line_number += 1
+            if line is not None and opts["style"] not in ("plain", "none"):
+                line = pyficache.highlight_string(
+                        line, lexer=pyficache.pyasm_lexer, style=opts["style"]
+                    )
+                if line.endswith("\n"):
+                    line = line[:-1]
+
         else:
             remapped_line_number = -1  # -1 means no remapping
             line = pyficache.getline(filename, line_number, opts)