From 1273eb4a467871fcd02dbea29dc92e1ea45ca295 Mon Sep 17 00:00:00 2001 From: Alessandro Pietro Bardelli Date: Mon, 18 Mar 2019 17:47:46 +0100 Subject: [PATCH] ENH: slightly prefer split before named assigns --- yapf/yapflib/unwrapped_line.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yapf/yapflib/unwrapped_line.py b/yapf/yapflib/unwrapped_line.py index fb1275583..29197cb06 100644 --- a/yapf/yapflib/unwrapped_line.py +++ b/yapf/yapflib/unwrapped_line.py @@ -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 @@ -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