Fix ANSI escape sequence corruption in CI tests - Replace temporary console rendering with direct Rich Text objects in list rendering - Fix double-escaping issue that occurred when TERM environment variable was unset - Update temporary console configurations to use consistent terminal settings - Update snapshots to reflect corrected ANSI escape sequence output - Tests now pass consistently in both local and CI environments

statico · statico · commit e6453b1145fd · 2025-05-25T17:28:44.000-07:00
diff --git a/md2term.py b/md2term.py
@@ -132,7 +132,13 @@ def _render_blockquote(self, token: Dict[str, Any]) -> None:
         # Render children into a string buffer
         old_console = self.console
         buffer = StringIO()
-        temp_console = Console(file=buffer, width=self.console.size.width - 4)
+        temp_console = Console(
+            file=buffer,
+            width=self.console.size.width - 4,
+            force_terminal=True,
+            color_system="256",
+            legacy_windows=False
+        )
         self.console = temp_console
 
         for child in token['children']:
@@ -242,7 +248,13 @@ def _render_callout(self, content: str, callout_info: Dict[str, str]) -> None:
             # Parse and render the content with markdown
             old_console = self.console
             content_buffer = StringIO()
-            temp_console = Console(file=content_buffer, width=self.console.size.width - 6)
+            temp_console = Console(
+                file=content_buffer,
+                width=self.console.size.width - 6,
+                force_terminal=True,
+                color_system="256",
+                legacy_windows=False
+            )
             self.console = temp_console
 
             # Parse the content as markdown
@@ -290,20 +302,45 @@ def _render_list(self, token: Dict[str, Any]) -> None:
                 marker = "•"
                 marker_style = "bold yellow"
 
-            # Render list item content
-            old_console = self.console
-            buffer = StringIO()
-            temp_console = Console(file=buffer, width=self.console.size.width - 4)
-            self.console = temp_console
+            # Create the marker text
+            marker_text = Text(marker, style=marker_style)
 
+            # Render list item content as Rich Text objects
+            content_text = Text()
             for child in item['children']:
-                self._render_token(child)
-
-            self.console = old_console
-            content = buffer.getvalue().rstrip()
-
-            # Print with proper indentation
-            self.console.print(f"[{marker_style}]{marker}[/] {content}")
+                if child['type'] == 'paragraph':
+                    # For paragraphs, render inline tokens directly
+                    for inline_child in child['children']:
+                        if inline_child['type'] == 'text':
+                            content_text.append(inline_child['raw'])
+                        else:
+                            # Render other inline tokens
+                            inline_text = self._render_inline_tokens([inline_child])
+                            content_text.append_text(inline_text)
+                else:
+                    # For other types, fall back to the old method
+                    old_console = self.console
+                    buffer = StringIO()
+                    temp_console = Console(
+                        file=buffer,
+                        width=self.console.size.width - 4,
+                        force_terminal=True,
+                        color_system="256",
+                        legacy_windows=False
+                    )
+                    self.console = temp_console
+                    self._render_token(child)
+                    self.console = old_console
+                    content_text.append(buffer.getvalue().rstrip())
+
+            # Combine marker and content
+            line_text = Text()
+            line_text.append_text(marker_text)
+            line_text.append(" ")
+            line_text.append_text(content_text)
+
+            # Print the complete line
+            self.console.print(line_text)
 
     def _render_thematic_break(self) -> None:
         """Render a horizontal rule."""
diff --git a/tests/__snapshots__/test_md2term.ambr b/tests/__snapshots__/test_md2term.ambr
@@ -128,9 +128,10 @@
 # name: TestMarkdownFeatures.test_blockquotes
   '''
   [2;34m│[0m [2;3;34mThis is a blockquote with some important information. It can span multiple [0m
-  [2;34m│[0m [2;3;34mlines and contain bold and italic text.[0m
+  [2;34m│[0m [2;3;34mlines and contain [0m[1;2;3;34m[[0m[2;3;34m1mbold[0m[1;2;3;34m[[0m[2;3;34m0m and [0m[1;2;3;34m[[0m[2;3;34m3mitalic[0m[1;2;3;34m[[0m[2;3;34m0m text.[0m
   [2;34m│[0m
-  [2;34m│[0m [2;3;34mIt can even contain inline code and links [0m[1;2;3;34m([0m[2;3;4;34mhttps://example.com[0m[2;3;4;34m)[0m[2;3;4;34m.[0m
+  [2;34m│[0m [2;3;34mIt can even contain [0m[1;2;3;34m[[0m[1;2;3;34m1[0m[2;3;34m;[0m[1;2;3;34m31[0m[2;3;34m;40minline code[0m[1;2;3;34m[[0m[2;3;34m0m and [0m[1;2;3;34m[[0m[1;2;3;34m1[0m[2;3;34m;[0m[1;2;3;34m4[0m[2;3;34m;34mlinks[0m[1;2;3;34m[[0m[2;3;34m0m[0m[1;2;3;34m[[0m[1;2;3;34m2[0m[2;3;34m;34m [0m
+  [1;2;3;34m([0m[2;3;4;34mhttps://example.com[0m[2;3;4;34m)[0m[2;3;34m[0m[1;2;3;34m[[0m[2;3;34m0m.[0m
   
   '''
 # ---
@@ -250,24 +251,25 @@
   [1;95mUnordered List[0m
   
   [1;33m•[0m First item
-  [1;33m•[0m Second item with bold text
-  [1;33m•[0m Third item with italic text
-  [1;33m•[0m Fourth item with inline code
+  [1;33m•[0m Second item with [1mbold text[0m
+  [1;33m•[0m Third item with [3mitalic text[0m
+  [1;33m•[0m Fourth item with [1;31;40minline code[0m
   
   [1;95mOrdered List[0m
   
-  [1;36m1[0m[1;36m.[0m First numbered item
-  [1;36m2[0m[1;36m.[0m Second numbered item
-  [1;36m3[0m[1;36m.[0m Third numbered item with a link [1m([0m[4;94mhttps://example.com[0m[4;94m)[0m
-  [1;36m4[0m[1;36m.[0m Fourth numbered item
+  [1;36m1.[0m First numbered item
+  [1;36m2.[0m Second numbered item
+  [1;36m3.[0m Third numbered item with a [1;4;34mlink[0m[2;34m (https://example.com)[0m
+  [1;36m4.[0m Fourth numbered item
   
   [1;94mBlockquotes[0m
   [34m────────────────────────────────────────────────────────────────────────────────[0m
   
   [2;34m│[0m [2;3;34mThis is a blockquote with some important information. It can span multiple [0m
-  [2;34m│[0m [2;3;34mlines and contain bold and italic text.[0m
+  [2;34m│[0m [2;3;34mlines and contain [0m[1;2;3;34m[[0m[2;3;34m1mbold[0m[1;2;3;34m[[0m[2;3;34m0m and [0m[1;2;3;34m[[0m[2;3;34m3mitalic[0m[1;2;3;34m[[0m[2;3;34m0m text.[0m
   [2;34m│[0m
-  [2;34m│[0m [2;3;34mIt can even contain inline code and links [0m[1;2;3;34m([0m[2;3;4;34mhttps://example.com[0m[2;3;4;34m)[0m[2;3;4;34m.[0m
+  [2;34m│[0m [2;3;34mIt can even contain [0m[1;2;3;34m[[0m[1;2;3;34m1[0m[2;3;34m;[0m[1;2;3;34m31[0m[2;3;34m;40minline code[0m[1;2;3;34m[[0m[2;3;34m0m and [0m[1;2;3;34m[[0m[1;2;3;34m1[0m[2;3;34m;[0m[1;2;3;34m4[0m[2;3;34m;34mlinks[0m[1;2;3;34m[[0m[2;3;34m0m[0m[1;2;3;34m[[0m[1;2;3;34m2[0m[2;3;34m;34m [0m
+  [1;2;3;34m([0m[2;3;4;34mhttps://example.com[0m[2;3;4;34m)[0m[2;3;34m[0m[1;2;3;34m[[0m[2;3;34m0m.[0m
   
   [2;34m│[0m [2;3;34mThis is another blockquote to show multiple quotes.[0m
   
@@ -351,18 +353,21 @@
   [33m╭────────────────────────────────────────────────────────────────────────────╮[0m
   [33m│[0m [1;33m⚠️  Complex Warning[0m                                                         [33m│[0m
   [33m│[0m                                                                            [33m│[0m
-  [33m│[0m This callout contains bold text, italic text, and inline code.             [33m│[0m
+  [33m│[0m This callout contains [1mbold text[0m, [3mitalic text[0m, and              [33m│[0m
+  [33m│[0m [1;31;40minline code[0m.                                                   [33m│[0m
   [33m│[0m                                                                            [33m│[0m
   [33m│[0m It can also contain:                                                       [33m│[0m
   [33m│[0m                                                                            [33m│[0m
-  [33m│[0m • Bullet points • Multiple paragraphs • Even links (https://example.com)   [33m│[0m
-  [33m│[0m ╭───────────────────────────────────────────────────────────────────────── [33m│[0m
-  [33m│[0m ─╮ │ # And code blocks!                                                    [33m│[0m
-  [33m│[0m │ │ def example():                                                         [33m│[0m
-  [33m│[0m │ │     return "Hello from a callout!"                                     [33m│[0m
-  [33m│[0m │                                                                          [33m│[0m
-  [33m│[0m ╰───────────────────────────────────────────────────────────────────────── [33m│[0m
-  [33m│[0m ─╯                                                                         [33m│[0m
+  [33m│[0m [1;33m•[0m Bullet points [1;33m•[0m Multiple paragraphs [1;33m•[0m Even    [33m│[0m
+  [33m│[0m [1;4;34mlinks[0m[2;34m (https://example.com)[0m                            [33m│[0m
+  [33m│[0m [2m╭────────────────────────────────────────────────────────────────────── [33m│[0m
+  [33m│[0m ────╮[0m [2m│[0m [2;49m# And code blocks![0m                               [33m│[0m
+  [33m│[0m [2m│[0m [2m│[0m [94;49mdef[0m[90;49m [0m[92;49mexample[0m[49m():[0m        [33m│[0m
+  [33m│[0m [2m│[0m [2m│[0m [49m    [0m[94;49mreturn[0m[49m [0m[33;49m"[0m[33;49mHello [33m│[0m
+  [33m│[0m from a callout![0m[33;49m"[0m                                              [33m│[0m
+  [33m│[0m [2m│[0m                                                                    [33m│[0m
+  [33m│[0m [2m╰────────────────────────────────────────────────────────────────────── [33m│[0m
+  [33m│[0m ────╯[0m                                                                   [33m│[0m
   [33m╰────────────────────────────────────────────────────────────────────────────╯[0m
   
   That's all folks!
@@ -419,10 +424,10 @@
 # ---
 # name: TestMarkdownFeatures.test_ordered_lists
   '''
-  [1;36m1[0m[1;36m.[0m First numbered item
-  [1;36m2[0m[1;36m.[0m Second numbered item
-  [1;36m3[0m[1;36m.[0m Third numbered item with a link [1m([0m[4;94mhttps://example.com[0m[4;94m)[0m
-  [1;36m4[0m[1;36m.[0m Fourth numbered item
+  [1;36m1.[0m First numbered item
+  [1;36m2.[0m Second numbered item
+  [1;36m3.[0m Third numbered item with a [1;4;34mlink[0m[2;34m (https://example.com)[0m
+  [1;36m4.[0m Fourth numbered item
   
   '''
 # ---
@@ -436,9 +441,9 @@
 # name: TestMarkdownFeatures.test_unordered_lists
   '''
   [1;33m•[0m First item
-  [1;33m•[0m Second item with bold text
-  [1;33m•[0m Third item with italic text
-  [1;33m•[0m Fourth item with inline code
+  [1;33m•[0m Second item with [1mbold text[0m
+  [1;33m•[0m Third item with [3mitalic text[0m
+  [1;33m•[0m Fourth item with [1;31;40minline code[0m
   
   '''
 # ---
diff --git a/tests/test_md2term.py b/tests/test_md2term.py
@@ -15,6 +15,13 @@
 
 def create_test_console(output, width=80):
     """Create a console with consistent settings for testing."""
+    import os
+    # Force consistent environment for testing
+    os.environ['FORCE_COLOR'] = '1'
+    os.environ['TERM'] = 'xterm-256color'
+    os.environ['COLORTERM'] = 'truecolor'
+    os.environ['NO_COLOR'] = ''
+
     return Console(
         file=output,
         width=width,

-Original file line number
+Diff line change
 # name: TestMarkdownFeatures.test_blockquotes
   '''
   [2;34m│[0m [2;3;34mThis is a blockquote with some important information. It can span multiple [0m
 -  [2;34m│[0m [2;3;34mlines and contain bold and italic text.[0m
 +  [2;34m│[0m [2;3;34mlines and contain [0m[1;2;3;34m[[0m[2;3;34m1mbold[0m[1;2;3;34m[[0m[2;3;34m0m and [0m[1;2;3;34m[[0m[2;3;34m3mitalic[0m[1;2;3;34m[[0m[2;3;34m0m text.[0m
   [2;34m│[0m
 -  [2;34m│[0m [2;3;34mIt can even contain inline code and links [0m[1;2;3;34m([0m[2;3;4;34mhttps://example.com[0m[2;3;4;34m)[0m[2;3;4;34m.[0m
 +  [2;34m│[0m [2;3;34mIt can even contain [0m[1;2;3;34m[[0m[1;2;3;34m1[0m[2;3;34m;[0m[1;2;3;34m31[0m[2;3;34m;40minline code[0m[1;2;3;34m[[0m[2;3;34m0m and [0m[1;2;3;34m[[0m[1;2;3;34m1[0m[2;3;34m;[0m[1;2;3;34m4[0m[2;3;34m;34mlinks[0m[1;2;3;34m[[0m[2;3;34m0m[0m[1;2;3;34m[[0m[1;2;3;34m2[0m[2;3;34m;34m [0m
 +  [1;2;3;34m([0m[2;3;4;34mhttps://example.com[0m[2;3;4;34m)[0m[2;3;34m[0m[1;2;3;34m[[0m[2;3;34m0m.[0m
   '''
 # ---
   [1;95mUnordered List[0m
   [1;33m•[0m First item
 -  [1;33m•[0m Second item with bold text
 -  [1;33m•[0m Third item with italic text
 -  [1;33m•[0m Fourth item with inline code
 +  [1;33m•[0m Second item with [1mbold text[0m
 +  [1;33m•[0m Third item with [3mitalic text[0m
 +  [1;33m•[0m Fourth item with [1;31;40minline code[0m
   [1;95mOrdered List[0m
 -  [1;36m1[0m[1;36m.[0m First numbered item
 -  [1;36m2[0m[1;36m.[0m Second numbered item
 -  [1;36m3[0m[1;36m.[0m Third numbered item with a link [1m([0m[4;94mhttps://example.com[0m[4;94m)[0m
 -  [1;36m4[0m[1;36m.[0m Fourth numbered item
 +  [1;36m1.[0m First numbered item
 +  [1;36m2.[0m Second numbered item
 +  [1;36m3.[0m Third numbered item with a [1;4;34mlink[0m[2;34m (https://example.com)[0m
 +  [1;36m4.[0m Fourth numbered item
   [1;94mBlockquotes[0m
   [34m────────────────────────────────────────────────────────────────────────────────[0m
   [2;34m│[0m [2;3;34mThis is a blockquote with some important information. It can span multiple [0m
 -  [2;34m│[0m [2;3;34mlines and contain bold and italic text.[0m
 +  [2;34m│[0m [2;3;34mlines and contain [0m[1;2;3;34m[[0m[2;3;34m1mbold[0m[1;2;3;34m[[0m[2;3;34m0m and [0m[1;2;3;34m[[0m[2;3;34m3mitalic[0m[1;2;3;34m[[0m[2;3;34m0m text.[0m
   [2;34m│[0m
 -  [2;34m│[0m [2;3;34mIt can even contain inline code and links [0m[1;2;3;34m([0m[2;3;4;34mhttps://example.com[0m[2;3;4;34m)[0m[2;3;4;34m.[0m
 +  [2;34m│[0m [2;3;34mIt can even contain [0m[1;2;3;34m[[0m[1;2;3;34m1[0m[2;3;34m;[0m[1;2;3;34m31[0m[2;3;34m;40minline code[0m[1;2;3;34m[[0m[2;3;34m0m and [0m[1;2;3;34m[[0m[1;2;3;34m1[0m[2;3;34m;[0m[1;2;3;34m4[0m[2;3;34m;34mlinks[0m[1;2;3;34m[[0m[2;3;34m0m[0m[1;2;3;34m[[0m[1;2;3;34m2[0m[2;3;34m;34m [0m
 +  [1;2;3;34m([0m[2;3;4;34mhttps://example.com[0m[2;3;4;34m)[0m[2;3;34m[0m[1;2;3;34m[[0m[2;3;34m0m.[0m
   [2;34m│[0m [2;3;34mThis is another blockquote to show multiple quotes.[0m
   [33m╭────────────────────────────────────────────────────────────────────────────╮[0m
   [33m│[0m [1;33m⚠️  Complex Warning[0m                                                         [33m│[0m
   [33m│[0m                                                                            [33m│[0m
 -  [33m│[0m This callout contains bold text, italic text, and inline code.             [33m│[0m
 +  [33m│[0m This callout contains [1mbold text[0m, [3mitalic text[0m, and              [33m│[0m
 +  [33m│[0m [1;31;40minline code[0m.                                                   [33m│[0m
   [33m│[0m                                                                            [33m│[0m
   [33m│[0m It can also contain:                                                       [33m│[0m
   [33m│[0m                                                                            [33m│[0m
 -  [33m│[0m • Bullet points • Multiple paragraphs • Even links (https://example.com)   [33m│[0m
 -  [33m│[0m ╭───────────────────────────────────────────────────────────────────────── [33m│[0m
 -  [33m│[0m ─╮ │ # And code blocks!                                                    [33m│[0m
 -  [33m│[0m │ │ def example():                                                         [33m│[0m
 -  [33m│[0m │ │     return "Hello from a callout!"                                     [33m│[0m
 -  [33m│[0m │                                                                          [33m│[0m
 -  [33m│[0m ╰───────────────────────────────────────────────────────────────────────── [33m│[0m
 -  [33m│[0m ─╯                                                                         [33m│[0m
 +  [33m│[0m [1;33m•[0m Bullet points [1;33m•[0m Multiple paragraphs [1;33m•[0m Even    [33m│[0m
 +  [33m│[0m [1;4;34mlinks[0m[2;34m (https://example.com)[0m                            [33m│[0m
 +  [33m│[0m [2m╭────────────────────────────────────────────────────────────────────── [33m│[0m
 +  [33m│[0m ────╮[0m [2m│[0m [2;49m# And code blocks![0m                               [33m│[0m
 +  [33m│[0m [2m│[0m [2m│[0m [94;49mdef[0m[90;49m [0m[92;49mexample[0m[49m():[0m        [33m│[0m
 +  [33m│[0m [2m│[0m [2m│[0m [49m    [0m[94;49mreturn[0m[49m [0m[33;49m"[0m[33;49mHello [33m│[0m
 +  [33m│[0m from a callout![0m[33;49m"[0m                                              [33m│[0m
 +  [33m│[0m [2m│[0m                                                                    [33m│[0m
 +  [33m│[0m [2m╰────────────────────────────────────────────────────────────────────── [33m│[0m
 +  [33m│[0m ────╯[0m                                                                   [33m│[0m
   [33m╰────────────────────────────────────────────────────────────────────────────╯[0m
   That's all folks!
 # ---
 # name: TestMarkdownFeatures.test_ordered_lists
   '''
 -  [1;36m1[0m[1;36m.[0m First numbered item
 -  [1;36m2[0m[1;36m.[0m Second numbered item
 -  [1;36m3[0m[1;36m.[0m Third numbered item with a link [1m([0m[4;94mhttps://example.com[0m[4;94m)[0m
 -  [1;36m4[0m[1;36m.[0m Fourth numbered item
 +  [1;36m1.[0m First numbered item
 +  [1;36m2.[0m Second numbered item
 +  [1;36m3.[0m Third numbered item with a [1;4;34mlink[0m[2;34m (https://example.com)[0m
 +  [1;36m4.[0m Fourth numbered item
   '''
 # ---
 # name: TestMarkdownFeatures.test_unordered_lists
   '''
   [1;33m•[0m First item
 -  [1;33m•[0m Second item with bold text
 -  [1;33m•[0m Third item with italic text
 -  [1;33m•[0m Fourth item with inline code
 +  [1;33m•[0m Second item with [1mbold text[0m
 +  [1;33m•[0m Third item with [3mitalic text[0m
 +  [1;33m•[0m Fourth item with [1;31;40minline code[0m
   '''
 # ---