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 0000000,8fb235d..8fb235d
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 0000000,00a7b00..00a7b00
mode 000000,100644..100644
--- a/.vim/bundle/black/.gitattributes
+++ b/.vim/bundle/black/.gitattributes
diff --cc .vim/bundle/black/.github/dependabot.yml
index 0000000,325cb31..325cb31
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 0000000,97db907..97db907
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 0000000,b86bd93..b86bd93
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 0000000,7ff0e3c..7ff0e3c
mode 000000,100644..100644
--- a/.vim/bundle/black/CITATION.cff
+++ b/.vim/bundle/black/CITATION.cff
diff --cc .vim/bundle/black/SECURITY.md
index 0000000,4704950..4704950
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 0000000,3314c8e..3314c8e
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 0000000,127279b..127279b
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 0000000,49a44ec..49a44ec
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 0000000,33135d0..33135d0
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 0000000,132c95b..132c95b
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 0000000,1719347..1719347
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 0000000,85aec91..85aec91
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 0000000,1c86a49..1c86a49
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 0000000,895516d..895516d
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 0000000,3c7cae6..3c7cae6
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 0000000,ff52939..ff52939
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 0000000,f3304e4..f3304e4
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 0000000,b5a4b13..b5a4b13
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 0000000,7c16bdf..7c16bdf
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 0000000,a2030c2..a2030c2
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 0000000,77b2555..77b2555
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 0000000,c30cd76..c30cd76
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 0000000,6fea860..6fea860
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 0000000,ff4819a..ff4819a
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 0000000,712c736..712c736
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 0000000,181151b..181151b
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 0000000,8b3c0bc..8b3c0bc
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 0000000,15ac0ad..15ac0ad
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 0000000,38e9c2a..38e9c2a
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 0000000,9b9b9c6..9b9b9c6
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 0000000,4fae753..4fae753
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 0000000,158038b..158038b
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 0000000,d5897b4..d5897b4
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 0000000,e1f81b4..e1f81b4
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 0000000,0631e13..0631e13
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 0000000,515174d..515174d
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 0000000,6ec8bb4..6ec8bb4
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 0000000,b81549e..b81549e
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 0000000,39205ba..39205ba
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 0000000,16645a1..16645a1
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 0000000,10b4d26..10b4d26
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 0000000,1e1481d..1e1481d
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 0000000,4b4d45f..4b4d45f
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 0000000,6fa2000..6fa2000
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 0000000,2ee6ea2..2ee6ea2
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 0000000,fee2b84..fee2b84
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 0000000,9f999de..9f999de
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 0000000,b68d59d..b68d59d
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 0000000,92b568a..92b568a
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 0000000,12e4918..12e4918
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 0000000,0d34650..0d34650
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 0000000,d9b3140..d9b3140
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 0000000,b3ef0aa..b3ef0aa
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 0000000,e15e5dd..e15e5dd
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 0000000,0a7671b..0a7671b
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 0000000,719d94f..719d94f
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 0000000,589e00a..589e00a
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 0000000,a9e3107..a9e3107
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 0000000,af1e83f..af1e83f
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 0000000,25217a4..25217a4
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 0000000,3f72e48..3f72e48
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 0000000,98b69bf..98b69bf
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 0000000,65c3d8d..65c3d8d
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 0000000,fbbacd1..fbbacd1
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 0000000,d190f42..d190f42
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 0000000,8beb877..8beb877
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 0000000,3ff6436..3ff6436
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 0000000,303035a..303035a
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 0000000,8e801ff..8e801ff
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 0000000,650c6fe..650c6fe
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 0000000,c732c33..c732c33
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 0000000,fea0ea6..fea0ea6
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 0000000,bba7e7a..bba7e7a
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 0000000,172be38..172be38
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 0000000,8c7223d..8c7223d
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 0000000,322c5b7..322c5b7
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 0000000,cd53404..cd53404
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 0000000,ef2e5c2..ef2e5c2
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 0000000,fe6592b..fe6592b
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 0000000,3ee6490..3ee6490
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 0000000,8509ecd..8509ecd
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 0000000,4dda5df..4dda5df
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 0000000,13e5178..13e5178
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 0000000,f3828d5..f3828d5
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 0000000,2a19475..2a19475
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 0000000,85aa8ba..85aa8ba
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 0000000,9541670..9541670
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 0000000,c0ed699..c0ed699
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 0000000,99d82a6..99d82a6
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 0000000,7c2009e..7c2009e
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 0000000,2e5ca2e..2e5ca2e
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 0000000,720a775..720a775
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 0000000,a319c01..a319c01
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 0000000,2987e7b..2987e7b
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 0000000,e69de29..e69de29
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 0000000,e69de29..e69de29
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 0000000,e69de29..e69de29
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 0000000,e69de29..e69de29
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 0000000,150f68c..150f68c
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 0000000,e69de29..e69de29
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 0000000,e69de29..e69de29
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 0000000,fb49e2f..fb49e2f
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 0000000,22b5b94..22b5b94
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 0000000,8de2bb5..8de2bb5
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 0000000,cf8f148..cf8f148
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 0000000,67623d2..67623d2
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 0000000,94058bb..94058bb
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 0000000,1c8cdbb..1c8cdbb
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 0000000,751fd32..751fd32
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 0000000,784e852..784e852
mode 000000,100644..100644
--- a/.vim/bundle/black/tests/test_trans.py
+++ b/.vim/bundle/black/tests/test_trans.py