Fix merging implicit multiline strings that have inline comments (#3956)

[etc/vim.git] / src / black / concurrency.py

diff --git a/src/black/concurrency.py b/src/black/concurrency.py
index 893eba6675a738a7b1eab2471075caa87130430a..55c96b66c86e14fb4fb4b2a8f5aef54aa0e34dd3 100644 (file)
--- a/src/black/concurrency.py
+++ b/src/black/concurrency.py
@@ -9,6 +9,7 @@ import logging
 import os
 import signal
 import sys
 import os
 import signal
 import sys

+import traceback

 from concurrent.futures import Executor, ProcessPoolExecutor, ThreadPoolExecutor
 from multiprocessing import Manager
 from pathlib import Path
 from concurrent.futures import Executor, ProcessPoolExecutor, ThreadPoolExecutor
 from multiprocessing import Manager
 from pathlib import Path


@@ -17,7 +18,7 @@ from typing import Any, Iterable, Optional, Set
 from mypy_extensions import mypyc_attr
 
 from black import WriteBack, format_file_in_place
 from mypy_extensions import mypyc_attr
 
 from black import WriteBack, format_file_in_place

-from black.cache import Cache, filter_cached, read_cache, write_cache
+from black.cache import Cache

 from black.mode import Mode
 from black.output import err
 from black.report import Changed, Report
 from black.mode import Mode
 from black.output import err
 from black.report import Changed, Report


@@ -133,10 +134,9 @@ async def schedule_formatting(
     `write_back`, `fast`, and `mode` options are passed to
     :func:`format_file_in_place`.
     """
     `write_back`, `fast`, and `mode` options are passed to
     :func:`format_file_in_place`.
     """

-    cache: Cache = {}
+    cache = Cache.read(mode)

     if write_back not in (WriteBack.DIFF, WriteBack.COLOR_DIFF):
     if write_back not in (WriteBack.DIFF, WriteBack.COLOR_DIFF):

-        cache = read_cache(mode)
-        sources, cached = filter_cached(cache, sources)
+        sources, cached = cache.filtered_cached(sources)

         for src in sorted(cached):
             report.done(src, Changed.CACHED)
     if not sources:
         for src in sorted(cached):
             report.done(src, Changed.CACHED)
     if not sources:


@@ -171,8 +171,10 @@ async def schedule_formatting(
             src = tasks.pop(task)
             if task.cancelled():
                 cancelled.append(task)
             src = tasks.pop(task)
             if task.cancelled():
                 cancelled.append(task)

-            elif task.exception():
-                report.failed(src, str(task.exception()))
+            elif exc := task.exception():
+                if report.verbose:
+                    traceback.print_exception(type(exc), exc, exc.__traceback__)
+                report.failed(src, str(exc))

             else:
                 changed = Changed.YES if task.result() else Changed.NO
                 # If the file was written back or was successfully checked as
             else:
                 changed = Changed.YES if task.result() else Changed.NO
                 # If the file was written back or was successfully checked as


@@ -185,4 +187,4 @@ async def schedule_formatting(
     if cancelled:
         await asyncio.gather(*cancelled, return_exceptions=True)
     if sources_to_cache:
     if cancelled:
         await asyncio.gather(*cancelled, return_exceptions=True)
     if sources_to_cache:

-        write_cache(cache, sources_to_cache, mode)
+        cache.write(sources_to_cache)