Switched to only searching for styles.

Author: kmvanbrunt

cmd2/rich_utils.py

@@ -29,20 +29,8 @@
 
 from .styles import DEFAULT_CMD2_STYLES
 
-# A compiled regular expression to detect ANSI escape sequences.
-_ANSI_ESCAPE_SEQUENCE_RE = re.compile(
-    r"""
-    \x1b              # Match the Escape character (ESC)
-    (?:               # Start of non-capturing group for the different sequence types
-        \[[0-9;?]*[a-zA-Z]  # Match a CSI sequence (e.g., \x1b[31m)
-    |                 # OR
-        \].*?(?:\x07|\x1b\x5c)  # Match an OSC sequence (e.g., \x1b]2;Hello\x07)
-    |                 # OR
-        \x37|\x38     # Match DEC cursor save/restore sequences
-    )                 # End of non-capturing group
-""",
-    re.VERBOSE,
-)
+# A compiled regular expression to detect ANSI style sequences.
+ANSI_STYLE_SEQUENCE_RE = re.compile(r"\x1b\[[0-9;?]*m")
 
 
 class AllowStyle(Enum):
@@ -339,7 +327,7 @@ def prepare_objects_for_rendering(*objects: Any) -> tuple[Any, ...]:
     """Prepare a tuple of objects for printing by Rich's Console.print().
 
     This function converts any non-Rich object whose string representation contains
-    ANSI escape sequences into a rich.Text object. This ensures correct display width
+    ANSI style sequences into a rich.Text object. This ensures correct display width
     calculation, as Rich can then properly parse and account for these non-printing
     codes. All other objects are left untouched, allowing Rich's native
     renderers to handle them.
@@ -360,8 +348,8 @@ def prepare_objects_for_rendering(*objects: Any) -> tuple[Any, ...]:
 
         renderable_as_str = str(renderable)
 
-        # Check for any ANSI escape sequences in the string.
-        if _ANSI_ESCAPE_SEQUENCE_RE.search(renderable_as_str):
+        # Check for any ANSI style sequences in the string.
+        if ANSI_STYLE_SEQUENCE_RE.search(renderable_as_str):
             object_list[i] = string_to_rich_text(renderable_as_str)
 
     return tuple(object_list)

cmd2/string_utils.py

@@ -5,16 +5,11 @@
 full-width characters (like those used in CJK languages).
 """
 
-import re
-
 from rich.align import AlignMethod
 from rich.style import StyleType
 
 from . import rich_utils as ru
 
-# A compiled regular expression to detect ANSI style sequences.
-_ANSI_STYLE_SEQUENCE_RE = re.compile(r"\x1b\[[0-9;?]*m")
-
 
 def align(
     val: str,
@@ -107,7 +102,7 @@ def strip_style(val: str) -> str:
     :param val: string to be stripped
     :return: the stripped string
     """
-    return _ANSI_STYLE_SEQUENCE_RE.sub("", val)
+    return ru.ANSI_STYLE_SEQUENCE_RE.sub("", val)
 
 
 def str_width(val: str) -> int:

tests/test_rich_utils.py

@@ -139,23 +139,3 @@ def test_set_theme() -> None:
 
     assert ru.APP_THEME.styles[rich_style_key] != orig_rich_style
     assert ru.APP_THEME.styles[rich_style_key] == theme[rich_style_key]
-
-
-def test_ansi_escape_sequence_re() -> None:
-    import cmd2.terminal_utils as tu
-
-    # Test a CSI sequence
-    cursor_contol = tu.Cursor.UP(1)
-    assert ru._ANSI_ESCAPE_SEQUENCE_RE.search(cursor_contol)
-
-    # Test an OSC sequence
-    set_title = tu.set_title_str("Hello")
-    assert ru._ANSI_ESCAPE_SEQUENCE_RE.search(set_title)
-
-    # Test DEC cursor save
-    cursor_save = "\x1b\x37"
-    assert ru._ANSI_ESCAPE_SEQUENCE_RE.search(cursor_save)
-
-    # Test DEC cursor restore
-    cursor_restore = "\x1b\x38"
-    assert ru._ANSI_ESCAPE_SEQUENCE_RE.search(cursor_restore)