Prefer breaking the implicit string concatenation over breaking before % (#5947)

2025-09-26 11:59:10 +00:00 · 2023-07-24 18:30:42 +02:00 · 2023-07-24 18:30:42 +02:00 · fdb3c8852f
commit fdb3c8852f
parent 42d969f19f
5 changed files with 637 additions and 80 deletions
--- a/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/binary_implicit_string.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/binary_implicit_string.py
@ -0,0 +1,120 @@
+
+raise ImproperlyConfigured(
+    "The app module %r has multiple filesystem locations (%r); "
+    "you must configure this app with an AppConfig subclass "
+    "with a 'path' class attr                               ibute." % (module, paths)
+)
+
+raise ImproperlyConfigured(
+    "The app module %r has multiple filesystem locations (%r); "
+    "you must configure this app with an AppConfig subclass "
+    "with a 'path' class attr                               ibute."
+    %
+    # comment
+    (module, paths)
+)
+
+# Only important in parenthesized context because implicit string continuation otherwise doesn't expand
+"The app module %r has multiple filesystem locations (%r); " "you must configure this app with an AppConfig subclass " "with a 'path' class attribute." % (
+    module,
+    paths,
+)
+
+("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" "cccccccccccccccccccccccccccccccccccccccccccc" % (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, b, c, d))
+("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" "cccccccccccccccccccccccccccccccccccccccccccc" % aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)
+
+def test():
+    return (
+        "\n%(modified_count)s %(identifier)s %(action)s"
+        "%(destination)s%(unmodified)s%(post_processed)s."
+    ) % {
+        "modified_count": modified_count,
+        "identifier": "static file" + ("" if modified_count == 1 else "s"),
+        "action": "symlinked" if self.symlink else "copied",
+        "destination": (" to '%s'" % destination_path if destination_path else ""),
+        "unmodified": (
+            ", %s unmodified" % unmodified_count if collected["unmodified"] else ""
+        ),
+        "post_processed": (
+            collected["post_processed"]
+            and ", %s post-processed" % post_processed_count
+            or ""
+        ),
+    }
+
+# trailing expression comment
+self._assert_skipping(
+    SkipTestCase("test_foo").test_foo,
+    ValueError,
+    "skipUnlessDBFeature cannot be used on test_foo (test_utils.tests."
+    "SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase%s) "
+    "as SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase "
+    "doesn't allow queries against the 'default' database."
+    # Python 3.11 uses fully qualified test name in the output.
+    % (".test_foo" if PY311 else ""),
+    )
+
+# dangling operator comment
+self._assert_skipping(
+    SkipTestCase("test_foo").test_foo,
+    ValueError,
+    "skipUnlessDBFeature cannot be used on test_foo (test_utils.tests."
+    "SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase%s) "
+    "as SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase "
+    "doesn't allow queries against the 'default' database."
+    % # Python 3.11 uses fully qualified test name in the output.
+    (".test_foo" if PY311 else ""),
+    )
+
+# Black keeps as many operands as fit on the same line as the `%`. Ruff does not. This is intentional as these are rare and complicated things significantly
+(
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    "bbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    "cccccccccccccccccccccccccc"
+    % aaaaaaaaaaaa
+    + x
+)
+
+(
+    b + c + d +
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    "bbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    "cccccccccccccccccccccccccc"
+    % aaaaaaaaaaaa
+    + x
+)
+
+(
+    b < c > d <
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    "bbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+    "cccccccccccccccccccccccccc"
+    % aaaaaaaaaaaa
+    > x
+)
+
+
+self.assertEqual(
+    response.status_code,
+    status_code,
+    msg_prefix + "Couldn't retrieve content: Response code was %d"
+                 " (expected %d)" % (response.status_code, status_code),
+)
+
+def test():
+    return (
+       "((TIME_TO_SEC(%(lhs)s) * 1000000 + MICROSECOND(%(lhs)s)) -"
+       " (TIME_TO_SEC(%(rhs)s) * 1000000 + MICROSECOND(%(rhs)s)))"
+   ) % {"lhs": lhs_sql, "rhs": rhs_sql}, tuple(lhs_params) * 2 + tuple(rhs_params) * 2
+
+def test2():
+    return "RETURNING %s INTO %s" % (
+        ", ".join(field_names),
+        ", ".join(["%s"] * len(params)),
+    ), tuple(params)
+
+def test3():
+    return (
+               "(CASE WHEN JSON_TYPE(%s, %%s) IN (%s) "
+               "THEN JSON_TYPE(%s, %%s) ELSE JSON_EXTRACT(%s, %%s) END)"
+           ) % (lhs, datatype_values, lhs, lhs), (tuple(params) + (json_path,)) * 3