Change rich_to_pt_style to take a StyleType instead of Style

where StyleType = Style | str

Author: tleonhardt

cmd2/cmd2.py

@@ -526,7 +526,7 @@ def __init__(
 
         # Cache for prompt_toolkit completion menu styles
         self._cached_pt_style: PtStyle | None = None
-        self._cached_pt_style_params: tuple[Style | None, Style | None] | None = None
+        self._cached_pt_style_params: tuple[StyleType, StyleType] | None = None
 
         # Create the main PromptSession
         self.bottom_toolbar = bottom_toolbar
@@ -724,8 +724,8 @@ def _should_continue_multiline(self) -> bool:
     def _get_pt_style(self) -> "PtStyle":
         """Return the prompt_toolkit style for the completion menu."""
         theme = ru.get_theme()
-        rich_item_style = theme.styles.get(Cmd2Style.COMPLETION_MENU_ITEM)
-        rich_meta_style = theme.styles.get(Cmd2Style.COMPLETION_MENU_META)
+        rich_item_style = theme.styles.get(Cmd2Style.COMPLETION_MENU_ITEM, "")
+        rich_meta_style = theme.styles.get(Cmd2Style.COMPLETION_MENU_META, "")
 
         current_params = (rich_item_style, rich_meta_style)
         if self._cached_pt_style is not None and self._cached_pt_style_params == current_params:

cmd2/pt_utils.py

@@ -20,7 +20,7 @@
 from prompt_toolkit.formatted_text import ANSI
 from prompt_toolkit.history import History
 from prompt_toolkit.lexers import Lexer
-from rich.style import Style
+from rich.style import Style, StyleType
 
 from . import (
     constants,
@@ -88,10 +88,14 @@ def rich_to_pt_color(color: "Color | None") -> str:
     return f"#{c.red:02x}{c.green:02x}{c.blue:02x}"
 
 
-def rich_to_pt_style(rich_style: Style | None) -> str:
+def rich_to_pt_style(rich_style: StyleType) -> str:
     """Convert a rich Style object to a prompt_toolkit style string."""
     if not rich_style:
         return ""
+
+    if isinstance(rich_style, str):
+        rich_style = Style.parse(rich_style)
+
     parts = ["noreverse"]
 
     fg_color = rich_to_pt_color(rich_style.color)