From: martin f. krafft <madduck@madduck.net>
Date: Fri, 20 Oct 2023 12:39:05 +0000 (+0200)
Subject: Merge commit '882d8795c6ff65c02f2657e596391748d1b6b7f5'
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/d1aee5f7fa136b1f0a7d8dfc318af81009074070?ds=sidebyside

Merge commit '882d8795c6ff65c02f2657e596391748d1b6b7f5'
---

d1aee5f7fa136b1f0a7d8dfc318af81009074070
diff --cc .vim/bundle/black/.git_archival.txt
index 00000000,8fb235d7..8fb235d7
mode 000000,100644..100644
--- a/.vim/bundle/black/.git_archival.txt
+++ b/.vim/bundle/black/.git_archival.txt
diff --cc .vim/bundle/black/.gitattributes
index 00000000,00a7b00c..00a7b00c
mode 000000,100644..100644
--- a/.vim/bundle/black/.gitattributes
+++ b/.vim/bundle/black/.gitattributes
diff --cc .vim/bundle/black/.github/dependabot.yml
index 00000000,325cb31a..325cb31a
mode 000000,100644..100644
--- a/.vim/bundle/black/.github/dependabot.yml
+++ b/.vim/bundle/black/.github/dependabot.yml
diff --cc .vim/bundle/black/.github/workflows/diff_shades.yml
index 00000000,97db907a..97db907a
mode 000000,100644..100644
--- a/.vim/bundle/black/.github/workflows/diff_shades.yml
+++ b/.vim/bundle/black/.github/workflows/diff_shades.yml
diff --cc .vim/bundle/black/.github/workflows/diff_shades_comment.yml
index 00000000,b86bd934..b86bd934
mode 000000,100644..100644
--- a/.vim/bundle/black/.github/workflows/diff_shades_comment.yml
+++ b/.vim/bundle/black/.github/workflows/diff_shades_comment.yml
diff --cc .vim/bundle/black/CITATION.cff
index 00000000,7ff0e3ca..7ff0e3ca
mode 000000,100644..100644
--- a/.vim/bundle/black/CITATION.cff
+++ b/.vim/bundle/black/CITATION.cff
diff --cc .vim/bundle/black/SECURITY.md
index 00000000,47049501..47049501
mode 000000,100644..100644
--- a/.vim/bundle/black/SECURITY.md
+++ b/.vim/bundle/black/SECURITY.md
diff --cc .vim/bundle/black/docs/contributing/index.md
index 00000000,3314c8ea..3314c8ea
mode 000000,100644..100644
--- a/.vim/bundle/black/docs/contributing/index.md
+++ b/.vim/bundle/black/docs/contributing/index.md
diff --cc .vim/bundle/black/docs/guides/index.md
index 00000000,127279b5..127279b5
mode 000000,100644..100644
--- a/.vim/bundle/black/docs/guides/index.md
+++ b/.vim/bundle/black/docs/guides/index.md
diff --cc .vim/bundle/black/docs/index.md
index 00000000,49a44ecc..49a44ecc
mode 000000,100644..100644
--- a/.vim/bundle/black/docs/index.md
+++ b/.vim/bundle/black/docs/index.md
diff --cc .vim/bundle/black/docs/integrations/index.md
index 00000000,33135d08..33135d08
mode 000000,100644..100644
--- a/.vim/bundle/black/docs/integrations/index.md
+++ b/.vim/bundle/black/docs/integrations/index.md
diff --cc .vim/bundle/black/docs/license.md
index 00000000,132c95bf..132c95bf
mode 000000,100644..100644
--- a/.vim/bundle/black/docs/license.md
+++ b/.vim/bundle/black/docs/license.md
diff --cc .vim/bundle/black/docs/the_black_code_style/index.md
index 00000000,1719347e..1719347e
mode 000000,100644..100644
--- a/.vim/bundle/black/docs/the_black_code_style/index.md
+++ b/.vim/bundle/black/docs/the_black_code_style/index.md
diff --cc .vim/bundle/black/docs/usage_and_configuration/black_docker_image.md
index 00000000,85aec91e..85aec91e
mode 000000,100644..100644
--- a/.vim/bundle/black/docs/usage_and_configuration/black_docker_image.md
+++ b/.vim/bundle/black/docs/usage_and_configuration/black_docker_image.md
diff --cc .vim/bundle/black/docs/usage_and_configuration/index.md
index 00000000,1c86a49b..1c86a49b
mode 000000,100644..100644
--- a/.vim/bundle/black/docs/usage_and_configuration/index.md
+++ b/.vim/bundle/black/docs/usage_and_configuration/index.md
diff --cc .vim/bundle/black/scripts/diff_shades_gha_helper.py
index 00000000,895516de..895516de
mode 000000,100644..100644
--- a/.vim/bundle/black/scripts/diff_shades_gha_helper.py
+++ b/.vim/bundle/black/scripts/diff_shades_gha_helper.py
diff --cc .vim/bundle/black/scripts/make_width_table.py
index 00000000,3c7cae60..3c7cae60
mode 000000,100644..100644
--- a/.vim/bundle/black/scripts/make_width_table.py
+++ b/.vim/bundle/black/scripts/make_width_table.py
diff --cc .vim/bundle/black/scripts/migrate-black.py
index 00000000,ff529394..ff529394
mode 000000,100755..100755
--- a/.vim/bundle/black/scripts/migrate-black.py
+++ b/.vim/bundle/black/scripts/migrate-black.py
diff --cc .vim/bundle/black/src/black/_width_table.py
index 00000000,f3304e48..f3304e48
mode 000000,100644..100644
--- a/.vim/bundle/black/src/black/_width_table.py
+++ b/.vim/bundle/black/src/black/_width_table.py
diff --cc .vim/bundle/black/src/blackd/__main__.py
index 00000000,b5a4b137..b5a4b137
mode 000000,100644..100644
--- a/.vim/bundle/black/src/blackd/__main__.py
+++ b/.vim/bundle/black/src/blackd/__main__.py
diff --cc .vim/bundle/black/tests/data/cases/attribute_access_on_number_literals.py
index 00000000,7c16bdfb..7c16bdfb
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/attribute_access_on_number_literals.py
+++ b/.vim/bundle/black/tests/data/cases/attribute_access_on_number_literals.py
diff --cc .vim/bundle/black/tests/data/cases/comments8.py
index 00000000,a2030c2a..a2030c2a
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/comments8.py
+++ b/.vim/bundle/black/tests/data/cases/comments8.py
diff --cc .vim/bundle/black/tests/data/cases/comments9.py
index 00000000,77b25556..77b25556
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/comments9.py
+++ b/.vim/bundle/black/tests/data/cases/comments9.py
diff --cc .vim/bundle/black/tests/data/cases/conditional_expression.py
index 00000000,c30cd76c..c30cd76c
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/conditional_expression.py
+++ b/.vim/bundle/black/tests/data/cases/conditional_expression.py
diff --cc .vim/bundle/black/tests/data/cases/docstring_no_extra_empty_line_before_eof.py
index 00000000,6fea860a..6fea860a
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/docstring_no_extra_empty_line_before_eof.py
+++ b/.vim/bundle/black/tests/data/cases/docstring_no_extra_empty_line_before_eof.py
diff --cc .vim/bundle/black/tests/data/cases/docstring_preview.py
index 00000000,ff4819ac..ff4819ac
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/docstring_preview.py
+++ b/.vim/bundle/black/tests/data/cases/docstring_preview.py
diff --cc .vim/bundle/black/tests/data/cases/docstring_preview_no_string_normalization.py
index 00000000,712c7364..712c7364
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/docstring_preview_no_string_normalization.py
+++ b/.vim/bundle/black/tests/data/cases/docstring_preview_no_string_normalization.py
diff --cc .vim/bundle/black/tests/data/cases/fmtonoff5.py
index 00000000,181151b6..181151b6
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/fmtonoff5.py
+++ b/.vim/bundle/black/tests/data/cases/fmtonoff5.py
diff --cc .vim/bundle/black/tests/data/cases/fmtpass_imports.py
index 00000000,8b3c0bc6..8b3c0bc6
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/fmtpass_imports.py
+++ b/.vim/bundle/black/tests/data/cases/fmtpass_imports.py
diff --cc .vim/bundle/black/tests/data/cases/fmtskip7.py
index 00000000,15ac0ad7..15ac0ad7
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/fmtskip7.py
+++ b/.vim/bundle/black/tests/data/cases/fmtskip7.py
diff --cc .vim/bundle/black/tests/data/cases/fmtskip8.py
index 00000000,38e9c2a9..38e9c2a9
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/fmtskip8.py
+++ b/.vim/bundle/black/tests/data/cases/fmtskip8.py
diff --cc .vim/bundle/black/tests/data/cases/funcdef_return_type_trailing_comma.py
index 00000000,9b9b9c67..9b9b9c67
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/funcdef_return_type_trailing_comma.py
+++ b/.vim/bundle/black/tests/data/cases/funcdef_return_type_trailing_comma.py
diff --cc .vim/bundle/black/tests/data/cases/ignore_pyi.py
index 00000000,4fae7530..4fae7530
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/ignore_pyi.py
+++ b/.vim/bundle/black/tests/data/cases/ignore_pyi.py
diff --cc .vim/bundle/black/tests/data/cases/linelength6.py
index 00000000,158038bf..158038bf
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/linelength6.py
+++ b/.vim/bundle/black/tests/data/cases/linelength6.py
diff --cc .vim/bundle/black/tests/data/cases/module_docstring_1.py
index 00000000,d5897b4d..d5897b4d
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/module_docstring_1.py
+++ b/.vim/bundle/black/tests/data/cases/module_docstring_1.py
diff --cc .vim/bundle/black/tests/data/cases/module_docstring_2.py
index 00000000,e1f81b4d..e1f81b4d
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/module_docstring_2.py
+++ b/.vim/bundle/black/tests/data/cases/module_docstring_2.py
diff --cc .vim/bundle/black/tests/data/cases/module_docstring_3.py
index 00000000,0631e136..0631e136
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/module_docstring_3.py
+++ b/.vim/bundle/black/tests/data/cases/module_docstring_3.py
diff --cc .vim/bundle/black/tests/data/cases/module_docstring_4.py
index 00000000,515174dc..515174dc
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/module_docstring_4.py
+++ b/.vim/bundle/black/tests/data/cases/module_docstring_4.py
diff --cc .vim/bundle/black/tests/data/cases/multiline_consecutive_open_parentheses_ignore.py
index 00000000,6ec8bb45..6ec8bb45
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/multiline_consecutive_open_parentheses_ignore.py
+++ b/.vim/bundle/black/tests/data/cases/multiline_consecutive_open_parentheses_ignore.py
diff --cc .vim/bundle/black/tests/data/cases/nested_stub.py
index 00000000,b81549ec..b81549ec
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/nested_stub.py
+++ b/.vim/bundle/black/tests/data/cases/nested_stub.py
diff --cc .vim/bundle/black/tests/data/cases/one_element_subscript.py
index 00000000,39205ba9..39205ba9
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/one_element_subscript.py
+++ b/.vim/bundle/black/tests/data/cases/one_element_subscript.py
diff --cc .vim/bundle/black/tests/data/cases/parenthesized_context_managers.py
index 00000000,16645a18..16645a18
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/parenthesized_context_managers.py
+++ b/.vim/bundle/black/tests/data/cases/parenthesized_context_managers.py
diff --cc .vim/bundle/black/tests/data/cases/pattern_matching_complex.py
index 00000000,10b4d26e..10b4d26e
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pattern_matching_complex.py
+++ b/.vim/bundle/black/tests/data/cases/pattern_matching_complex.py
diff --cc .vim/bundle/black/tests/data/cases/pattern_matching_extras.py
index 00000000,1e1481d7..1e1481d7
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pattern_matching_extras.py
+++ b/.vim/bundle/black/tests/data/cases/pattern_matching_extras.py
diff --cc .vim/bundle/black/tests/data/cases/pattern_matching_generic.py
index 00000000,4b4d45f0..4b4d45f0
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pattern_matching_generic.py
+++ b/.vim/bundle/black/tests/data/cases/pattern_matching_generic.py
diff --cc .vim/bundle/black/tests/data/cases/pattern_matching_simple.py
index 00000000,6fa2000f..6fa2000f
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pattern_matching_simple.py
+++ b/.vim/bundle/black/tests/data/cases/pattern_matching_simple.py
diff --cc .vim/bundle/black/tests/data/cases/pattern_matching_style.py
index 00000000,2ee6ea2b..2ee6ea2b
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pattern_matching_style.py
+++ b/.vim/bundle/black/tests/data/cases/pattern_matching_style.py
diff --cc .vim/bundle/black/tests/data/cases/pep604_union_types_line_breaks.py
index 00000000,fee2b840..fee2b840
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pep604_union_types_line_breaks.py
+++ b/.vim/bundle/black/tests/data/cases/pep604_union_types_line_breaks.py
diff --cc .vim/bundle/black/tests/data/cases/pep_572_py310.py
index 00000000,9f999dee..9f999dee
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pep_572_py310.py
+++ b/.vim/bundle/black/tests/data/cases/pep_572_py310.py
diff --cc .vim/bundle/black/tests/data/cases/pep_604.py
index 00000000,b68d59d6..b68d59d6
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pep_604.py
+++ b/.vim/bundle/black/tests/data/cases/pep_604.py
diff --cc .vim/bundle/black/tests/data/cases/pep_646.py
index 00000000,92b568a3..92b568a3
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pep_646.py
+++ b/.vim/bundle/black/tests/data/cases/pep_646.py
diff --cc .vim/bundle/black/tests/data/cases/pep_654.py
index 00000000,12e49180..12e49180
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pep_654.py
+++ b/.vim/bundle/black/tests/data/cases/pep_654.py
diff --cc .vim/bundle/black/tests/data/cases/pep_654_style.py
index 00000000,0d34650e..0d34650e
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/pep_654_style.py
+++ b/.vim/bundle/black/tests/data/cases/pep_654_style.py
diff --cc .vim/bundle/black/tests/data/cases/power_op_newline.py
index 00000000,d9b31403..d9b31403
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/power_op_newline.py
+++ b/.vim/bundle/black/tests/data/cases/power_op_newline.py
diff --cc .vim/bundle/black/tests/data/cases/power_op_spacing.py
index 00000000,b3ef0aae..b3ef0aae
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/power_op_spacing.py
+++ b/.vim/bundle/black/tests/data/cases/power_op_spacing.py
diff --cc .vim/bundle/black/tests/data/cases/prefer_rhs_split_reformatted.py
index 00000000,e15e5ddc..e15e5ddc
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/prefer_rhs_split_reformatted.py
+++ b/.vim/bundle/black/tests/data/cases/prefer_rhs_split_reformatted.py
diff --cc .vim/bundle/black/tests/data/cases/preview_async_stmts.py
index 00000000,0a7671be..0a7671be
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_async_stmts.py
+++ b/.vim/bundle/black/tests/data/cases/preview_async_stmts.py
diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_38.py
index 00000000,719d94fd..719d94fd
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_context_managers_38.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_38.py
diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_39.py
index 00000000,589e00ad..589e00ad
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_context_managers_39.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_39.py
diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_310.py
index 00000000,a9e31076..a9e31076
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_310.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_310.py
diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_311.py
index 00000000,af1e83fe..af1e83fe
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_311.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_311.py
diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_38.py
index 00000000,25217a40..25217a40
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_38.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_38.py
diff --cc .vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_39.py
index 00000000,3f72e48d..3f72e48d
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_39.py
+++ b/.vim/bundle/black/tests/data/cases/preview_context_managers_autodetect_39.py
diff --cc .vim/bundle/black/tests/data/cases/preview_dummy_implementations.py
index 00000000,98b69bf8..98b69bf8
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_dummy_implementations.py
+++ b/.vim/bundle/black/tests/data/cases/preview_dummy_implementations.py
diff --cc .vim/bundle/black/tests/data/cases/preview_format_unicode_escape_seq.py
index 00000000,65c3d8d1..65c3d8d1
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_format_unicode_escape_seq.py
+++ b/.vim/bundle/black/tests/data/cases/preview_format_unicode_escape_seq.py
diff --cc .vim/bundle/black/tests/data/cases/preview_long_dict_values.py
index 00000000,fbbacd13..fbbacd13
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_long_dict_values.py
+++ b/.vim/bundle/black/tests/data/cases/preview_long_dict_values.py
diff --cc .vim/bundle/black/tests/data/cases/preview_long_strings__east_asian_width.py
index 00000000,d190f422..d190f422
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_long_strings__east_asian_width.py
+++ b/.vim/bundle/black/tests/data/cases/preview_long_strings__east_asian_width.py
diff --cc .vim/bundle/black/tests/data/cases/preview_long_strings__type_annotations.py
index 00000000,8beb877b..8beb877b
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_long_strings__type_annotations.py
+++ b/.vim/bundle/black/tests/data/cases/preview_long_strings__type_annotations.py
diff --cc .vim/bundle/black/tests/data/cases/preview_multiline_strings.py
index 00000000,3ff64361..3ff64361
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_multiline_strings.py
+++ b/.vim/bundle/black/tests/data/cases/preview_multiline_strings.py
diff --cc .vim/bundle/black/tests/data/cases/preview_no_blank_line_before_docstring.py
index 00000000,303035a7..303035a7
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_no_blank_line_before_docstring.py
+++ b/.vim/bundle/black/tests/data/cases/preview_no_blank_line_before_docstring.py
diff --cc .vim/bundle/black/tests/data/cases/preview_pep_572.py
index 00000000,8e801ff6..8e801ff6
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_pep_572.py
+++ b/.vim/bundle/black/tests/data/cases/preview_pep_572.py
diff --cc .vim/bundle/black/tests/data/cases/preview_power_op_spacing.py
index 00000000,650c6fec..650c6fec
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_power_op_spacing.py
+++ b/.vim/bundle/black/tests/data/cases/preview_power_op_spacing.py
diff --cc .vim/bundle/black/tests/data/cases/preview_prefer_rhs_split.py
index 00000000,c732c33b..c732c33b
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_prefer_rhs_split.py
+++ b/.vim/bundle/black/tests/data/cases/preview_prefer_rhs_split.py
diff --cc .vim/bundle/black/tests/data/cases/preview_return_annotation_brackets_string.py
index 00000000,fea0ea68..fea0ea68
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_return_annotation_brackets_string.py
+++ b/.vim/bundle/black/tests/data/cases/preview_return_annotation_brackets_string.py
diff --cc .vim/bundle/black/tests/data/cases/preview_trailing_comma.py
index 00000000,bba7e7ad..bba7e7ad
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/preview_trailing_comma.py
+++ b/.vim/bundle/black/tests/data/cases/preview_trailing_comma.py
diff --cc .vim/bundle/black/tests/data/cases/py310_pep572.py
index 00000000,172be389..172be389
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/py310_pep572.py
+++ b/.vim/bundle/black/tests/data/cases/py310_pep572.py
diff --cc .vim/bundle/black/tests/data/cases/remove_await_parens.py
index 00000000,8c7223d2..8c7223d2
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/remove_await_parens.py
+++ b/.vim/bundle/black/tests/data/cases/remove_await_parens.py
diff --cc .vim/bundle/black/tests/data/cases/remove_except_parens.py
index 00000000,322c5b7a..322c5b7a
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/remove_except_parens.py
+++ b/.vim/bundle/black/tests/data/cases/remove_except_parens.py
diff --cc .vim/bundle/black/tests/data/cases/remove_for_brackets.py
index 00000000,cd534046..cd534046
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/remove_for_brackets.py
+++ b/.vim/bundle/black/tests/data/cases/remove_for_brackets.py
diff --cc .vim/bundle/black/tests/data/cases/remove_newline_after_code_block_open.py
index 00000000,ef2e5c2f..ef2e5c2f
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/remove_newline_after_code_block_open.py
+++ b/.vim/bundle/black/tests/data/cases/remove_newline_after_code_block_open.py
diff --cc .vim/bundle/black/tests/data/cases/remove_newline_after_match.py
index 00000000,fe6592b6..fe6592b6
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/remove_newline_after_match.py
+++ b/.vim/bundle/black/tests/data/cases/remove_newline_after_match.py
diff --cc .vim/bundle/black/tests/data/cases/remove_with_brackets.py
index 00000000,3ee64902..3ee64902
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/remove_with_brackets.py
+++ b/.vim/bundle/black/tests/data/cases/remove_with_brackets.py
diff --cc .vim/bundle/black/tests/data/cases/return_annotation_brackets.py
index 00000000,8509ecdb..8509ecdb
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/return_annotation_brackets.py
+++ b/.vim/bundle/black/tests/data/cases/return_annotation_brackets.py
diff --cc .vim/bundle/black/tests/data/cases/skip_magic_trailing_comma.py
index 00000000,4dda5df4..4dda5df4
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/skip_magic_trailing_comma.py
+++ b/.vim/bundle/black/tests/data/cases/skip_magic_trailing_comma.py
diff --cc .vim/bundle/black/tests/data/cases/starred_for_target.py
index 00000000,13e51781..13e51781
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/starred_for_target.py
+++ b/.vim/bundle/black/tests/data/cases/starred_for_target.py
diff --cc .vim/bundle/black/tests/data/cases/stub.py
index 00000000,f3828d55..f3828d55
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/stub.py
+++ b/.vim/bundle/black/tests/data/cases/stub.py
diff --cc .vim/bundle/black/tests/data/cases/torture.py
index 00000000,2a194759..2a194759
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/torture.py
+++ b/.vim/bundle/black/tests/data/cases/torture.py
diff --cc .vim/bundle/black/tests/data/cases/trailing_comma_optional_parens1.py
index 00000000,85aa8bad..85aa8bad
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/trailing_comma_optional_parens1.py
+++ b/.vim/bundle/black/tests/data/cases/trailing_comma_optional_parens1.py
diff --cc .vim/bundle/black/tests/data/cases/trailing_comma_optional_parens2.py
index 00000000,9541670e..9541670e
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/trailing_comma_optional_parens2.py
+++ b/.vim/bundle/black/tests/data/cases/trailing_comma_optional_parens2.py
diff --cc .vim/bundle/black/tests/data/cases/trailing_comma_optional_parens3.py
index 00000000,c0ed699e..c0ed699e
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/trailing_comma_optional_parens3.py
+++ b/.vim/bundle/black/tests/data/cases/trailing_comma_optional_parens3.py
diff --cc .vim/bundle/black/tests/data/cases/trailing_commas_in_leading_parts.py
index 00000000,99d82a67..99d82a67
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/trailing_commas_in_leading_parts.py
+++ b/.vim/bundle/black/tests/data/cases/trailing_commas_in_leading_parts.py
diff --cc .vim/bundle/black/tests/data/cases/type_aliases.py
index 00000000,7c2009e8..7c2009e8
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/type_aliases.py
+++ b/.vim/bundle/black/tests/data/cases/type_aliases.py
diff --cc .vim/bundle/black/tests/data/cases/type_comment_syntax_error.py
index 00000000,2e5ca2ed..2e5ca2ed
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/type_comment_syntax_error.py
+++ b/.vim/bundle/black/tests/data/cases/type_comment_syntax_error.py
diff --cc .vim/bundle/black/tests/data/cases/type_params.py
index 00000000,720a775e..720a775e
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/type_params.py
+++ b/.vim/bundle/black/tests/data/cases/type_params.py
diff --cc .vim/bundle/black/tests/data/cases/whitespace.py
index 00000000,a319c011..a319c011
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/cases/whitespace.py
+++ b/.vim/bundle/black/tests/data/cases/whitespace.py
diff --cc .vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/.gitignore
index 00000000,2987e7bb..2987e7bb
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/.gitignore
+++ b/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/.gitignore
diff --cc .vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir1/b.py
index 00000000,e69de29b..e69de29b
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir1/b.py
+++ b/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir1/b.py
diff --cc .vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir2/a.py
index 00000000,e69de29b..e69de29b
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir2/a.py
+++ b/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir2/a.py
diff --cc .vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir2/b.py
index 00000000,e69de29b..e69de29b
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir2/b.py
+++ b/.vim/bundle/black/tests/data/gitignore_used_on_multiple_sources/dir2/b.py
diff --cc .vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/a.py
index 00000000,e69de29b..e69de29b
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/a.py
+++ b/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/a.py
diff --cc .vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/.gitignore
index 00000000,150f68c8..150f68c8
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/.gitignore
+++ b/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/.gitignore
diff --cc .vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/b.py
index 00000000,e69de29b..e69de29b
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/b.py
+++ b/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/b.py
diff --cc .vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/subdir/c.py
index 00000000,e69de29b..e69de29b
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/subdir/c.py
+++ b/.vim/bundle/black/tests/data/ignore_subfolders_gitignore_tests/subdir/subdir/c.py
diff --cc .vim/bundle/black/tests/data/miscellaneous/invalid_header.py
index 00000000,fb49e2f9..fb49e2f9
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/miscellaneous/invalid_header.py
+++ b/.vim/bundle/black/tests/data/miscellaneous/invalid_header.py
diff --cc .vim/bundle/black/tests/data/miscellaneous/pattern_matching_invalid.py
index 00000000,22b5b94c..22b5b94c
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/miscellaneous/pattern_matching_invalid.py
+++ b/.vim/bundle/black/tests/data/miscellaneous/pattern_matching_invalid.py
diff --cc .vim/bundle/black/tests/data/miscellaneous/python2_detection.py
index 00000000,8de2bb58..8de2bb58
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/miscellaneous/python2_detection.py
+++ b/.vim/bundle/black/tests/data/miscellaneous/python2_detection.py
diff --cc .vim/bundle/black/tests/data/project_metadata/both_pyproject.toml
index 00000000,cf8f148f..cf8f148f
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/project_metadata/both_pyproject.toml
+++ b/.vim/bundle/black/tests/data/project_metadata/both_pyproject.toml
diff --cc .vim/bundle/black/tests/data/project_metadata/neither_pyproject.toml
index 00000000,67623d22..67623d22
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/project_metadata/neither_pyproject.toml
+++ b/.vim/bundle/black/tests/data/project_metadata/neither_pyproject.toml
diff --cc .vim/bundle/black/tests/data/project_metadata/only_black_pyproject.toml
index 00000000,94058bb3..94058bb3
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/project_metadata/only_black_pyproject.toml
+++ b/.vim/bundle/black/tests/data/project_metadata/only_black_pyproject.toml
diff --cc .vim/bundle/black/tests/data/project_metadata/only_metadata_pyproject.toml
index 00000000,1c8cdbb3..1c8cdbb3
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/project_metadata/only_metadata_pyproject.toml
+++ b/.vim/bundle/black/tests/data/project_metadata/only_metadata_pyproject.toml
diff --cc .vim/bundle/black/tests/data/raw_docstring.py
index 00000000,751fd320..751fd320
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/data/raw_docstring.py
+++ b/.vim/bundle/black/tests/data/raw_docstring.py
diff --cc .vim/bundle/black/tests/test_trans.py
index 00000000,784e852e..784e852e
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/test_trans.py
+++ b/.vim/bundle/black/tests/test_trans.py