Merge branch 'main' into feat/annotated-argparse

Author: tleonhardt

cmd2/argparse_utils.py

@@ -747,7 +747,7 @@ def __init__(
             usage=usage,
             description=description,  # type: ignore[arg-type]
             epilog=epilog,  # type: ignore[arg-type]
-            parents=parents or [],
+            parents=parents,
             formatter_class=formatter_class,
             prefix_chars=prefix_chars,
             fromfile_prefix_chars=fromfile_prefix_chars,

cmd2/rich_utils.py

@@ -3,7 +3,10 @@
 import argparse
 import re
 import sys
-from collections.abc import Iterator
+from collections.abc import (
+    Iterable,
+    Iterator,
+)
 from enum import Enum
 from typing import (
     IO,
@@ -14,6 +17,7 @@
     runtime_checkable,
 )
 
+from rich.ansi import AnsiDecoder
 from rich.box import SIMPLE_HEAD
 from rich.console import (
     Console,
@@ -672,3 +676,38 @@ def prepare_objects_for_rendering(*objects: Any) -> tuple[Any, ...]:
             object_list[i] = Text.from_ansi(renderable_as_str)
 
     return tuple(object_list)
+
+
+###################################################################################
+# Rich Library Monkey Patches
+#
+# These patches fix specific bugs in the Rich library. They are conditional and
+# will only be applied if the bug is detected. When the bugs are fixed in a
+# future Rich release, these patches and their corresponding tests should be
+# removed.
+###################################################################################
+
+###################################################################################
+# AnsiDecoder.decode() monkey patch
+###################################################################################
+
+
+def _AnsiDecoder_decode(self: AnsiDecoder, terminal_text: str) -> Iterable[Text]:  # noqa: N802
+    """Patch AnsiDecoder.decode() to properly handle CRLF.
+
+    There is currently a pull request on Rich to fix this.
+    https://github.com/Textualize/rich/pull/4143
+    """
+    for line in re.split(r"(?<=\n)", terminal_text):
+        # Strip off any remaining line break characters from the end
+        yield self.decode_line(line.rstrip("\r\n"))
+
+
+def _decode_has_linebreak_bug() -> bool:
+    """Check if AnsiDecoder.decode() properly handles CRLF."""
+    return Text.from_ansi("hello\r\nworld").plain == "\nworld"
+
+
+# Only apply the monkey patch if the bug is present
+if _decode_has_linebreak_bug():
+    AnsiDecoder.decode = _AnsiDecoder_decode  # type: ignore[assignment]

tests/test_rich_utils.py

@@ -317,3 +317,28 @@ def side_effect(color: bool, **kwargs: Any) -> None:
     assert mock_set_color.call_count == 2
     mock_set_color.assert_any_call(True, file=sys.stdout)
     mock_set_color.assert_any_call(True)
+
+
+@pytest.mark.parametrize("line_break", ["\n", "\r\n"])
+def test_ansi_decoder_patch(line_break: str) -> None:
+    # Check if we are still patching AnsiDecoder.decode(). If this check fails, then Rich
+    # has fixed the bug. Therefore, we can remove this test function and ru._AnsiDecoder_decode.
+    from rich.ansi import AnsiDecoder
+
+    assert AnsiDecoder.decode is ru._AnsiDecoder_decode
+
+    assert Text.from_ansi("").plain == ""
+    assert Text.from_ansi(f"{line_break}").plain == "\n"
+    assert Text.from_ansi(f"{line_break}{line_break}").plain == "\n\n"
+    assert Text.from_ansi("Hello").plain == "Hello"
+    assert Text.from_ansi(f"{line_break}Hello").plain == "\nHello"
+    assert Text.from_ansi(f"Hello{line_break}").plain == "Hello\n"
+    assert Text.from_ansi(f"Hello{line_break}{line_break}").plain == "Hello\n\n"
+    assert Text.from_ansi(f"Hello{line_break}World").plain == "Hello\nWorld"
+    assert Text.from_ansi(f"Hello{line_break}{line_break}World").plain == "Hello\n\nWorld"
+    assert Text.from_ansi(f"Hello{line_break}World{line_break}").plain == "Hello\nWorld\n"
+    assert Text.from_ansi(f"Hello{line_break}World{line_break}{line_break}").plain == "Hello\nWorld\n\n"
+    assert Text.from_ansi(f"{line_break}Hello{line_break}World{line_break}{line_break}").plain == "\nHello\nWorld\n\n"
+
+    # Include a mixture of line break types
+    assert Text.from_ansi(f"Hello{line_break}\n\r\nWorld").plain == "Hello\n\n\nWorld"