🚸 Don't truncate code lines in traceback when formatted with Rich (#1695)

Author: YuriiMotov

pyproject.toml

@@ -35,7 +35,7 @@ classifiers = [
 dependencies = [
     "click >= 8.2.1",
     "shellingham >=1.3.0",
-    "rich >=12.3.0",
+    "rich >=13.8.0",
     "annotated-doc >=0.0.2",
 ]
 readme = "README.md"

tests/assets/type_error_rich.py

@@ -0,0 +1,14 @@
+import typer
+import typer.main
+
+app = typer.Typer()
+
+
+@app.command()
+def main(name: str = "morty"):
+    # The line below will cause TypeError because you cannot concatenate string and integer.
+    print(name + 3)
+
+
+if __name__ == "__main__":
+    app()

tests/test_tracebacks.py

@@ -62,3 +62,46 @@ def test_unmodified_traceback():
     assert "typer.main.get_command(broken_app)()" in result.stderr
     assert "print(name + 3)" in result.stderr
     assert 'TypeError: can only concatenate str (not "int") to str' in result.stderr
+
+
+def test_rich_exceptions_dont_truncate_code_on_wide_terminal():
+    file_path = Path(__file__).parent / "assets/type_error_rich.py"
+    result = subprocess.run(
+        [sys.executable, "-m", "coverage", "run", str(file_path)],
+        capture_output=True,
+        encoding="utf-8",
+        env={
+            **os.environ,
+            "TERMINAL_WIDTH": "120",
+            "TYPER_STANDARD_TRACEBACK": "",
+            "_TYPER_STANDARD_TRACEBACK": "",
+        },
+    )
+
+    assert (
+        "# The line below will cause TypeError because you cannot concatenate string and integer."
+        in result.stderr
+    )
+
+
+def test_rich_exceptions_wrap_words_on_small_width_terminal():
+    file_path = Path(__file__).parent / "assets/type_error_rich.py"
+    result = subprocess.run(
+        [sys.executable, "-m", "coverage", "run", str(file_path)],
+        capture_output=True,
+        encoding="utf-8",
+        env={
+            **os.environ,
+            "TERMINAL_WIDTH": "80",
+            "TYPER_STANDARD_TRACEBACK": "",
+            "_TYPER_STANDARD_TRACEBACK": "",
+        },
+    )
+
+    # Long line is wrapped, so the full line is not in the output, but parts of it are.
+    assert "# The line below will cause TypeError because you cannot" in result.stderr
+    assert "concatenate string and integer." in result.stderr
+    assert (
+        "# The line below will cause TypeError because you cannot concatenate string and integer."
+        not in result.stderr
+    )

typer/rich_utils.py

@@ -749,5 +749,7 @@ def get_traceback(
         show_locals=exception_config.pretty_exceptions_show_locals,
         suppress=internal_dir_names,
         width=MAX_WIDTH,
+        code_width=None,
+        word_wrap=True,
     )
     return rich_tb