Merge pull request #4138 from Textualize/ansi-fix

always perform ansi filter

Author: willmcgugan

CHANGELOG.md

@@ -5,10 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## [0.49.1] - 2023-02-08
 
 ### Fixed
 
+- Fixed issue with ANSI colors not being converted to truecolor https://github.com/Textualize/textual/pull/4138
 - Fixed duplicate watch methods being attached to DOM nodes https://github.com/Textualize/textual/pull/4030
 - Fixed using `watch` to create additional watchers would trigger other watch methods https://github.com/Textualize/textual/issues/3878
 
@@ -1671,6 +1672,7 @@ https://textual.textualize.io/blog/2022/11/08/version-040/#version-040
 - New handler system for messages that doesn't require inheritance
 - Improved traceback handling
 
+[0.49.1]: https://github.com/Textualize/textual/compare/v0.49.0...v0.49.1
 [0.49.0]: https://github.com/Textualize/textual/compare/v0.48.2...v0.49.0
 [0.48.2]: https://github.com/Textualize/textual/compare/v0.48.1...v0.48.2
 [0.48.1]: https://github.com/Textualize/textual/compare/v0.48.0...v0.48.1

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "textual"
-version = "0.49.0"
+version = "0.49.1"
 homepage = "https://github.com/Textualize/textual"
 repository = "https://github.com/Textualize/textual"
 documentation = "https://textual.textualize.io/"

src/textual/app.py

@@ -94,6 +94,7 @@
 from .errors import NoWidget
 from .features import FeatureFlag, parse_features
 from .file_monitor import FileMonitor
+from .filter import ANSIToTruecolor, DimFilter, Monochrome
 from .geometry import Offset, Region, Size
 from .keys import (
     REPLACED_KEYS,
@@ -420,21 +421,17 @@ def __init__(
         super().__init__()
         self.features: frozenset[FeatureFlag] = parse_features(os.getenv("TEXTUAL", ""))
 
-        self._filters: list[LineFilter] = []
+        self._filters: list[LineFilter] = [
+            ANSIToTruecolor(terminal_theme.DIMMED_MONOKAI)
+        ]
         environ = dict(os.environ)
         no_color = environ.pop("NO_COLOR", None)
         if no_color is not None:
-            from .filter import ANSIToTruecolor, Monochrome
-
-            self._filters.append(ANSIToTruecolor(terminal_theme.DIMMED_MONOKAI))
             self._filters.append(Monochrome())
 
         for filter_name in constants.FILTERS.split(","):
             filter = filter_name.lower().strip()
             if filter == "dim":
-                from .filter import ANSIToTruecolor, DimFilter
-
-                self._filters.append(ANSIToTruecolor(terminal_theme.DIMMED_MONOKAI))
                 self._filters.append(DimFilter())
 
         self.console = Console(

src/textual/renderables/background_screen.py

@@ -2,13 +2,11 @@
 
 from typing import TYPE_CHECKING, Iterable
 
-from rich import terminal_theme
 from rich.console import Console, ConsoleOptions, RenderResult
 from rich.segment import Segment
 from rich.style import Style
 
 from ..color import Color
-from ..filter import ANSIToTruecolor
 
 if TYPE_CHECKING:
     from ..screen import Screen
@@ -51,17 +49,13 @@ def process_segments(
         _Segment = Segment
 
         NULL_STYLE = Style()
-        truecolor_style = ANSIToTruecolor(terminal_theme.DIMMED_MONOKAI).truecolor_style
+
         for segment in segments:
             text, style, control = segment
             if control:
                 yield segment
             else:
-                style = (
-                    NULL_STYLE
-                    if style is None
-                    else truecolor_style(style.clear_meta_and_links())
-                )
+                style = NULL_STYLE if style is None else style.clear_meta_and_links()
                 yield _Segment(
                     text,
                     (

src/textual/renderables/tint.py

@@ -2,13 +2,11 @@
 
 from typing import Iterable
 
-from rich import terminal_theme
 from rich.console import Console, ConsoleOptions, RenderableType, RenderResult
 from rich.segment import Segment
 from rich.style import Style
 
 from ..color import Color
-from ..filter import ANSIToTruecolor
 
 
 class Tint:
@@ -45,19 +43,13 @@ def process_segments(
         style_from_color = Style.from_color
         _Segment = Segment
 
-        ansi_filter = ANSIToTruecolor(terminal_theme.DIMMED_MONOKAI)
-
         NULL_STYLE = Style()
         for segment in segments:
             text, style, control = segment
             if control:
                 yield segment
             else:
-                style = (
-                    ansi_filter.truecolor_style(style)
-                    if style is not None
-                    else NULL_STYLE
-                )
+                style = style if style is not None else NULL_STYLE
                 yield _Segment(
                     text,
                     (