fixes / tests for tabs_to_spaces

Textualize · Mar 1, 2020 · b74e5ba · b74e5ba
1 parent 6246b1d
commit b74e5ba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/rich/text.py b/rich/text.py
@@ -92,7 +92,7 @@ class Text:
             style (Union[str, Style], optional): Base style for text. Defaults to "".
             justify (str, optional): Default alignment for text, "left", "center", "full" or "right". Defaults to None.
             end (str, optional): Character to end text with. Defaults to "\n".
-            tab_size (int, optional): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to None.
+            tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
     """
 
     def __init__(
@@ -101,7 +101,7 @@ def __init__(
         style: Union[str, Style] = "",
         justify: "JustifyValues" = None,
         end: str = "\n",
-        tab_size: int = None,
+        tab_size: int = 8,
     ) -> None:
         self._text: List[str] = [text] if text else []
         self.style = style
@@ -402,7 +402,7 @@ def join(self, lines: Iterable["Text"]) -> "Text":
                 append(self)
         return new_text
 
-    def tabs_to_spaces(self, tab_size: int = 8) -> "Text":
+    def tabs_to_spaces(self, tab_size: int = None) -> "Text":
         """Get a new string with tabs converted to spaces.
         
         Args:
@@ -415,6 +415,8 @@ def tabs_to_spaces(self, tab_size: int = 8) -> "Text":
             return self.copy()
         parts = self.split("\t", include_separator=True)
         pos = 0
+        if tab_size is None:
+            tab_size = self.tab_size
         result = Text(
             style=self.style, justify=self.justify, end=self.end, tab_size=self.tab_size
         )

diff --git a/tests/test_text.py b/tests/test_text.py
@@ -272,3 +272,12 @@ def test_render():
     output = console.export_text(styles=True)
     expected = "\x1b[1;4mWhere\x1b[0m\x1b[4m there is \x1b[0m\n\x1b[0m\x1b[4ma \x1b[0m\x1b[3;4mWill\x1b[0m\x1b[4m, there \x1b[0m\n\x1b[0m\x1b[4mis a Way.\x1b[0m\n\x1b[0m"
     assert output == expected
+
+
+def test_tabs_to_spaces():
+    test = Text("\tHello\tWorld", tab_size=8)
+    assert test.tabs_to_spaces().text == "        Hello   World"
+    test = Text("\tHello\tWorld", tab_size=4)
+    assert test.tabs_to_spaces().text == "    Hello   World"
+    test = Text(".\t..\t...\t....\t", tab_size=4)
+    assert test.tabs_to_spaces().text == ".   ..  ... ....    "