Merge branch 'main' of https://github.com/psf/black into black26

Signed-off-by: cobalt <[email protected]>

Author: cobaltt7

CHANGES.md

@@ -57,6 +57,7 @@ style.
   magic trailing commas and intentional multiline formatting (#4865)
 - Fix `fix_fmt_skip_in_one_liners` crashing on `with` statements (#4853)
 - Fix `fix_fmt_skip_in_one_liners` crashing on annotated parameters (#4854)
+- Fix new lines being added after imports with `# fmt: skip` on them (#4894)
 
 ### Packaging
 

tests/data/cases/composition_no_trailing_comma.py

@@ -181,8 +181,8 @@ def tricky_asserts(self) -> None:
         )
 
 
-# output
 
+# output
 
 class C:
     def test(self) -> None:

tests/data/cases/preview_long_strings__east_asian_width.py

@@ -54,4 +54,4 @@
             "km",
         ),  # Khmer
     ],
-]
+]