Apply proper formatting to the changes

Author: jesse-sony

yapf/yapflib/format_decision_state.py

@@ -560,7 +560,8 @@ def SurroundedByParens(token):
     if style.Get('SPLIT_ALL_LOGICAL_OPERATORS_IF_ANY_SPLIT'):
       split_before = style.Get("SPLIT_BEFORE_LOGICAL_OPERATOR")
       check_token = current if split_before else current.previous_token
-      if (check_token and check_token.name == "NAME" and check_token.value in logical_line._LOGICAL_OPERATORS):
+      if (check_token and check_token.name == "NAME" and
+          check_token.value in logical_line._LOGICAL_OPERATORS):
         opening = _GetOpeningBracket(check_token)
         if opening:
           ending = opening.matching_bracket
@@ -572,9 +573,9 @@ def SurroundedByParens(token):
           next_token = ending.next_token
           prev_token = opening.previous_token
           if split_before:
-             if prev_token:
-               clause_start = _PrevLogicalClause(prev_token)
-               length += opening.total_length - clause_start.total_length
+            if prev_token:
+              clause_start = _PrevLogicalClause(prev_token)
+              length += opening.total_length - clause_start.total_length
           else:
             if next_token:
               clause_end = _NextLogicalClause(next_token)

yapf/yapflib/logical_line.py

@@ -616,17 +616,19 @@ def _SplitPenalty(prev_token, cur_token):
 
   if logical_splitting:
     if style.Get('SPLIT_BEFORE_LOGICAL_OPERATOR'):
-        # Prefer to split before 'and' and 'or'.
-        if pval in _LOGICAL_OPERATORS:
-          return max(node_split_penalty, style.Get('SPLIT_PENALTY_LOGICAL_OPERATOR'))
-        if cval in _LOGICAL_OPERATORS:
-          return max(node_split_penalty, 0)
+      # Prefer to split before 'and' and 'or'.
+      if pval in _LOGICAL_OPERATORS:
+        return max(node_split_penalty,
+                   style.Get('SPLIT_PENALTY_LOGICAL_OPERATOR'))
+      if cval in _LOGICAL_OPERATORS:
+        return max(node_split_penalty, 0)
     else:
       # Prefer to split after 'and' and 'or'.
       if pval in _LOGICAL_OPERATORS:
         return max(node_split_penalty, 0)
       if cval in _LOGICAL_OPERATORS:
-        return max(node_split_penalty, style.Get('SPLIT_PENALTY_LOGICAL_OPERATOR'))
+        return max(node_split_penalty,
+                   style.Get('SPLIT_PENALTY_LOGICAL_OPERATOR'))
 
   if node_split_penalty > 0:
     return node_split_penalty