Force else to break before anything inside it (fixes #616)

src/printer.js

@@ -958,8 +958,7 @@ function genericPrintNoParens(path, options, print) {
       ]);
     case "IfStatement":
       const con = adjustClause(path.call(print, "consequent"), options);
-
-      parts = [
+      const opening = concat([
         "if (",
         group(
           concat([
@@ -972,7 +971,9 @@ function genericPrintNoParens(path, options, print) {
         ),
         ")",
         con
-      ];
+      ]);
+
+      parts.push(opening);
 
       if (n.alternate) {
         const hasBraces = isCurlyBracket(con);
@@ -988,11 +989,11 @@ function genericPrintNoParens(path, options, print) {
         }
 
         parts.push(
-          adjustClause(
+          group(adjustClause(
             path.call(print, "alternate"),
             options,
             n.alternate.type === "IfStatement"
-          )
+          ), { shouldBreak: willBreak(opening) })
         );
       }
 

tests/if_comments/__snapshots__/jsfmt.spec.js.snap → tests/if/__snapshots__/jsfmt.spec.js.snap

@@ -1,5 +1,91 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`else.js 1`] = `
+"// Both functions below should be formatted exactly the same
+
+function f() {
+  if (position)
+    return {name: pair};
+  else
+    return {name: pair.substring(0, position), value: pair.substring(position + 1)};
+}
+
+function f() {
+  if (position)
+    return {name: pair};
+  else
+    return {
+      name: pair.substring(0, position),
+      value: pair.substring(position + 1)
+    };
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Both functions below should be formatted exactly the same
+
+function f() {
+  if (position) return { name: pair };
+  else
+    return {
+      name: pair.substring(0, position),
+      value: pair.substring(position + 1)
+    };
+}
+
+function f() {
+  if (position)
+    return { name: pair };
+  else
+    return {
+      name: pair.substring(0, position),
+      value: pair.substring(position + 1)
+    };
+}
+"
+`;
+
+exports[`else.js 2`] = `
+"// Both functions below should be formatted exactly the same
+
+function f() {
+  if (position)
+    return {name: pair};
+  else
+    return {name: pair.substring(0, position), value: pair.substring(position + 1)};
+}
+
+function f() {
+  if (position)
+    return {name: pair};
+  else
+    return {
+      name: pair.substring(0, position),
+      value: pair.substring(position + 1)
+    };
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Both functions below should be formatted exactly the same
+
+function f() {
+  if (position) return { name: pair };
+  else
+    return {
+      name: pair.substring(0, position),
+      value: pair.substring(position + 1)
+    };
+}
+
+function f() {
+  if (position)
+    return { name: pair };
+  else
+    return {
+      name: pair.substring(0, position),
+      value: pair.substring(position + 1)
+    };
+}
+"
+`;
+
 exports[`if_comments.js 1`] = `
 "async function f() {
   if (untrackedChoice === 0) /* Cancel */ {

tests/if/else.js

@@ -0,0 +1,18 @@
+// Both functions below should be formatted exactly the same
+
+function f() {
+  if (position)
+    return {name: pair};
+  else
+    return {name: pair.substring(0, position), value: pair.substring(position + 1)};
+}
+
+function f() {
+  if (position)
+    return {name: pair};
+  else
+    return {
+      name: pair.substring(0, position),
+      value: pair.substring(position + 1)
+    };
+}