Merge pull request #192 from xen0n/really-fix-issue181

Fix incorrectly cropped lines after #187

ruyi/cli/__init__.py

@@ -13,6 +13,7 @@
     "__main__.py",
 )
 
+
 def is_called_as_ruyi(argv0: str) -> bool:
     return os.path.basename(argv0).lower() in ALLOWED_RUYI_ENTRYPOINT_NAMES
 

ruyi/log/__init__.py

@@ -27,7 +27,11 @@ def log_time_formatter(x: datetime.datetime) -> Text:
 
 
 STDOUT_CONSOLE = Console(file=sys.stdout, highlight=False, soft_wrap=True)
-DEBUG_CONSOLE = Console(file=sys.stderr, log_time_format=log_time_formatter, soft_wrap=True)
+DEBUG_CONSOLE = Console(
+    file=sys.stderr,
+    log_time_format=log_time_formatter,
+    soft_wrap=True,
+)
 LOG_CONSOLE = Console(file=sys.stderr, highlight=False, soft_wrap=True)
 PORCELAIN_SINK = PorcelainOutput(sys.stderr.buffer)
 

ruyi/utils/markdown.py

@@ -26,6 +26,9 @@ def __rich_console__(
         console: Console,
         options: ConsoleOptions,
     ) -> RenderResult:
+        # re-enable non-wrapping options locally for code blocks
+        render_options = options.update(no_wrap=True, overflow="ignore")
+
         code = str(self.text).rstrip()
         syntax = Syntax(
             code,
@@ -34,10 +37,20 @@ def __rich_console__(
             word_wrap=False,
             padding=0,
         )
-        return syntax.highlight(code).__rich_console__(console, options)
+        return syntax.highlight(code).__rich_console__(console, render_options)
 
 
 class RuyiStyledMarkdown(Markdown):
     elements = Markdown.elements
     elements["fence"] = NonWrappingCodeBlock
     elements["heading_open"] = SlimHeading
+
+    def __rich_console__(
+        self,
+        console: Console,
+        options: ConsoleOptions,
+    ) -> RenderResult:
+        # we have to undo the ruyi-global console's non-wrapping setting
+        # for proper CLI rendering of long lines
+        render_options = options.update(no_wrap=False, overflow="fold")
+        return super().__rich_console__(console, render_options)