rule fix

Author: willmcgugan

CHANGELOG.md

@@ -5,7 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.0.0] - 2020-07-07
+## [2.0.1] - 2020-06-10
+
+### Added
+
+- Added expand option to Padding
+
+### Changed
+
+- Some minor optimizations in Text
+
+### Fixed
+
+- Fixed broken rule with CJK text
+
+## [2.0.0] - 2020-06-06
 
 ### Added
 

pyproject.toml

@@ -2,7 +2,7 @@
 name = "rich"
 homepage = "https://github.com/willmcgugan/rich"
 documentation = "https://rich.readthedocs.io/en/latest/"
-version = "2.0.0"
+version = "2.0.1"
 description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
 authors = ["Will McGugan <willmcgugan@gmail.com>"]
 license = "MIT"

rich/__main__.py

@@ -167,8 +167,13 @@ def iter_last(values: Iterable[T]) -> Iterable[Tuple[bool, T]]:
 if __name__ == "__main__":  # pragma: no cover
     console = Console(file=io.StringIO(), force_terminal=True)
     test_card = make_test_card()
+
+    # Print once to warm cache
+    console.print(test_card)
+    console.file = io.StringIO()
+
     start = process_time()
     console.print(test_card)
-    taken = int((process_time() - start) * 1000.0)
+    taken = round((process_time() - start) * 1000.0, 1)
     print(console.file.getvalue())  # type: ignore
     print(f"rendered in {taken}ms")

rich/_wrap.py

@@ -21,27 +21,27 @@ def divide_line(text: str, width: int, fold: bool = True) -> List[int]:
     divides: List[int] = []
     append = divides.append
     line_position = 0
-
+    _cell_len = cell_len
     for start, _end, word in words(text):
-        word_length = cell_len(word.rstrip())
+        word_length = _cell_len(word.rstrip())
         if line_position + word_length > width:
             if word_length > width:
                 if fold:
                     for last, line in loop_last(
                         chop_cells(word, width, position=line_position)
                     ):
                         if last:
-                            line_position = cell_len(line)
+                            line_position = _cell_len(line)
                         else:
                             start += len(line)
                             append(start)
                 else:
-                    line_position = cell_len(word)
+                    line_position = _cell_len(word)
             elif line_position and start:
                 append(start)
-                line_position = cell_len(word)
+                line_position = _cell_len(word)
         else:
-            line_position += cell_len(word)
+            line_position += _cell_len(word)
     return divides
 
 

rich/emoji.py

@@ -58,21 +58,18 @@ def __rich_console__(
 
 
 if __name__ == "__main__":  # pragma: no cover
-    from .console import Console
+    import sys
 
-    c = Console(markup=False)
+    from rich.columns import Columns
+    from rich.console import Console
 
-    e = Emoji("thumbs_up")
-    print(repr(e))
-    print(e)
+    console = Console(record=True)
 
-    c.print(Emoji("thumbs_up"))
-    # c.print("Hello")
-    c.print("Hello World")
-    from .panel import Panel
+    columns = Columns(
+        (f":{name}: {name}" for name in sorted(EMOJI.keys()) if "\u200D" not in name),
+        column_first=True,
+    )
 
-    c.print(Panel(Emoji.replace("Hello, :smiley: ! :thumbs_up: :sfwdfwer:")))
-
-    c.print("Here is a :smiley:  :link: Hello World")
-
-    c.print(":beer:")
+    console.print(columns)
+    if len(sys.argv) > 1:
+        console.save_html(sys.argv[1])

rich/markup.py

@@ -82,13 +82,15 @@ def render(markup: str, style: Union[str, Style] = "", emoji: bool = True) -> Te
     Returns:
         Text: A test instance.
     """
+    emoji_replace = _emoji_replace
+    if "[" not in markup:
+        return Text(emoji_replace(markup) if emoji else markup, style=style)
     text = Text(style=style)
     append = text.append
     normalize = Style.normalize
 
     style_stack: List[Tuple[int, Tag]] = []
     pop = style_stack.pop
-    emoji_replace = _emoji_replace
 
     spans: List[Span] = []
     append_span = spans.append

rich/padding.py

@@ -28,6 +28,7 @@ class Padding(JupyterMixin):
         pad (Union[int, Tuple[int]]): Padding for top, right, bottom, and left borders.
             May be specified with 1, 2, or 4 integers (CSS style).
         style (Union[str, Style], optional): Style for padding characters. Defaults to "none".
+        expand (bool, optional): Expand padding to fit available width. Defaults to True.
     """
 
     def __init__(
@@ -36,10 +37,12 @@ def __init__(
         pad: "PaddingDimensions" = (0, 0, 0, 0),
         *,
         style: Union[str, Style] = "none",
+        expand: bool = True,
     ):
         self.renderable = renderable
         self.top, self.right, self.bottom, self.left = self.unpack(pad)
         self.style = style
+        self.expand = expand
 
     @classmethod
     def indent(cls, renderable: "RenderableType", level: int) -> "Padding":
@@ -53,7 +56,7 @@ def indent(cls, renderable: "RenderableType", level: int) -> "Padding":
             Padding: A Padding instance.
         """
 
-        return Padding(renderable, pad=(0, 0, 0, level))
+        return Padding(renderable, pad=(0, 0, 0, level), expand=False)
 
     @staticmethod
     def unpack(pad: "PaddingDimensions") -> Tuple[int, int, int, int]:
@@ -79,7 +82,15 @@ def __rich_console__(
     ) -> "RenderResult":
 
         style = console.get_style(self.style)
-        width = options.max_width
+        if self.expand:
+            width = options.max_width
+        else:
+            width = min(
+                Measurement.get(console, self.renderable, options.max_width).maximum
+                + self.left
+                + self.right,
+                options.max_width,
+            )
         child_options = options.update(width=width - self.left - self.right)
         lines = console.render_lines(self.renderable, child_options, style=style)
         lines = Segment.set_shape(lines, child_options.max_width, style=style)

rich/rule.py

@@ -1,5 +1,6 @@
 from typing import Union
 
+from .cells import cell_len
 from .console import Console, ConsoleOptions, RenderResult
 from .jupyter import JupyterMixin
 from .segment import Segment
@@ -21,10 +22,8 @@ def __init__(
         character: str = None,
         style: Union[str, Style] = "rule.line",
     ) -> None:
-        if character and len(character) != 1:
-            raise ValueError(
-                "Rule requires character argument to be a string of length 1"
-            )
+        if character and cell_len(character) != 1:
+            raise ValueError("'character' argument must have a cell width of 1")
         self.title = title
         self.character = character
         self.style = style
@@ -46,14 +45,17 @@ def __rich_console__(
                 title_text = self.title
             else:
                 title_text = console.render_str(self.title, style="rule.text")
-            if len(title_text) > width - 4:
+
+            if cell_len(title_text.plain) > width - 4:
                 title_text.set_length(width - 4)
 
             rule_text = Text()
-            center = (width - len(title_text)) // 2
+            center = (width - cell_len(title_text.plain)) // 2
             rule_text.append(character * (center - 1) + " ", self.style)
             rule_text.append(title_text)
-            rule_text.append(" " + character * (width - len(rule_text) - 1), self.style)
+            rule_text.append(
+                " " + character * (width - cell_len(rule_text.plain) - 1), self.style
+            )
             yield rule_text
 
 

rich/style.py

@@ -1,5 +1,6 @@
 from binascii import crc32
-from functools import lru_cache
+from functools import lru_cache, reduce
+from operator import or_
 import sys
 from typing import Any, Dict, Iterable, List, Mapping, Optional, Type, Union
 
@@ -110,35 +111,39 @@ def _make_color(color: Union[Color, str]) -> Color:
 
         self._color = None if color is None else _make_color(color)
         self._bgcolor = None if bgcolor is None else _make_color(bgcolor)
-        self._attributes = (
-            (bold or 0)
-            | (dim or 0) << 1
-            | (italic or 0) << 2
-            | (underline or 0) << 3
-            | (blink or 0) << 4
-            | (blink2 or 0) << 5
-            | (reverse or 0) << 6
-            | (conceal or 0) << 7
-            | (strike or 0) << 8
-            | (underline2 or 0) << 9
-            | (frame or 0) << 10
-            | (encircle or 0) << 11
-            | (overline or 0) << 12
+        self._attributes = sum(
+            (
+                bold and 1 or 0,
+                dim and 2 or 0,
+                italic and 4 or 0,
+                underline and 8 or 0,
+                blink and 16 or 0,
+                blink2 and 32 or 0,
+                reverse and 64 or 0,
+                conceal and 128 or 0,
+                strike and 256 or 0,
+                underline2 and 512 or 0,
+                frame and 1024 or 0,
+                encircle and 2048 or 0,
+                overline and 4096 or 0,
+            )
         )
-        self._set_attributes = (
-            (bold is not None)
-            | (dim is not None) << 1
-            | (italic is not None) << 2
-            | (underline is not None) << 3
-            | (blink is not None) << 4
-            | (blink2 is not None) << 5
-            | (reverse is not None) << 6
-            | (conceal is not None) << 7
-            | (strike is not None) << 8
-            | (underline2 is not None) << 9
-            | (frame is not None) << 10
-            | (encircle is not None) << 11
-            | (overline is not None) << 12
+        self._set_attributes = sum(
+            (
+                bold is not None,
+                dim is not None and 2,
+                italic is not None and 4,
+                underline is not None and 8,
+                blink is not None and 16,
+                blink2 is not None and 32,
+                reverse is not None and 64,
+                conceal is not None and 128,
+                strike is not None and 256,
+                underline2 is not None and 512,
+                frame is not None and 1024,
+                encircle is not None and 2048,
+                overline is not None and 4096,
+            )
         )
         self._link = link
 

rich/text.py

@@ -109,6 +109,18 @@ class Text(JupyterMixin):
             tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
     """
 
+    __slots__ = [
+        "_text",
+        "style",
+        "justify",
+        "overflow",
+        "no_wrap",
+        "end",
+        "tab_size",
+        "_spans",
+        "_length",
+    ]
+
     def __init__(
         self,
         text: str = "",
@@ -121,15 +133,14 @@ def __init__(
         tab_size: Optional[int] = 8,
         spans: List[Span] = None,
     ) -> None:
-        text = strip_control_codes(text)
-        self._text: List[str] = [text] if text else []
+        self._text = [strip_control_codes(text)]
         self.style = style
         self.justify = justify
         self.overflow = overflow
         self.no_wrap = no_wrap
         self.end = end
         self.tab_size = tab_size
-        self._spans: List[Span] = spans if spans is not None else []
+        self._spans: List[Span] = spans or []
         self._length: int = len(text)
 
     def __len__(self) -> int:
@@ -229,8 +240,7 @@ def assemble(
     def plain(self) -> str:
         """Get the text as a single string."""
         if len(self._text) != 1:
-            text = "".join(self._text)
-            self._text[:] = [text]
+            self._text[:] = ["".join(self._text)]
         return self._text[0]
 
     @plain.setter
@@ -245,7 +255,7 @@ def plain(self, new_text: str) -> None:
 
     @property
     def spans(self) -> List[Span]:
-        """Get a copy of the list of spans."""
+        """Get a reference to the internal list of spans."""
         return self._spans
 
     @spans.setter
@@ -412,13 +422,7 @@ def set_length(self, new_length: int) -> None:
         if length < new_length:
             self.pad_right(new_length - length)
         else:
-            text = self.plain[:new_length]
-            self.plain = text
-            new_spans = []
-            for span in self._spans:
-                if span.start < new_length:
-                    new_spans.append(span.right_crop(new_length))
-            self._spans[:] = new_spans
+            self.plain = self.plain[:new_length]
 
     def __rich_console__(
         self, console: "Console", options: "ConsoleOptions"

tests/test_rule.py

@@ -17,6 +17,15 @@ def test_rule():
     assert console.file.getvalue() == expected
 
 
+def test_rule_cjk():
+    console = Console(
+        width=16, file=io.StringIO(), force_terminal=True, color_system=None
+    )
+    console.rule("欢迎！")
+    expected = "──── 欢迎！ ────\n"
+    assert console.file.getvalue() == expected
+
+
 def test_repr():
     rule = Rule("foo")
     assert isinstance(repr(rule), str)

tools/make_emoji.py

@@ -8,9 +8,7 @@
 
 from emoji.unicode_codes import EMOJI_ALIAS_UNICODE
 
-emoji = {
-    k.lower().strip(":"): normalize("NFC", v) for k, v in EMOJI_ALIAS_UNICODE.items()
-}
+emoji = {k.lower().strip(":"): v for k, v in EMOJI_ALIAS_UNICODE.items()}
 
 with open("_emoji_codes.py", "wt") as f:
     f.write("EMOJI=" + str(emoji))