Repository: prettier/prettier (JavaScript)
Date: 2017-03-03 18:37:52+00:00
Task type: Refactoring

Issue:
Suboptimal line-breaking with complex parenthesized expressions
See the attached screenshots. It'd be nice if the parenthesized expressions were treated like a chunk unless it broke some other rule. At evaluation time we'd need some way of recursively unchunking parenthesized expressions until all rules pass.

![a](https://cloud.githubusercontent.com/assets/3403450/23540374/b866f95a-ff95-11e6-9282-4614f7b23db2.png)
![b](https://cloud.githubusercontent.com/assets/3403450/23540375/b868dbee-ff95-11e6-96e7-b408979c434f.png)



Issue discussion:
prettier never puts \n after `=` today but there are cases like this one where it would be really useful for readability.
Another related issue: https://github.com/prettier/prettier/issues/866

Solution patch:
diff --git a/src/printer.js b/src/printer.js
index f21327d701c2..2b60cf1732e5 100644
--- a/src/printer.js
+++ b/src/printer.js
@@ -187,18 +187,12 @@ function genericPrintNoParens(path, options, print) {
     case "ParenthesizedExpression":
       return concat(["(", path.call(print, "expression"), ")"]);
     case "AssignmentExpression":
-      return group(
-        concat([
-          path.call(print, "left"),
-          " ",
-          n.operator,
-          hasLeadingOwnLineComment(options.originalText, n.right)
-            ? indent(
-                options.tabWidth,
-                concat([hardline, path.call(print, "right")])
-              )
-            : concat([" ", path.call(print, "right")])
-        ])
+      return printAssignment(
+        path.call(print, "left"),
+        n.operator,
+        n.right,
+        path.call(print, "right"),
+        options
       );
     case "BinaryExpression":
     case "LogicalExpression": {
@@ -208,9 +202,8 @@ function genericPrintNoParens(path, options, print) {
 
       // Avoid indenting sub-expressions in if/etc statements.
       if (
-        (hasLeadingOwnLineComment(options.originalText, n) &&
-          (parent.type === "AssignmentExpression" ||
-            parent.type === "VariableDeclarator")) ||
+        parent.type === "AssignmentExpression" ||
+        parent.type === "VariableDeclarator" ||
         shouldInlineLogicalExpression(n) ||
         (n !== parent.body &&
           (parent.type === "IfStatement" ||
@@ -958,18 +951,13 @@ function genericPrintNoParens(path, options, print) {
 
       return group(concat(parts));
     case "VariableDeclarator":
-      return n.init
-        ? concat([
-            path.call(print, "id"),
-            " =",
-            hasLeadingOwnLineComment(options.originalText, n.init)
-              ? indent(
-                  options.tabWidth,
-                  concat([hardline, path.call(print, "init")])
-                )
-              : concat([" ", path.call(print, "init")])
-          ])
-        : path.call(print, "id");
+      return printAssignment(
+        path.call(print, "id"),
+        "=",
+        n.init,
+        n.init && path.call(print, "init"),
+        options
+      );
     case "WithStatement":
       return concat([
         "with (",
@@ -2802,6 +2790,34 @@ function printBinaryishExpressions(path, parts, print, options, isNested) {
   return parts;
 }
 
+function printAssignment(printedLeft, operator, rightNode, printedRight, options) {
+  if (!rightNode) {
+    return printedLeft;
+  }
+
+  let printed;
+  if (hasLeadingOwnLineComment(options.originalText, rightNode)) {
+    printed = indent(
+      options.tabWidth,
+      concat([hardline, printedRight])
+    );
+  } else if (isBinaryish(rightNode) && !shouldInlineLogicalExpression(rightNode)) {
+    printed = indent(
+      options.tabWidth,
+      concat([line, printedRight])
+    );
+  } else {
+    printed = concat([" ", printedRight]);
+  }
+
+  return group(concat([
+    printedLeft,
+    " ",
+    operator,
+    printed,
+  ]));
+}
+
 function adjustClause(clause, options, forceSpace) {
   if (clause === "") {
     return ";";


Test patch:
diff --git a/tests/assignment/__snapshots__/jsfmt.spec.js.snap b/tests/assignment/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000000..69f93fe46867
--- /dev/null
+++ b/tests/assignment/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`binaryish.js 1`] = `
+"const computedDescriptionLines = (showConfirm &&
+  descriptionLinesConfirming) ||
+  (focused && !loading && descriptionLinesFocused) ||
+  descriptionLines;
+
+computedDescriptionLines = (focused &&
+  !loading &&
+  descriptionLinesFocused) ||
+  descriptionLines;
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+const computedDescriptionLines =
+  (showConfirm && descriptionLinesConfirming) ||
+  (focused && !loading && descriptionLinesFocused) ||
+  descriptionLines;
+
+computedDescriptionLines =
+  (focused && !loading && descriptionLinesFocused) || descriptionLines;
+"
+`;
diff --git a/tests/assignment/binaryish.js b/tests/assignment/binaryish.js
new file mode 100644
index 000000000000..aa4ae5b5d5cf
--- /dev/null
+++ b/tests/assignment/binaryish.js
@@ -0,0 +1,9 @@
+const computedDescriptionLines = (showConfirm &&
+  descriptionLinesConfirming) ||
+  (focused && !loading && descriptionLinesFocused) ||
+  descriptionLines;
+
+computedDescriptionLines = (focused &&
+  !loading &&
+  descriptionLinesFocused) ||
+  descriptionLines;
diff --git a/tests/assignment/jsfmt.spec.js b/tests/assignment/jsfmt.spec.js
new file mode 100644
index 000000000000..989047bccc52
--- /dev/null
+++ b/tests/assignment/jsfmt.spec.js
@@ -0,0 +1,1 @@
+run_spec(__dirname);
diff --git a/tests/assignment_comments/__snapshots__/jsfmt.spec.js.snap b/tests/assignment_comments/__snapshots__/jsfmt.spec.js.snap
index eda7518c928a..8142aac5d3ce 100644
--- a/tests/assignment_comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/assignment_comments/__snapshots__/jsfmt.spec.js.snap
@@ -68,7 +68,8 @@ var fnString =
    */
   \\"some\\" + \\"long\\" + \\"string\\";
 
-var fnString = /* inline */ \\"some\\" +
+var fnString =
+  /* inline */ \\"some\\" +
   \\"long\\" +
   \\"string\\" +
   \\"some\\" +
@@ -85,6 +86,7 @@ var fnString = // Comment
   // Comment
   \\"some\\" + \\"long\\" + \\"string\\";
 
-var fnString = \\"some\\" + \\"long\\" + \\"string\\"; // Comment
+var fnString = // Comment
+  \\"some\\" + \\"long\\" + \\"string\\";
 "
 `;
diff --git a/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap b/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap
index 9ef9bc361aa4..167073e3fba5 100644
--- a/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap
@@ -83,9 +83,8 @@ foooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(
   aaaaaaaaaaaaaaaaaaa
 ) + a;
 
-const isPartOfPackageJSON = dependenciesArray.indexOf(
-  dependencyWithOutRelativePath.split(\\"/\\")[0]
-) !== -1;
+const isPartOfPackageJSON =
+  dependenciesArray.indexOf(dependencyWithOutRelativePath.split(\\"/\\")[0]) !== -1;
 
 defaultContent.filter(defaultLocale => {
   // ...
@@ -115,37 +114,41 @@ foo(obj.property * new Class() && obj instanceof Class && longVariable ? number
 // break them all at the same time.
 
 const x = longVariable + longVariable + longVariable;
-const x = longVariable +
+const x =
+  longVariable +
   longVariable +
   longVariable +
   longVariable -
   longVariable +
   longVariable;
-const x = longVariable +
+const x =
+  longVariable +
   longVariable * longVariable +
   longVariable -
   longVariable +
   longVariable;
-const x = longVariable +
+const x =
+  longVariable +
   longVariable * longVariable * longVariable / longVariable +
   longVariable;
 
-const x = longVariable &&
+const x =
+  longVariable &&
   longVariable &&
   longVariable &&
   longVariable &&
   longVariable &&
   longVariable;
-const x = (longVariable && longVariable) ||
+const x =
+  (longVariable && longVariable) ||
   (longVariable && longVariable) ||
   (longVariable && longVariable);
 
-const x = longVariable * longint &&
-  longVariable >> 0 &&
-  longVariable + longVariable;
+const x =
+  longVariable * longint && longVariable >> 0 && longVariable + longVariable;
 
-const x = longVariable > longint &&
-  longVariable === 0 + longVariable * longVariable;
+const x =
+  longVariable > longint && longVariable === 0 + longVariable * longVariable;
 
 foo(
   obj.property * new Class() && obj instanceof Class && longVariable