use the same logic for grouping leftover operators in case of an assignment

Author: Janther

src/binary-operator-printers/comparison.js

@@ -24,15 +24,9 @@ export const comparison = {
   print: (node, path, print, options) => {
     const indentIfNecessary = indentIfNecessaryBuilder(path);
 
-    const right = rightOperandPrinter(node, path, print, options);
-    // If it's a single binary operation, avoid having a small right
-    // operand like - 1 on its own line
-    const shouldGroup =
-      node.left.type !== 'BinaryOperation' &&
-      path.getParentNode().type !== 'BinaryOperation';
     return group([
       path.call(print, 'left'),
-      indentIfNecessary(shouldGroup ? group(right) : right)
+      indentIfNecessary(rightOperandPrinter(node, path, print, options))
     ]);
   }
 };

src/binary-operator-printers/logical.js

@@ -31,15 +31,9 @@ export const logical = {
     const groupIfNecessary = groupIfNecessaryBuilder(path);
     const indentIfNecessary = indentIfNecessaryBuilder(path, options);
 
-    const right = rightOperandPrinter(node, path, print, options);
-    // If it's a single binary operation, avoid having a small right
-    // operand like - 1 on its own line
-    const shouldGroup =
-      node.left.type !== 'BinaryOperation' &&
-      path.getParentNode().type !== 'BinaryOperation';
     return groupIfNecessary([
       path.call(print, 'left'),
-      indentIfNecessary(shouldGroup ? group(right) : right)
+      indentIfNecessary(rightOperandPrinter(node, path, print, options))
     ]);
   }
 };

src/binary-operator-printers/printers/create-binary-operation-printer.js

@@ -1,5 +1,4 @@
 import { doc } from 'prettier';
-import { assignment } from '../assignment.js';
 import { comparison } from '../comparison.js';
 import { rightOperandPrinter } from './right-operand-printer.js';
 
@@ -46,16 +45,9 @@ export const createBinaryOperationPrinter =
     const groupIfNecessary = groupIfNecessaryBuilder(path);
     const indentIfNecessary = indentIfNecessaryBuilder(path);
 
-    const right = rightOperandPrinter(node, path, print, options);
-    // If it's a single binary operation, avoid having a small right
-    // operand like - 1 on its own line
-    const parent = path.getParentNode();
-    const shouldGroup =
-      node.left.type !== 'BinaryOperation' &&
-      (parent.type !== 'BinaryOperation' || assignment.match(parent.operator));
     return groupIfNecessary([
       path.call(print, 'left'),
-      indentIfNecessary(shouldGroup ? group(right) : right)
+      indentIfNecessary(rightOperandPrinter(node, path, print, options))
     ]);
   };
 

src/binary-operator-printers/printers/right-operand-printer.js

@@ -1,8 +1,19 @@
 import { doc } from 'prettier';
+import { assignment } from '../assignment.js';
 
-const { line } = doc.builders;
+const { group, line } = doc.builders;
 
-export const rightOperandPrinter = (node, path, print, options) =>
-  options.experimentalOperatorPosition === 'end'
-    ? [' ', node.operator, line, path.call(print, 'right')]
-    : [line, node.operator, ' ', path.call(print, 'right')];
+export const rightOperandPrinter = (node, path, print, options) => {
+  const right =
+    options.experimentalOperatorPosition === 'end'
+      ? [' ', node.operator, line, path.call(print, 'right')]
+      : [line, node.operator, ' ', path.call(print, 'right')];
+
+  // If it's a single binary operation, avoid having a small right
+  // operand like - 1 on its own line
+  const parent = path.getParentNode();
+  return node.left.type !== 'BinaryOperation' &&
+    (parent.type !== 'BinaryOperation' || assignment.match(parent.operator))
+    ? group(right)
+    : right;
+};

tests/format/BinaryOperators/__snapshots__/jsfmt.spec.js.snap

@@ -509,8 +509,7 @@ contract ComparisonOperators {
         a =
             veryVeryVeryVeryVeryLongFunctionCalledA(
                 veryVeryVeryVeryVeryLongVariableCalledB
-            )
-            == c;
+            ) == c;
         if (
             veryVeryVeryVeryVeryLongFunctionCalledA(
                 veryVeryVeryVeryVeryLongVariableCalledB
@@ -663,8 +662,7 @@ contract LogicalOperators {
         a =
             veryVeryVeryVeryVeryLongFunctionCalledA(
                 veryVeryVeryVeryVeryLongVariableCalledB
-            )
-            || c;
+            ) || c;
         if (
             veryVeryVeryVeryVeryLongFunctionCalledA(
                 veryVeryVeryVeryVeryLongVariableCalledB
@@ -1193,8 +1191,7 @@ contract ComparisonOperators {
         a =
             veryVeryVeryVeryVeryLongFunctionCalledA(
                 veryVeryVeryVeryVeryLongVariableCalledB
-            ) ==
-            c;
+            ) == c;
         if (
             veryVeryVeryVeryVeryLongFunctionCalledA(
                 veryVeryVeryVeryVeryLongVariableCalledB
@@ -1347,8 +1344,7 @@ contract LogicalOperators {
         a =
             veryVeryVeryVeryVeryLongFunctionCalledA(
                 veryVeryVeryVeryVeryLongVariableCalledB
-            ) ||
-            c;
+            ) || c;
         if (
             veryVeryVeryVeryVeryLongFunctionCalledA(
                 veryVeryVeryVeryVeryLongVariableCalledB