Improve string highighting in various fields

Author: rocky

test/unit/processor/command/test_cmd_info_files.py

@@ -44,15 +44,15 @@ def test_info_files():
 
     assert len(cmdhelper.msgs) == 2
     assert cmdhelper.msgs[0].index("is not cached in debugger") > 0
-    assert cmdhelper.msgs[1].startswith("Canonic name:")
+    assert cmdhelper.msgs[1].startswith("Canonic name is the same as")
 
     # Run again. File should now be cached.
 
     reset_output()
     sub.run([])
     assert len(cmdhelper.msgs) == 2
     assert cmdhelper.msgs[0].index("is cached in debugger") > 0
-    assert cmdhelper.msgs[1].startswith("Canonic name:")
+    assert cmdhelper.msgs[1].startswith("Canonic name is the same as")
     assert "width" in sub.settings
 
     # Test all sub options with different line-widths settings

trepan/processor/command/info_subcmd/files.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#   Copyright (C) 2008-2009, 2012-2013, 2015, 2023-2024 Rocky Bernstein
+#   Copyright (C) 2008-2009, 2012-2013, 2015, 2023-2024, 2026 Rocky Bernstein
 #   <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -21,11 +21,10 @@
 import columnize
 import pyficache
 
-from trepan import misc as Mmisc
 from trepan.lib.complete import complete_token
 from trepan.lib.file import file_list
-
-# Our local modules
+from trepan.lib.format import Filename, format_token
+from trepan.misc import wrapped_lines
 from trepan.processor.command.base_subcmd import DebuggerSubcommand
 
 
@@ -34,12 +33,10 @@ class InfoFiles(DebuggerSubcommand):
     need_stack = False
     short_help = "Show information about an imported or loaded Python file"
 
-
     def complete(self, prefix):
         completions = sorted(["."] + file_list())
         return complete_token(completions, prefix)
 
-
     def run(self, args):
         """**info files** [*filename* [**all** | **brkpts** | **sha1** | **size**]]
 
@@ -67,13 +64,14 @@ def run(self, args):
             filename = args[0]
             pass
 
-        m = filename + " is"
+        style = self.settings["style"]
+        m = f"{format_token(Filename, filename, style=style)} is"
         filename_cache = self.core.filename_cache
         if filename in filename_cache:
             m += " cached in debugger"
             if filename_cache[filename] != filename:
                 m += " as:"
-                m = Mmisc.wrapped_lines(
+                m = wrapped_lines(
                     m, filename_cache[filename] + ".", self.settings["width"]
                 )
             else:
@@ -95,9 +93,16 @@ def run(self, args):
                 self.msg(m + " not cached in debugger.")
             pass
         canonic_name = self.core.canonic(filename)
-        self.msg(
-            Mmisc.wrapped_lines("Canonic name:", canonic_name, self.settings["width"])
-        )
+        if canonic_name == filename:
+            self.msg("Canonic name is the same as the filename.")
+        else:
+            self.msg(
+                wrapped_lines(
+                    "Canonic name:",
+                    format_token(Filename, canonic_name, style=style),
+                    self.settings["width"],
+                )
+            )
         for name in (canonic_name, filename):
             if name in sys.modules:
                 for key in [k for k, v in list(sys.modules.items()) if name == v]:

trepan/processor/command/info_subcmd/frame.py

@@ -20,7 +20,7 @@
 
 from trepan.lib.complete import complete_token
 from trepan.lib.disassemble import PYTHON_OPCODES as python_opcodes
-from trepan.lib.format import Function, Keyword, format_token
+from trepan.lib.format import Function, Keyword, LineNumber, format_token
 from trepan.lib.stack import (
     format_function_name,
     get_column_start_from_frame,
@@ -152,11 +152,12 @@ def run(self, args):
         file_path = code.co_filename
 
         line_text = getline(file_path, line_number, {"style": style})
+        formatted_line_number = format_token(LineNumber, str(frame.f_lineno), style=style)
         if line_text is None:
-            self.msg(f"  current line number: {frame.f_lineno}")
+            self.msg(f"  current line number: {formatted_line_number}")
         else:
             formatted_text = highlight_string(line_text.strip(), style=style)
-            self.msg_nocr(f"  current line number: {frame.f_lineno}: {formatted_text}")
+            self.msg_nocr(f"  current line number: {formatted_line_number}: {formatted_text}")
 
         start_column = get_column_start_from_frame(frame)
         if start_column >= 0:

trepan/processor/command/info_subcmd/line.py

@@ -15,14 +15,15 @@
 #
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import columnize
 import inspect
 import os.path as osp
 import re
 
+import columnize
 from pyficache import get_linecache_info
 
 from trepan.clifns import search_file
+from trepan.lib.format import Filename, LineNumber, format_token
 from trepan.misc import wrapped_lines
 from trepan.processor.cmdbreak import parse_break_cmd
 
@@ -119,22 +120,35 @@ def run(self, args):
         linecache_info = get_linecache_info(filename)
         if line_number not in linecache_info.line_numbers:
             self.errmsg(
-                "No line information for line %d of %s"
-                % (line_number, filename)
+                "No line information for line %d of %s" % (line_number, filename)
             )
             return
-        msg1 = 'Line %d of "%s"' % (line_number, self.core.filename(filename),)
+
+        style = self.settings["style"]
+        formatted_filename = format_token(
+            Filename,
+            format_token(Filename, self.core.filename(filename), style=style),
+            style=style,
+        )
+        formatted_line_number = format_token(LineNumber, str(line_number), style=style)
+        msg1 = "Line %s of %s" % (formatted_line_number, formatted_filename)
         line_info = linecache_info.line_info
         line_number_offsets = line_info.get(line_number)
         if line_number_offsets:
-            offset_data = [f"{code.co_name}:*{offset}" for code, offset in line_number_offsets]
+            offset_data = [
+                f"{code.co_name}:*{offset}" for code, offset in line_number_offsets
+            ]
             if len(offset_data) == 1:
                 msg2 = f"is at bytecode offset {offset_data[0]}"
                 self.msg(wrapped_lines(msg1, msg2, self.settings["width"]))
             else:
                 msg2 = "is at bytecode offsets:"
                 self.msg(wrapped_lines(msg1, msg2, self.settings["width"]))
-                self.msg(columnize.columnize(offset_data, colsep=", ", ljust=False, lineprefix="  "))
+                self.msg(
+                    columnize.columnize(
+                        offset_data, colsep=", ", ljust=False, lineprefix="  "
+                    )
+                )
         else:
             self.errmsg(
                 "No line information for line %d of %s"