Fix type errors

Author: studyingegret

mypy/dmypy_server.py

@@ -21,6 +21,7 @@
 from typing import Any, Callable, Final
 from typing_extensions import TypeAlias as _TypeAlias
 
+from mypy import util
 import mypy.build
 import mypy.errors
 import mypy.main
@@ -841,7 +842,9 @@ def pretty_messages(
         is_tty: bool = False,
         terminal_width: int | None = None,
     ) -> list[str]:
-        use_color = self.options.color_output and is_tty
+        use_color = (True if util.should_force_color()
+                     else self.formatter.default_colored if self.options.color_output == "auto"
+                     else bool(self.options.color_output))
         fit_width = self.options.pretty and is_tty
         if fit_width:
             messages = self.formatter.fit_in_terminal(

mypy/main.py

@@ -137,7 +137,7 @@ def main(
             install_types(formatter, options, after_run=True, non_interactive=True)
             fscache.flush()
             print()
-            res, messages, blockers = run_build(sources, options, fscache, t0, stdout, stderr)
+            res, messages, blockers = run_build(sources, options, fscache, t0, stdout, stderr, use_color)
         show_messages(messages, stderr, formatter, options, use_color)
 
     if MEM_PROFILE:
@@ -469,7 +469,8 @@ def __call__(
 
 # Coupled with the usage in define_options
 class ColorOutputAction(argparse.Action):
-    def __call__(self, parser, namespace, values, option_string=None):
+    def __call__(self, parser: argparse.ArgumentParser, namespace: argparse.Namespace,
+                 values: str | Sequence[Any] | None, option_string: str | None = None) -> None:
         assert values in ("auto", None)
         print(f"{values=}")
         setattr(namespace, self.dest, True if values is None else "auto")

mypy/test/test_color_output.py

@@ -1,11 +1,14 @@
 from subprocess import run, PIPE
 from functools import partial
 from typing import Any
+import pytest
 
 # TODO Would like help with this test, how do I make it runnable?
 
 def test(expect_color: bool, *args: Any, **kwargs: Any) -> None:
-    res = run(*args, stdout=PIPE, stderr=PIPE, **kwargs)
+    res = run(*args, stdout=PIPE, stderr=PIPE, **kwargs) #type:ignore[call-overload]
+    if "Found" not in res.stdout: #??
+        pytest.fail("Command failed to complete or did not detect type error")
     if expect_color: # Expect color control chars
         assert "<string>:1: error:" not in res.stdout
         assert "\nFound" not in res.stdout
@@ -16,15 +19,16 @@ def test(expect_color: bool, *args: Any, **kwargs: Any) -> None:
 colored = partial(test, True)
 not_colored = partial(test, False)
 
-def test_color_output() -> None:
+@pytest.mark.parametrize("command", ["mypy", "dmypy run --"])
+def test_color_output(command: str) -> None:
     # Note: Though we don't check stderr, capturing it is useful
     # because it provides traceback if mypy crashes due to exception
     # and pytest reveals it upon failure (?)
-    not_colored("mypy -c \"1+'a'\"")
-    colored("mypy -c \"1+'a'\"", env={"MYPY_FORCE_COLOR": "1"})
-    colored("mypy -c \"1+'a'\" --color-output")
-    not_colored("mypy -c \"1+'a'\" --no-color-output")
-    colored("mypy -c \"1+'a'\" --no-color-output", env={"MYPY_FORCE_COLOR": "1"}) #TODO
+    not_colored(f"{command} -c \"1+'a'\"")
+    colored(f"{command} -c \"1+'a'\"", env={"MYPY_FORCE_COLOR": "1"})
+    colored(f"{command} -c \"1+'a'\" --color-output")
+    not_colored(f"{command} -c \"1+'a'\" --no-color-output")
+    colored(f"{command} -c \"1+'a'\" --no-color-output", env={"MYPY_FORCE_COLOR": "1"}) #TODO
 
 # TODO: Tests in the terminal (require manual testing?)
 """