Fix some of the funky terminal highight problems..

more remain. Doc asmft

Author: rocky

docs/commands/data/disassemble.rst

@@ -24,6 +24,10 @@ in addition you can also use:
 With a class, method, function, pyc-file, code or string argument
 disassemble that.
 
+Assembly output format is be controlled by the setting of ``set
+asmfmt``. Output formats are those described the ``xdis`` ``pydisasm``
+disassembler.
+
 Examples
 ++++++++
 
@@ -43,4 +47,6 @@ Examples
 
 .. seealso::
 
- :ref:`help syntax arange <syntax_arange>` for the specification of a address range :ref:`deparse <deparse>`, :ref:`list <list>`, :ref:`info pc <info_pc>`
+ :ref:`help syntax arange <syntax_arange>` for the specification of an
+  address range :ref:`deparse <deparse>`, :ref:`list <list>`,
+ :ref:`info pc <info_pc>`, and :ref:`set asmfmt <set_asmfmt>`.

trepan/lib/bytecode.py

@@ -56,7 +56,7 @@ def next_opcode(code, offset):
     pass
 
 
-def next_linestart(co, offset, count=1):
+def next_linestart(co, offset: int, count=1) -> int:
     code = co.co_code
 
     linestarts = dict(opcode_module.findlinestarts(co))

trepan/lib/default.py

@@ -81,7 +81,7 @@
     #  'plain'   : no highlighting
     #  'dark'    : terminal highlighting for a dark background
     #  'light'   : terminal highlighting for a light background
-    "highlight": is_dark_background(),
+    "highlight": "dark" if is_dark_background() else "light",
     # Where do we save the history?
     "histfile": None,
     # Save debugger history?

trepan/lib/format.py

@@ -37,17 +37,47 @@
     Operator,
     String,
     Token,
+    Text
 )
-from pygments.util import get_choice_opt
+from trepan.lib.default import DEBUGGER_SETTINGS
 
 # Set up my own color scheme with some additional definitions.
 color_scheme = TERMINAL_COLORS.copy()
+# color_scheme = {
+#     Token:              ('',            ''),
+#     Comment:            ('gray',   'brightblack'),
+#     Comment.Preproc:    ('cyan',        'brightcyan'),
+#     Keyword:            ('blue',    'brightblue'),
+#     Keyword.Type:       ('cyan',        'brightcyan'),
+#     Operator.Word:      ('magenta',      'brightmagenta'),
+#     Name.Builtin:       ('cyan',        'brightcyan'),
+#     Name.Function:      ('green',   'brightgreen'),
+#     Name.Namespace:     ('_cyan_',      '_brightcyan_'),
+#     Name.Class:         ('_green_', '_brightgreen_'),
+#     Name.Exception:     ('cyan',        'brightcyan'),
+#     Name.Decorator:     ('brightblack',    'gray'),
+#     Name.Variable:      ('red',     'brightred'),
+#     Name.Constant:      ('red',     'brightred'),
+#     Name.Attribute:     ('cyan',        'brightcyan'),
+#     Name.Tag:           ('brightblue',        'brightblue'),
+#     String:             ('gray',       'yellow'),
+#     Number:             ('blue',    'brightblue'),
+#     Generic.Deleted:    ('brightred',        'brightred'),
+#     Generic.Inserted:   ('green',  'brightgreen'),
+#     Generic.Heading:    ('**',         '**'),
+#     Generic.Subheading: ('*magenta*',   '*brightmagenta*'),
+#     Generic.Prompt:     ('**',         '**'),
+#     Generic.Error:      ('brightred',        'brightred'),
+# }
+
+
+
 color_scheme[Generic.Strong] = ("*black*", "*white*")
 color_scheme[Name.Variable] = ("_black_", "_white_")
 
 color_scheme[Generic.Strong] = ("*black*", "*white*")
 color_scheme[Name.Variable] = ("_black_", "_white_")
-color_scheme[Generic.Emph] = color_scheme[Comment.Preproc]
+color_scheme[Generic.Emph] = ("blue", "brightcyan")
 
 # Assume pygments has fixed up the horrible atom colors
 # FIXME: change some horrible colors under atom dark
@@ -65,11 +95,10 @@
 def format_token(ttype, token, colorscheme=color_scheme, highlight="light"):
     if "plain" == highlight:
         return token
-    dark_bg = "dark" == highlight
-
+    is_dark_bg = 1 if DEBUGGER_SETTINGS["highlight"] == "dark" else 0
     color = colorscheme.get(ttype)
     if color:
-        color = color[dark_bg]
+        color = color[is_dark_bg]
         if isinstance(token, tuple):
             # have (token, start offset)
             token = token[0]
@@ -166,9 +195,7 @@ class RSTTerminalFormatter(Formatter):
 
     def __init__(self, **options):
         Formatter.__init__(self, **options)
-        self.darkbg = (
-            get_choice_opt(options, "bg", ["light", "dark"], "light") != "dark"
-        )
+        self.is_dark_bg = 1 if DEBUGGER_SETTINGS["highlight"] == "dark" else 0
         self.colorscheme = options.get("colorscheme", None) or color_scheme
         self.width = options.get("width", 80)
         self.verbatim = False
@@ -203,7 +230,7 @@ def write_verbatim(self, text):
         # color
         if self.__class__ != MonoRSTTerminalFormatter:
             cs = self.colorscheme.get(Verbatim)
-            color = cs[self.darkbg]
+            color = cs[self.is_dark_bg]
         else:
             color = None
             pass
@@ -226,7 +253,7 @@ def reflow_text(self, text, ttype, color):
         # print '%r' % text
         # from trepan.api import debug
         # if u' or ' == text: debug()
-        if text == "::" and ttype == Token.Literal.String.Escape:
+        if text == "::" and ttype == Token.Literal.String:
             self.verbatim = "colon-verbatim"
             return
         elif (
@@ -318,7 +345,7 @@ def format_unencoded(self, tokensource, outfile):
                 color = self.colorscheme.get(resolved_type)
                 pass
             if color:
-                color = color[self.darkbg]
+                color = color[self.is_dark_bg]
             self.reflow_text(text, ttype, color)
             pass
         return

trepan/processor/command/disassemble.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2009, 2012-2018, 2020, 2023 Rocky Bernstein
+#  Copyright (C) 2009, 2012-2018, 2020, 2023-2024 Rocky Bernstein
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -89,6 +89,11 @@ class DisassembleCommand(DebuggerCommand):
     With a class, method, function, pyc-file, code or string argument
     disassemble that.
 
+    Assembly output format is be controlled by the setting of `set
+    asmfmt`. Output formats are those described the `xdis` `pydisasm`
+    disassembler.
+
+
     Examples:
     --------
     ::
@@ -105,7 +110,9 @@ class DisassembleCommand(DebuggerCommand):
     See also:
     ---------
 
-    `help syntax arange`, `deparse`, `list`, `info pc`."""
+    `help syntax arange`, `deparse`, `list`, `info pc`, `set asmfmt`.
+
+    """
 
     aliases = ("disasm",)  # Note: we will have disable
     short_help = "Disassemble Python bytecode"