Skip to content
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

Jump to bottom

ENH: slightly prefer split before named assigns #692

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

ENH: slightly prefer split before named assigns #692

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions yapf/yapflib/unwrapped_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ def _SplitPenalty(prev_token, cur_token):
"""Return the penalty for breaking the line before the current token."""
pval = prev_token.value
cval = cur_token.value

if pval == 'not':
return split_penalty.UNBREAKABLE

Expand Down Expand Up @@ -567,6 +568,11 @@ def _SplitPenalty(prev_token, cur_token):
return style.Get('SPLIT_PENALTY_AFTER_UNARY_OPERATOR')
if pval == ',':
# Breaking after a comma is fine, if need be.
# But slightly prefer split before named assign
if (format_token.Subtype.DEFAULT_OR_NAMED_ASSIGN in cur_token.subtypes or
format_token.Subtype.DEFAULT_OR_NAMED_ASSIGN_ARG_LIST in
cur_token.subtypes):
return -30
return 0
if pval == '**' or cval == '**':
return split_penalty.STRONGLY_CONNECTED
Expand Down