Merge branch 'color-output-option' of https://github.com/studyingegret/mypy into color-output-option

Author: studyingegret

mypy/dmypy_server.py

@@ -199,22 +199,19 @@ def __init__(self, options: Options, status_file: str, timeout: int | None = Non
         # (details in https://github.com/python/mypy/issues/4492)
         options.local_partial_types = True
         self.status_file = status_file
-        
+
         # Type annotation needed for mypy (Pyright understands this)
         use_color: bool | Literal["auto"] = (
             True
             if util.should_force_color()
-            else (
-                "auto"
-                if options.color_output == "auto"
-                else cast(bool, options.color_output)
-            )
+            else ("auto" if options.color_output == "auto" else cast(bool, options.color_output))
         )
 
         # Since the object is created in the parent process we can check
         # the output terminal options here.
-        self.formatter = FancyFormatter(sys.stdout, sys.stderr, options.hide_error_codes,
-                                        color_request=use_color)
+        self.formatter = FancyFormatter(
+            sys.stdout, sys.stderr, options.hide_error_codes, color_request=use_color
+        )
 
     def _response_metadata(self) -> dict[str, str]:
         py_version = f"{self.options.python_version[0]}_{self.options.python_version[1]}"

mypy/main.py

@@ -11,7 +11,7 @@
 from collections.abc import Sequence
 from gettext import gettext
 from io import TextIOWrapper
-from typing import IO, TYPE_CHECKING, Any, Final, Literal, NoReturn, TextIO, Union, cast
+from typing import IO, TYPE_CHECKING, Any, Final, Literal, NoReturn, TextIO, cast
 
 from mypy import build, defaults, state, util
 from mypy.config_parser import (
@@ -94,15 +94,15 @@ def main(
     use_color: bool | Literal["auto"] = (
         True
         if util.should_force_color()
-        else (
-            "auto"
-            if options.color_output == "auto"
-            else cast(bool, options.color_output)
-        )
+        else ("auto" if options.color_output == "auto" else cast(bool, options.color_output))
     )
 
     formatter = util.FancyFormatter(
-        stdout, stderr, options.hide_error_codes, hide_success=bool(options.output), color_request=use_color
+        stdout,
+        stderr,
+        options.hide_error_codes,
+        hide_success=bool(options.output),
+        color_request=use_color,
     )
 
     if options.allow_redefinition_new and not options.local_partial_types:
@@ -198,8 +198,11 @@ def run_build(
     use_color: bool | Literal["auto"],
 ) -> tuple[build.BuildResult | None, list[str], bool]:
     formatter = util.FancyFormatter(
-        stdout, stderr, options.hide_error_codes, hide_success=bool(options.output),
-        color_request=use_color
+        stdout,
+        stderr,
+        options.hide_error_codes,
+        hide_success=bool(options.output),
+        color_request=use_color,
     )
 
     messages = []

mypy/util.py

@@ -12,7 +12,7 @@
 import time
 from collections.abc import Container, Iterable, Sequence, Sized
 from importlib import resources as importlib_resources
-from typing import IO, TYPE_CHECKING, Any, Callable, Final, Literal, TypeVar, cast
+from typing import IO, Any, Callable, Final, Literal, TypeVar
 
 orjson: Any
 try:
@@ -593,8 +593,12 @@ class FancyFormatter:
     """
 
     def __init__(
-        self, f_out: IO[str], f_err: IO[str], hide_error_codes: bool, hide_success: bool = False,
-        color_request: bool | Literal["auto"] = "auto"
+        self,
+        f_out: IO[str],
+        f_err: IO[str],
+        hide_error_codes: bool,
+        hide_success: bool = False,
+        color_request: bool | Literal["auto"] = "auto",
     ) -> None:
         self.hide_error_codes = hide_error_codes
         self.hide_success = hide_success
@@ -729,7 +733,7 @@ def style(
             start += self.UNDER
         if dim:
             start += self.DIM
-        #if TYPE_CHECKING:
+        # if TYPE_CHECKING:
         #    reveal_type(self.colors)
         return start + self.colors[color] + text + self.NORMAL