euporie 2.3.2__py3-none-any.whl → 2.4.1__py3-none-any.whl

euporie/core/formatted_text/markdown.py

@@ -1,176 +1,187 @@
 """Contain the browser CSS for formatting markdown."""
 
+from prompt_toolkit.filters.utils import _always
+
 from .html import CssSelector
 
 _MARKDOWN_CSS = {
-    (
-        (CssSelector(item="h1"),),
-        (CssSelector(item="h2"),),
-        (CssSelector(item="h3"),),
-        (CssSelector(item="h4"),),
-        (CssSelector(item="h5"),),
-        (CssSelector(item="h6"),),
-    ): {
-        "text_align": "center",
-    },
-    ((CssSelector(item="h1"),),): {
-        "font_weight": "bold",
-        "text_decoration": "underline",
-        "border_top_style": "double",
-        "border_right_style": "double",
-        "border_bottom_style": "double",
-        "border_left_style": "double",
-        "border_top_width": "0.34em",
-        "border_right_width": "0.34em",
-        "border_bottom_width": "0.34em",
-        "border_left_width": "0.34em",
-        "border_top_color": "ansiyellow",
-        "border_right_color": "ansiyellow",
-        "border_bottom_color": "ansiyellow",
-        "border_left_color": "ansiyellow",
-    },
-    ((CssSelector(item="h2"),),): {
-        "font_weight": "bold",
-        "border_top_style": "solid",
-        "border_right_style": "solid",
-        "border_bottom_style": "solid",
-        "border_left_style": "solid",
-        "border_top_width": "0.34em",
-        "border_right_width": "0.34em",
-        "border_bottom_width": "0.34em",
-        "border_left_width": "0.34em",
-        "border_top_color": "#888888",
-        "border_right_color": "#888888",
-        "border_bottom_color": "#888888",
-        "border_left_color": "#888888",
-    },
-    ((CssSelector(item="h3"),),): {
-        "font_weight": "bold",
-        "font_style": "italic",
-        "border_top_style": "solid",
-        "border_right_style": "solid",
-        "border_bottom_style": "solid",
-        "border_left_style": "solid",
-        "border_top_width": "0.1em",
-        "border_right_width": "0.1em",
-        "border_bottom_width": "0.1em",
-        "border_left_width": "0.1em",
-        "border_top_color": "#888888",
-        "border_right_color": "#888888",
-        "border_bottom_color": "#888888",
-        "border_left_color": "#888888",
-        "margin_left": "auto",
-        "margin_right": "auto",
-        "padding_left": "1em",
-        "padding_right": "1em",
-    },
-    ((CssSelector(item="h4"),),): {
-        "text_weight": "bold",
-        "text_decoration": "underline",
-        "margin_top": "1rem",
-        "margin_bottom": "1rem",
-    },
-    ((CssSelector(item="h5"),),): {
-        "font_weight": "bold",
-        "margin_top": "1rem",
-        "margin_bottom": "1rem",
-    },
-    ((CssSelector(item="h6"),),): {
-        "font_style": "italic",
-        "margin_top": "1rem",
-        "margin_bottom": "1rem",
-    },
-    (
+    _always: {
+        (
+            (CssSelector(item="h1"),),
+            (CssSelector(item="h2"),),
+            (CssSelector(item="h3"),),
+            (CssSelector(item="h4"),),
+            (CssSelector(item="h5"),),
+            (CssSelector(item="h6"),),
+        ): {
+            "text_align": "center",
+        },
+        ((CssSelector(item="h1"),),): {
+            "font_weight": "bold",
+            "text_decoration": "underline",
+            "border_top_style": "double",
+            "border_right_style": "double",
+            "border_bottom_style": "double",
+            "border_left_style": "double",
+            "border_top_width": "0.34em",
+            "border_right_width": "0.34em",
+            "border_bottom_width": "0.34em",
+            "border_left_width": "0.34em",
+            "border_top_color": "ansiyellow",
+            "border_right_color": "ansiyellow",
+            "border_bottom_color": "ansiyellow",
+            "border_left_color": "ansiyellow",
+            "padding_bottom": "0",
+        },
+        ((CssSelector(item="h2"),),): {
+            "font_weight": "bold",
+            "border_top_style": "solid",
+            "border_right_style": "solid",
+            "border_bottom_style": "solid",
+            "border_left_style": "solid",
+            "border_top_width": "0.34em",
+            "border_right_width": "0.34em",
+            "border_bottom_width": "0.34em",
+            "border_left_width": "0.34em",
+            "border_top_color": "#888888",
+            "border_right_color": "#888888",
+            "border_bottom_color": "#888888",
+            "border_left_color": "#888888",
+            "padding_bottom": "0",
+        },
+        ((CssSelector(item="h3"),),): {
+            "font_weight": "bold",
+            "font_style": "italic",
+            "border_top_style": "solid",
+            "border_right_style": "solid",
+            "border_bottom_style": "solid",
+            "border_left_style": "solid",
+            "border_top_width": "0.1em",
+            "border_right_width": "0.1em",
+            "border_bottom_width": "0.1em",
+            "border_left_width": "0.1em",
+            "border_top_color": "#888888",
+            "border_right_color": "#888888",
+            "border_bottom_color": "#888888",
+            "border_left_color": "#888888",
+            "margin_left": "auto",
+            "margin_right": "auto",
+            "padding_top": "0",
+            "padding_right": "1em",
+            "padding_bottom": "0",
+            "padding_left": "1em",
+        },
+        ((CssSelector(item="h4"),),): {
+            "text_weight": "bold",
+            "text_decoration": "underline",
+            "border_bottom_color": "#888888",
+            "margin_top": "1rem",
+            "margin_bottom": "1rem",
+        },
+        ((CssSelector(item="h5"),),): {
+            "font_weight": "bold",
+            "border_bottom_color": "#888888",
+            "margin_top": "1rem",
+            "margin_bottom": "1rem",
+        },
+        ((CssSelector(item="h6"),),): {
+            "font_style": "italic",
+            "border_bottom_color": "#888888",
+            "margin_top": "1rem",
+            "margin_bottom": "1rem",
+        },
         (
-            CssSelector(item="ol"),
-            CssSelector(item="li"),
-            CssSelector(item="::marker"),
-        ),
-    ): {"color": "ansicyan"},
-    (
+            (
+                CssSelector(item="ol"),
+                CssSelector(item="li"),
+                CssSelector(item="::marker"),
+            ),
+        ): {"color": "ansicyan"},
         (
-            CssSelector(item="ul"),
-            CssSelector(item="li"),
-            CssSelector(item="::marker"),
-        ),
-    ): {"color": "ansiyellow"},
-    ((CssSelector(item="blockquote"),),): {
-        "margin_top": "1em",
-        "margin_bottom": "1em",
-        "padding_left": "1em",
-        "border_left_width": "thick",
-        "border_left_style": "solid",
-        "border_left_color": "darkmagenta",
-    },
-    ((CssSelector(item=".block"),),): {"display": "block"},
-    ((CssSelector(item="td"),),): {
-        "display": "table-cell",
-        "border_top_style": "solid",
-        "border_right_style": "solid",
-        "border_bottom_style": "solid",
-        "border_left_style": "solid",
-        "border_top_width": "0.1em",
-        "border_right_width": "0.1em",
-        "border_bottom_width": "0.1em",
-        "border_left_width": "0.1em",
-        "padding_left": "1em",
-        "padding_right": "1em",
-        # "_pt_class": "markdown,table,border",
-    },
-    ((CssSelector(item="th"),),): {
-        "display": "table-cell",
-        "border_top_style": "solid",
-        "border_right_style": "solid",
-        "border_bottom_style": "solid",
-        "border_left_style": "solid",
-        "border_top_width": "0.34em",
-        "border_right_width": "0.34em",
-        "border_bottom_width": "0.34em",
-        "border_left_width": "0.34em",
-        "padding_left": "1em",
-        "padding_right": "1em",
-        "font_weight": "bold",
-        # "_pt_class": "markdown,table,border",
-    },
-    ((CssSelector(item="code"),),): {
-        "display": "inline",
-        "_pt_class": "markdown,code",
-    },
-    ((CssSelector(item=".math"),),): {"text_transform": "latex"},
-    ((CssSelector(item=".block"),),): {"display": "block"},
-    ((CssSelector(item=".math.block"),),): {
-        "text_align": "center",
-    },
-    (
+            (
+                CssSelector(item="ul"),
+                CssSelector(item="li"),
+                CssSelector(item="::marker"),
+            ),
+        ): {"color": "ansiyellow"},
+        ((CssSelector(item="blockquote"),),): {
+            "margin_top": "1em",
+            "margin_bottom": "1em",
+            "padding_left": "1em",
+            "border_left_width": "thick",
+            "border_left_style": "solid",
+            "border_left_color": "darkmagenta",
+        },
+        ((CssSelector(item=".block"),),): {"display": "block"},
+        ((CssSelector(item="td"),),): {
+            "display": "table-cell",
+            "border_top_style": "solid",
+            "border_right_style": "solid",
+            "border_bottom_style": "solid",
+            "border_left_style": "solid",
+            "border_top_width": "0.1em",
+            "border_right_width": "0.1em",
+            "border_bottom_width": "0.1em",
+            "border_left_width": "0.1em",
+            "padding_left": "1em",
+            "padding_right": "1em",
+            # "_pt_class": "markdown,table,border",
+        },
+        ((CssSelector(item="th"),),): {
+            "display": "table-cell",
+            "border_top_style": "solid",
+            "border_right_style": "solid",
+            "border_bottom_style": "solid",
+            "border_left_style": "solid",
+            "border_top_width": "0.34em",
+            "border_right_width": "0.34em",
+            "border_bottom_width": "0.34em",
+            "border_left_width": "0.34em",
+            "padding_left": "1em",
+            "padding_right": "1em",
+            "font_weight": "bold",
+            # "_pt_class": "markdown,table,border",
+        },
+        ((CssSelector(item="code"),),): {
+            "display": "inline",
+            "_pt_class": "markdown,code",
+        },
+        ((CssSelector(item=".math"),),): {"text_transform": "latex"},
+        ((CssSelector(item=".block"),),): {"display": "block"},
+        ((CssSelector(item=".math.block"),),): {
+            "text_align": "center",
+        },
         (
-            CssSelector(item="pre"),
-            CssSelector(comb=">", item="code"),
-        ),
-    ): {
-        "display": "block",
-        "border_top_style": "solid",
-        "border_top_width": "1px",
-        "border_right_style": "solid",
-        "border_right_width": "1px",
-        "border_bottom_style": "solid",
-        "border_bottom_width": "1px",
-        "border_left_style": "solid",
-        "border_left_width": "1px",
-        "_pt_class": "markdown,code,block",
-    },
-    (
+            (
+                CssSelector(item="pre"),
+                CssSelector(comb=">", item="code"),
+            ),
+        ): {
+            "display": "block",
+            "border_top_style": "solid",
+            "border_top_width": "1px",
+            "border_right_style": "solid",
+            "border_right_width": "1px",
+            "border_bottom_style": "solid",
+            "border_bottom_width": "1px",
+            "border_left_style": "solid",
+            "border_left_width": "1px",
+            "_pt_class": "markdown,code,block",
+        },
         (
-            CssSelector(item="pre"),
-            CssSelector(comb=">", item="code"),
-            CssSelector(item="*"),
-        ),
-    ): {
-        "pt_class": "markdown,code,block",
-    },
-    ((CssSelector(item="img"),), (CssSelector(item="svg"),)): {
-        "display": "inline-block",
-        "overflow_x": "hidden",
-        "overflow_y": "hidden",
-        "vertical_align": "middle",
-    },
+            (
+                CssSelector(item="pre"),
+                CssSelector(comb=">", item="code"),
+                CssSelector(item="*"),
+            ),
+        ): {
+            "pt_class": "markdown,code,block",
+        },
+        ((CssSelector(item="img"),), (CssSelector(item="svg"),)): {
+            "display": "inline-block",
+            "overflow_x": "hidden",
+            "overflow_y": "hidden",
+            "vertical_align": "middle",
+        },
+    }
 }

euporie/core/formatted_text/table.py

@@ -231,7 +231,7 @@ class DummyCell(Cell):
 
 
 class RowCol:
-    """Bae class for table rows and columns."""
+    """Base class for table rows and columns."""
 
     type_: str
     span_type: str
@@ -513,6 +513,9 @@ def compute_border_width(cell: Cell, render_count: int = 0) -> DiInt:
     if isinstance(cell, DummyCell):
         return DiInt(0, 0, 0, 0)
 
+    if isinstance(cell, SpacerCell):
+        cell = cell.expands
+
     output = {"top": 1, "right": 1, "bottom": 1, "left": 1}
 
     row = cell.row
@@ -668,12 +671,12 @@ def calculate_col_widths(
             expand(width.preferred)
         elif current_width > width.preferred:
             contract(width.preferred)
-    elif width.max_specified:
+    if width.max_specified:
         if current_width > width.max:
             contract(width.max)
         if current_width < width.max and expand_to_width:
             expand(width.max)
-    elif width.min_specified and current_width < width.min:
+    if width.min_specified and current_width < width.min:
         expand(width.min)
 
     return col_widths
@@ -738,15 +741,17 @@ def compute_lines(
         align(
             wrap(
                 [
-                    ("", "\n" * (padding.top or 0)),
+                    *([("", "\n" * padding.top)] if padding.top else []),
                     *compute_text(cell, render_count),
-                    ("", "\n" * (padding.bottom or 0)),
+                    *([("", "\n" * padding.bottom)] if padding.bottom else []),
                 ],
                 width=width,
+                placeholder="",
             ),
             compute_align(cell, render_count),
             width=width,
             style=compute_style(cell, render_count),
+            placeholder="",
         )
     )
 
@@ -960,7 +965,7 @@ class Table:
         unfilled = [
             i
             for i, row in self._rows.items()
-            if all([isinstance(cell, SpacerCell) for cell in row._cells.values()])
+            if all(isinstance(cell, SpacerCell) for cell in row._cells.values())
         ]
 
         index = min(
@@ -991,7 +996,7 @@ class Table:
         unfilled = [
             i
             for i, col in self._cols.items()
-            if all([isinstance(cell, SpacerCell) for cell in col._cells.values()])
+            if all(isinstance(cell, SpacerCell) for cell in col._cells.values())
         ]
 
         index = min(
@@ -1057,13 +1062,13 @@ class Table:
 
             node_style = " ".join(
                 (
-                    sw_bs.top,
-                    sw_bs.right,
                     ne_bs.bottom,
+                    sw_bs.right,
+                    sw_bs.top,
                     ne_bs.left,
-                    se_bs.top,
-                    se_bs.left,
                     nw_bs.bottom,
+                    se_bs.left,
+                    se_bs.top,
                     nw_bs.right,
                 )
             )
@@ -1111,8 +1116,8 @@ class Table:
             for w, e in zip([DummyCell(), *row.cells], [*row.cells, DummyCell()]):
                 border_style = " ".join(
                     (
-                        compute_border_style(w, render_count).right,
                         compute_border_style(e, render_count).left,
+                        compute_border_style(w, render_count).right,
                     )
                 )
                 border_char = get_vertical_edge(
@@ -1166,7 +1171,8 @@ class Table:
                         continue
                     output_line.append(borders[i])
 
-                    padding_style = f"{cell.style} nounderline"
+                    cell_style = compute_style(cell, render_count)
+                    padding_style = f"{cell_style} nounderline"
                     padding = compute_padding(cell, render_count)
                     padding_left, padding_right = padding.left, padding.right
 
@@ -1181,7 +1187,7 @@ class Table:
                         [
                             (padding_style, " " * (padding.left or 0)),
                             *(line or []),
-                            (cell.style, " " * excess),
+                            (cell_style, " " * excess),
                             (padding_style, " " * (padding.right or 0)),
                         ]
                     )

euporie/core/formatted_text/utils.py

@@ -12,6 +12,7 @@ from prompt_toolkit.formatted_text.utils import (
     split_lines,
     to_plain_text,
 )
+from prompt_toolkit.layout.utils import explode_text_fragments
 from prompt_toolkit.utils import get_cwidth
 from pygments.lexers import get_lexer_by_name
 from pygments.util import ClassNotFound
@@ -101,16 +102,16 @@ def fragment_list_to_words(
 ) -> Iterable[StyleAndTextTuples]:
     """Split formatted text into a list of word fragments which form words."""
     word: StyleAndTextTuples = []
-    for style, string, *_ in fragments:
+    for style, string, *rest in fragments:
         parts = re.split(r"(?<=[\s\-])", string)
         if len(parts) == 1:
-            word.append((style, parts[0]))
+            word.append(cast("OneStyleAndTextTuple", (style, parts[0], *rest)))
         else:
             for part in parts[:-1]:
-                word.append((style, part))
+                word.append(cast("OneStyleAndTextTuple", (style, part, *rest)))
                 yield word[:]
                 word.clear()
-            word.append((style, parts[-1]))
+            word.append(cast("OneStyleAndTextTuple", (style, parts[-1], *rest)))
     if word:
         yield word
 
@@ -198,7 +199,7 @@ def truncate(
 
     """
     lines = split_lines(ft)
-    if max(fragment_list_width(line) for line in lines) < width:
+    if max(fragment_list_width(line) for line in lines) <= width:
         return ft
     result: StyleAndTextTuples = []
     phw = sum(get_cwidth(c) for c in placeholder)
@@ -460,22 +461,32 @@ def pad(
 
 
 def paste(
-    ft_bottom: StyleAndTextTuples,
     ft_top: StyleAndTextTuples,
+    ft_bottom: StyleAndTextTuples,
     row: int = 0,
     col: int = 0,
+    transparent: bool = False,
 ) -> StyleAndTextTuples:
     """Pate formatted text on top of other formatted text."""
     ft: StyleAndTextTuples = []
-
     top_lines = dict(enumerate(split_lines(ft_top), start=row))
     for y, line_b in enumerate(split_lines(ft_bottom)):
         if y in top_lines:
-            # x = 0
             line_t = top_lines[y]
             line_t_width = fragment_list_width(line_t)
             ft += substring(line_b, 0, col)
-            ft += substring(line_t)
+            if transparent:
+                chars_t = explode_text_fragments(line_t)
+                chars_b = explode_text_fragments(
+                    substring(line_b, col, col + line_t_width)
+                )
+                for char_t, char_b in zip(chars_t, chars_b):
+                    if char_t[0] == "" and char_t[1] == " ":
+                        ft.append(char_b)
+                    else:
+                        ft.append(char_t)
+            else:
+                ft += line_t
             ft += substring(line_b, col + line_t_width)
         else:
             ft += line_b
@@ -529,8 +540,8 @@ def concat(
         ft_b = [*ft_b, ("", lines_below * "\n")]
 
     ft = paste(
-        pad(ft_a, style=style),
         ft_b,
+        pad(ft_a, style=style),
         row=0,
         col=cols_a,
     )

euporie/core/io.py

@@ -1,5 +1,7 @@
 """Define custom inputs and outputs, and related methods."""
 
+from __future__ import annotations
+
 import logging
 import re
 from typing import TYPE_CHECKING
@@ -9,7 +11,7 @@ from prompt_toolkit.input.base import DummyInput, _dummy_context_manager
 from prompt_toolkit.output.vt100 import Vt100_Output as PtkVt100_Output
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, ContextManager, Union
+    from typing import Any, Callable, ContextManager
 
     from prompt_toolkit.keys import Keys
 
@@ -30,7 +32,7 @@ _response_prefix_re = re.compile(
 
 
 class _IsPrefixOfLongerMatchCache(vt100_parser._IsPrefixOfLongerMatchCache):
-    def __missing__(self, prefix: "str") -> "bool":
+    def __missing__(self, prefix: str) -> bool:
         """Check if the response might match an OSC or APC code, or DA response."""
         result = super().__missing__(prefix)
         if not result:
@@ -47,12 +49,12 @@ vt100_parser._IS_PREFIX_OF_LONGER_MATCH_CACHE = _IsPrefixOfLongerMatchCache()
 class Vt100Parser(vt100_parser.Vt100Parser):
     """A Vt100Parser which checks input against additional key patterns."""
 
-    def __init__(self, *args: "Any", **kwargs: "Any") -> "None":
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         """Create a new VT100 parser."""
         super().__init__(*args, **kwargs)
-        self.queries: "dict[Keys, re.Pattern]" = {}
+        self.queries: dict[Keys, re.Pattern] = {}
 
-    def _get_match(self, prefix: "str") -> "Union[None, Keys, tuple[Keys, ...]]":
+    def _get_match(self, prefix: str) -> None | Keys | tuple[Keys, ...]:
         """Check for additional key matches first."""
         for key, pattern in self.queries.items():
             if pattern.match(prefix):
@@ -64,9 +66,7 @@ class Vt100Parser(vt100_parser.Vt100Parser):
 class IgnoredInput(DummyInput):
     """An input which ignores input but does not immediately close the app."""
 
-    def attach(
-        self, input_ready_callback: "Callable[[], None]"
-    ) -> "ContextManager[None]":
+    def attach(self, input_ready_callback: Callable[[], None]) -> ContextManager[None]:
         """Do not call the callback, so the input is never closed."""
         return _dummy_context_manager()
 
@@ -74,26 +74,26 @@ class IgnoredInput(DummyInput):
 class Vt100_Output(PtkVt100_Output):
     """A Vt100 output which enables SGR pixel mouse positioning."""
 
-    def enable_mouse_support(self) -> "None":
+    def enable_mouse_support(self) -> None:
         """Additionally enable SGR-pixel mouse positioning."""
         super().enable_mouse_support()
         self.write_raw("\x1b[?1016h")
 
-    def disable_mouse_support(self) -> "None":
+    def disable_mouse_support(self) -> None:
         """Additionally disable SGR-pixel mouse positioning."""
         super().disable_mouse_support()
         self.write_raw("\x1b[?1016l")
 
-    def enable_extended_keys(self) -> "None":
+    def enable_extended_keys(self) -> None:
         """Request extended keys."""
         # xterm
         self.write_raw("\x1b[>4;1m")
         # kitty
-        self.write_raw("\x1b[>1u")
+        self.write_raw("\x1b[=1u")
 
-    def disable_extended_keys(self) -> "None":
+    def disable_extended_keys(self) -> None:
         """Disable extended keys."""
         # xterm
         self.write_raw("\x1b[>4;0m")
         # kitty
-        self.write_raw("\x1b[<u")
+        self.write_raw("\x1b[=0u")