Don't omit escaping the second consecutive quote

This would produce invalid code for strings like `"x = ''; y = \"\""`.

diff --git a/black.py b/black.py
index c7cfa2f2ec6c03cb5bb92fb6476dcaf545ac3ea0..9581d63ea18cdbdd4c843a6a9350666c6b3a8e67 100644 (file)
--- a/black.py
+++ b/black.py
@@ -1998,6 +1998,9 @@ def normalize_string_quotes(leaf: Leaf) -> None:
     else:
         new_body = escaped_orig_quote.sub(rf"\1{orig_quote}", body)
         new_body = unescaped_new_quote.sub(rf"\1\\{new_quote}", new_body)
     else:
         new_body = escaped_orig_quote.sub(rf"\1{orig_quote}", body)
         new_body = unescaped_new_quote.sub(rf"\1\\{new_quote}", new_body)

+        # Add escapes again for consecutive occurences of new_quote (sub
+        # doesn't match overlapping substrings).
+        new_body = unescaped_new_quote.sub(rf"\1\\{new_quote}", new_body)

     if new_quote == '"""' and new_body[-1] == '"':
         # edge case:
         new_body = new_body[:-1] + '\\"'
     if new_quote == '"""' and new_body[-1] == '"':
         # edge case:
         new_body = new_body[:-1] + '\\"'

diff --git a/tests/string_quotes.py b/tests/string_quotes.py
index 1532a7ab74c5ce8b3fb2e9081b1a89f880308aea..8ccd041b1aac5ff9f569d5d5dcdc1177bc7dc9ec 100644 (file)
--- a/tests/string_quotes.py
+++ b/tests/string_quotes.py
@@ -30,6 +30,14 @@ jumps over\n\
 the \'lazy\' dog.\n\
 '
 re.compile(r'[\\"]')
 the \'lazy\' dog.\n\
 '
 re.compile(r'[\\"]')

+"x = ''; y = \"\""
+"x = '''; y = \"\""
+"x = ''''; y = \"\""
+"x = '' ''; y = \"\""
+"x = ''; y = \"\"\""
+"x = '''; y = \"\"\"\""
+"x = ''''; y = \"\"\"\"\""
+"x = '' ''; y = \"\"\"\"\""

 
 # output
 
 
 # output
 


@@ -65,3 +73,11 @@ jumps over\n\
 the 'lazy' dog.\n\
 "
 re.compile(r'[\\"]')
 the 'lazy' dog.\n\
 "
 re.compile(r'[\\"]')

+"x = ''; y = \"\""
+"x = '''; y = \"\""
+"x = ''''; y = \"\""
+"x = '' ''; y = \"\""
+'x = \'\'; y = """'
+'x = \'\'\'; y = """"'
+'x = \'\'\'\'; y = """""'
+'x = \'\' \'\'; y = """""'