Skip to content

Account for += assignment when deciding whether to split string #2312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JelleZijlstra merged 3 commits into from
Jun 7, 2021
Merged

Account for += assignment when deciding whether to split string #2312

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f58ab82
Account for += assignment when deciding whether to split string
bbugyi200 Jun 5, 2021
8bae343
[2294] Add changelog bullet
bbugyi200 Jun 5, 2021
822483b
[2294] Provide better message for edge case string splitting
bbugyi200 Jun 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Account for += assignment when deciding whether to split string 
Fixes #2294
  • Loading branch information
@bbugyi200
bbugyi200 committed Jun 5, 2021
commit f58ab825f9f7d672bbb22ba5c399b9cd8e27f84d
2 changes: 1 addition & 1 deletion src/black/trans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ def _get_max_string_length(self, line: Line, string_idx: int) -> int:
# WMA4 a space, a comma, and a closing bracket [e.g. `), STRING`].
offset += 3

if P.type in [token.COLON, token.EQUAL, token.NAME]:
if P.type in [token.COLON, token.EQUAL, token.PLUSEQUAL, token.NAME]:
# This conditional branch is meant to handle dictionary keys,
# variable assignments, 'return STRING' statement lines, and
# 'else STRING' ternary expression lines.
Expand Down
11 changes: 11 additions & 0 deletions tests/data/long_strings__edge_case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
assert str(result) == "This long string should be split at some point right close to or around hereeeeeee"
assert str(result) < "This long string should be split at some point right close to or around hereeeeee"
assert "A format string: %s" % "This long string should be split at some point right close to or around hereeeeeee" != result
msg += "This long string should be split at some point right close to or around hereeeee"
msg += "This long string should be split at some point right close to or around hereeeeeeee"
msg += "This long string should not be split at any point ever since it is just righttt"


# output
Expand Down Expand Up @@ -127,3 +130,11 @@
" hereeeeeee"
!= result
)
msg += (
"This long string should be split at some point right close to or around hereeeee"
)
msg += (
"This long string should be split at some point right close to or around"
" hereeeeeeee"
)
msg += "This long string should not be split at any point ever since it is just righttt"
20 changes: 20 additions & 0 deletions tests/data/long_strings__regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,16 @@ def _legacy_listen_examples():
)


class X:
async def foo(self):
msg = ""
for candidate in CANDIDATES:
msg += (
"**{candidate.object_type} {candidate.rev}**"
" - {candidate.description}\n"
)


temp_msg = (
f"{f'{humanize_number(pos)}.': <{pound_len+2}} "
f"{balance: <{bal_len + 5}} "
Expand Down Expand Up @@ -948,6 +958,16 @@ def _legacy_listen_examples():
)


class X:
async def foo(self):
msg = ""
for candidate in CANDIDATES:
msg += (
"**{candidate.object_type} {candidate.rev}**"
" - {candidate.description}\n"
)


temp_msg = (
f"{f'{humanize_number(pos)}.': <{pound_len+2}} "
f"{balance: <{bal_len + 5}} "
Expand Down