Remove parent check, add tests

src/language-js/print/binaryish.js

@@ -76,7 +76,7 @@ function printBinaryishExpression(path, options, print) {
     (isCallExpression(parent) && parent.callee === node) ||
     parent.type === "UnaryExpression" ||
     (isMemberExpression(parent) && !parent.computed) ||
-    parent.type === "LogicalExpression" && needsParens(path, options)
+    needsParens(path, options)
   ) {
     return group([indent([softline, ...parts]), softline]);
   }

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

@@ -3528,12 +3528,14 @@ printWidth: 1
       | translate
         : {
             what:
-              ("entities"
-              | translate
-                : {
-                    count:
-                      array.length
-                  })
+              (
+                "entities"
+                | translate
+                  : {
+                      count:
+                        array.length
+                    }
+              )
           }
   }}
 </p>

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

@@ -1,5 +1,93 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`indent_multiline.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// Indent multiline logical expressions used as function arguments
+foo(long_long_long_long_long_long_long_condition_1 &&
+  long_long_long_long_long_long_long_varaible_2);
+foo(long_long_long_long_long_long_long_condition_1 ||
+  long_long_long_long_long_long_long_varaible_2);
+foo(long_long_long_long_long_long_long_condition_1 ??
+  long_long_long_long_long_long_long_varaible_2);
+
+// Indent multiline logical sub expressions
+long_long_long_long_long_long_long_condition_1 ||
+  (long_long_long_long_long_long_long_condition_2 &&
+    long_long_long_long_long_long_long_condition_3);
+long_long_long_long_long_long_long_condition_1 &&
+  (long_long_long_long_long_long_long_condition_2 ||
+    long_long_long_long_long_long_long_condition_3);
+long_long_long_long_long_long_long_condition_1 ||
+  (long_long_long_long_long_long_long_condition_2 ??
+    long_long_long_long_long_long_long_condition_3);
+
+// Indent multiline logical expressions with a binary expression parent
+num_x *
+  (long_long_long_long_long_long_long_condition_2 &&
+    long_long_long_long_long_long_long_condition_3);
+num_x *
+  (long_long_long_long_long_long_long_condition_2 ||
+    long_long_long_long_long_long_long_condition_3);
+num_x *
+  (long_long_long_long_long_long_long_condition_2 ??
+    long_long_long_long_long_long_long_condition_3);
+
+=====================================output=====================================
+// Indent multiline logical expressions used as function arguments
+foo(
+  long_long_long_long_long_long_long_condition_1 &&
+    long_long_long_long_long_long_long_varaible_2
+);
+foo(
+  long_long_long_long_long_long_long_condition_1 ||
+    long_long_long_long_long_long_long_varaible_2
+);
+foo(
+  long_long_long_long_long_long_long_condition_1 ??
+    long_long_long_long_long_long_long_varaible_2
+);
+
+// Indent multiline logical sub expressions
+long_long_long_long_long_long_long_condition_1 ||
+  (
+    long_long_long_long_long_long_long_condition_2 &&
+    long_long_long_long_long_long_long_condition_3
+  );
+long_long_long_long_long_long_long_condition_1 &&
+  (
+    long_long_long_long_long_long_long_condition_2 ||
+    long_long_long_long_long_long_long_condition_3
+  );
+long_long_long_long_long_long_long_condition_1 ||
+  (
+    long_long_long_long_long_long_long_condition_2 ??
+    long_long_long_long_long_long_long_condition_3
+  );
+
+// Indent multiline logical expressions with a binary expression parent
+num_x *
+  (
+    long_long_long_long_long_long_long_condition_2 &&
+    long_long_long_long_long_long_long_condition_3
+  );
+num_x *
+  (
+    long_long_long_long_long_long_long_condition_2 ||
+    long_long_long_long_long_long_long_condition_3
+  );
+num_x *
+  (
+    long_long_long_long_long_long_long_condition_2 ??
+    long_long_long_long_long_long_long_condition_3
+  );
+
+================================================================================
+`;
+
 exports[`issue-7024.js format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]

tests/format/js/logical_expressions/indent_multiline.js

@@ -0,0 +1,29 @@
+// Indent multiline logical expressions used as function arguments
+foo(long_long_long_long_long_long_long_condition_1 &&
+  long_long_long_long_long_long_long_varaible_2);
+foo(long_long_long_long_long_long_long_condition_1 ||
+  long_long_long_long_long_long_long_varaible_2);
+foo(long_long_long_long_long_long_long_condition_1 ??
+  long_long_long_long_long_long_long_varaible_2);
+
+// Indent multiline logical sub expressions
+long_long_long_long_long_long_long_condition_1 ||
+  (long_long_long_long_long_long_long_condition_2 &&
+    long_long_long_long_long_long_long_condition_3);
+long_long_long_long_long_long_long_condition_1 &&
+  (long_long_long_long_long_long_long_condition_2 ||
+    long_long_long_long_long_long_long_condition_3);
+long_long_long_long_long_long_long_condition_1 ||
+  (long_long_long_long_long_long_long_condition_2 ??
+    long_long_long_long_long_long_long_condition_3);
+
+// Indent multiline logical expressions with a binary expression parent
+num_x *
+  (long_long_long_long_long_long_long_condition_2 &&
+    long_long_long_long_long_long_long_condition_3);
+num_x *
+  (long_long_long_long_long_long_long_condition_2 ||
+    long_long_long_long_long_long_long_condition_3);
+num_x *
+  (long_long_long_long_long_long_long_condition_2 ??
+    long_long_long_long_long_long_long_condition_3);

tests/format/typescript/as/__snapshots__/jsfmt.spec.js.snap

@@ -250,11 +250,13 @@ angular.module("foo").directive("formIsolator", () => {
   this.initialValues =
     undefined;
 
-const extraRendererAttrs = ((
-  attrs.rendererAttrs &&
-  this.utils.safeParseJsonString(attrs.rendererAttrs)
-) ||
-  Object.create(null)) as FieldService.RendererAttributes;
+const extraRendererAttrs = (
+  (
+    attrs.rendererAttrs &&
+    this.utils.safeParseJsonString(attrs.rendererAttrs)
+  ) ||
+  Object.create(null)
+) as FieldService.RendererAttributes;
 
 const annotate = (angular.injector as any).$$annotate as (
   fn: Function

tests/format/typescript/template-literals/__snapshots__/jsfmt.spec.js.snap

@@ -24,8 +24,10 @@ const b = \`\${
   (foo + bar) as veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBaz
 }\`;
 const b = \`\${
-  (veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongFoo +
-    veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBar) as veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBaz
+  (
+    veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongFoo +
+    veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBar
+  ) as veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBaz
 }\`;
 
 ================================================================================