using the same pattern we developed for the logical operators as well

Author: Janther

src/binary-operator-printers/logical.js

@@ -1,10 +1,8 @@
 import { doc } from 'prettier';
-import { rightOperandPrinter } from './printers/right-operand-printer.js';
+import { createBinaryOperationPrinter } from './printers/create-binary-operation-printer.js';
+import { createGroupIfNecessaryBuilder } from './printers/create-group-if-necessary-builder.js';
 
-const { group, indent } = doc.builders;
-
-const groupIfNecessaryBuilder = (path) => (document) =>
-  path.getParentNode().type === 'BinaryOperation' ? document : group(document);
+const { indent } = doc.builders;
 
 const indentIfNecessaryBuilder = (path, options) => (document) => {
   let node = path.getNode();
@@ -25,15 +23,12 @@ const indentIfNecessaryBuilder = (path, options) => (document) => {
   }
 };
 
+const logicalPrinter = createBinaryOperationPrinter(
+  createGroupIfNecessaryBuilder([]),
+  indentIfNecessaryBuilder
+);
+
 export const logical = {
   match: (op) => ['&&', '||'].includes(op),
-  print: (node, path, print, options) => {
-    const groupIfNecessary = groupIfNecessaryBuilder(path);
-    const indentIfNecessary = indentIfNecessaryBuilder(path, options);
-
-    return groupIfNecessary([
-      path.call(print, 'left'),
-      indentIfNecessary(rightOperandPrinter(node, path, print, options))
-    ]);
-  }
+  print: logicalPrinter
 };

src/binary-operator-printers/multiplication.js

@@ -1,5 +1,5 @@
 import { createBinaryOperationPrinter } from './printers/create-binary-operation-printer.js';
-import { createArithmeticGroupIfNecessaryBuilder } from './printers/create-group-if-necessary-builder.js';
+import { createGroupIfNecessaryBuilder } from './printers/create-group-if-necessary-builder.js';
 import { createArithmeticIndentIfNecessaryBuilder } from './printers/create-indent-if-necessary-builder.js';
 import { addition } from './addition.js';
 import { bit } from './bit.js';
@@ -10,7 +10,7 @@ import { shift } from './shift.js';
 const matchers = [addition, bit, equality, inequality, shift];
 
 const multiplicationPrinter = createBinaryOperationPrinter(
-  createArithmeticGroupIfNecessaryBuilder(matchers),
+  createGroupIfNecessaryBuilder(matchers),
   createArithmeticIndentIfNecessaryBuilder(matchers)
 );
 

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

@@ -4,7 +4,7 @@ export const createBinaryOperationPrinter =
   (groupIfNecessaryBuilder, indentIfNecessaryBuilder) =>
   (node, path, print, options) => {
     const groupIfNecessary = groupIfNecessaryBuilder(path);
-    const indentIfNecessary = indentIfNecessaryBuilder(path);
+    const indentIfNecessary = indentIfNecessaryBuilder(path, options);
 
     return groupIfNecessary([
       path.call(print, 'left'),

src/binary-operator-printers/printers/create-group-if-necessary-builder.js

@@ -3,7 +3,7 @@ import { shouldGroupOrIndent } from '../utils/should-group-or-indent.js';
 
 const { group } = doc.builders;
 
-export const createArithmeticGroupIfNecessaryBuilder =
+export const createGroupIfNecessaryBuilder =
   (matchers) => (path) => (document) => {
     const parentNode = path.getParentNode();
     if (shouldGroupOrIndent(parentNode, matchers)) return group(document);

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

@@ -1,12 +1,12 @@
 import { createBinaryOperationPrinter } from './create-binary-operation-printer.js';
-import { createArithmeticGroupIfNecessaryBuilder } from './create-group-if-necessary-builder.js';
+import { createGroupIfNecessaryBuilder } from './create-group-if-necessary-builder.js';
 import { createArithmeticIndentIfNecessaryBuilder } from './create-indent-if-necessary-builder.js';
 import { equality } from '../equality.js';
 import { inequality } from '../inequality.js';
 
 const comparisonMatchers = [equality, inequality];
 
 export const defaultBinaryOperationPrinter = createBinaryOperationPrinter(
-  createArithmeticGroupIfNecessaryBuilder(comparisonMatchers),
+  createGroupIfNecessaryBuilder(comparisonMatchers),
   createArithmeticIndentIfNecessaryBuilder(comparisonMatchers)
 );