feat(js): move binary operators to beginning of line

Fixes prettier#3806
trash · Sep 19, 2018 · 0342ca2 · 0342ca2
1 parent 79f4251
commit 0342ca2
Show file tree

Hide file tree

Showing 24 changed files with 342 additions and 338 deletions.
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
@@ -5241,9 +5241,11 @@ function printBinaryishExpressions(
     }
 
     const shouldInline = shouldInlineLogicalExpression(node);
-    const lineBeforeOperator =
-      node.operator === "|>" &&
-      !hasLeadingOwnLineComment(options.originalText, node.right, options);
+    const lineBeforeOperator = !hasLeadingOwnLineComment(
+      options.originalText,
+      node.right,
+      options
+    );
 
     const right = shouldInline
       ? concat([node.operator, " ", path.call(print, "right")])

diff --git a/tests/assignment/__snapshots__/jsfmt.spec.js.snap b/tests/assignment/__snapshots__/jsfmt.spec.js.snap
@@ -12,9 +12,9 @@ computedDescriptionLines = (focused &&
   descriptionLines;
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 const computedDescriptionLines =
-  (showConfirm && descriptionLinesConfirming) ||
-  (focused && !loading && descriptionLinesFocused) ||
-  descriptionLines;
+  (showConfirm && descriptionLinesConfirming)
+  || (focused && !loading && descriptionLinesFocused)
+  || descriptionLines;
 
 computedDescriptionLines =
   (focused && !loading && descriptionLinesFocused) || descriptionLines;

diff --git a/tests/assignment_comments/__snapshots__/jsfmt.spec.js.snap b/tests/assignment_comments/__snapshots__/jsfmt.spec.js.snap
@@ -85,18 +85,18 @@ var fnString =
   "some" + "long" + "string";
 
 var fnString =
-  /* inline */ "some" +
-  "long" +
-  "string" +
-  "some" +
-  "long" +
-  "string" +
-  "some" +
-  "long" +
-  "string" +
-  "some" +
-  "long" +
-  "string";
+  /* inline */ "some"
+  + "long"
+  + "string"
+  + "some"
+  + "long"
+  + "string"
+  + "some"
+  + "long"
+  + "string"
+  + "some"
+  + "long"
+  + "string";
 
 var fnString = // Comment
   // Comment

diff --git a/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap b/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap
@@ -18,20 +18,20 @@ function f() {
 function f() {
   const appEntitys = getAppEntitys(loadObject).filter(
     entity =>
-      entity &&
-      entity.isInstallAvailable() &&
-      !entity.isQueue() &&
-      entity.isDisabled()
+      entity
+      && entity.isInstallAvailable()
+      && !entity.isQueue()
+      && entity.isDisabled()
   );
 }
 
 function f() {
   const appEntitys = getAppEntitys(loadObject).map(
     entity =>
-      entity &&
-      entity.isInstallAvailable() &&
-      !entity.isQueue() &&
-      entity.isDisabled() && {
+      entity
+      && entity.isInstallAvailable()
+      && !entity.isQueue()
+      && entity.isDisabled() && {
         id: entity.id
       }
   );
@@ -63,9 +63,9 @@ a = (
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 a =
   // Commment 1
-  Math.random() * (yRange * (1 - minVerticalFraction)) +
-  minVerticalFraction * yRange -
-  offset;
+  Math.random() * (yRange * (1 - minVerticalFraction))
+  + minVerticalFraction * yRange
+  - offset;
 
 `;
 
@@ -127,14 +127,14 @@ if (this.hasPlugin("dynamicImports") && this.lookahead().type) {
 }
 
 if (
-  this.hasPlugin("dynamicImports") &&
-  this.lookahead().type === tt.parenLeft
+  this.hasPlugin("dynamicImports")
+  && this.lookahead().type === tt.parenLeft
 ) {
 }
 
 if (
-  this.hasPlugin("dynamicImports") &&
-  this.lookahead().type === tt.parenLeft.right
+  this.hasPlugin("dynamicImports")
+  && this.lookahead().type === tt.parenLeft.right
 ) {
 }
 
@@ -161,8 +161,8 @@ const user = renderedUser || (
 );
 
 const user =
-  renderedUser ||
-  (shouldRenderUser && (
+  renderedUser
+  || (shouldRenderUser && (
     <div>
       <User name={this.state.user.name} age={this.state.user.age} />
     </div>
@@ -275,8 +275,8 @@ prevState = prevState || {
   selectedCatalog: null
 };
 
-prevState = prevState ||
-  defaultState || {
+prevState = prevState
+  || defaultState || {
     catalogs: [],
     loadState: LOADED,
     opened: false,
@@ -285,17 +285,17 @@ prevState = prevState ||
   };
 
 prevState =
-  prevState ||
-  (defaultState && {
+  prevState
+  || (defaultState && {
     catalogs: [],
     loadState: LOADED,
     opened: false,
     searchQuery: "",
     selectedCatalog: null
   });
 
-prevState = prevState ||
-  (useDefault && defaultState) || {
+prevState = prevState
+  || (useDefault && defaultState) || {
     catalogs: [],
     loadState: LOADED,
     opened: false,
@@ -311,8 +311,8 @@ this.steps = steps || [
 ];
 
 this.steps =
-  steps ||
-  (checkStep && [
+  steps
+  || (checkStep && [
     {
       name: "mock-module",
       path: "/nux/mock-module"
@@ -329,8 +329,8 @@ this.steps = (steps && checkStep) || [
 const create = () => {
   const result = doSomething();
   return (
-    shouldReturn &&
-    result.ok && {
+    shouldReturn
+    && result.ok && {
       status: "ok",
       createdAt: result.createdAt,
       updatedAt: result.updatedAt
@@ -350,8 +350,8 @@ const create = () => {
 };
 
 const obj = {
-  state: shouldHaveState &&
-    stateIsOK && {
+  state: shouldHaveState
+    && stateIsOK && {
       loadState: LOADED,
       opened: false
     },
@@ -400,31 +400,31 @@ exports[`jsx_parent.js - flow-verify 1`] = `
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <div
   src={
-    !isJellyfishEnabled &&
-    diffUpdateMessageInput != null &&
-    this.state.isUpdateMessageEmpty
+    !isJellyfishEnabled
+    && diffUpdateMessageInput != null
+    && this.state.isUpdateMessageEmpty
   }
 />;
 
 <div>
-  {!isJellyfishEnabled &&
-    diffUpdateMessageInput != null &&
-    this.state.isUpdateMessageEmpty}
+  {!isJellyfishEnabled
+    && diffUpdateMessageInput != null
+    && this.state.isUpdateMessageEmpty}
 </div>;
 
 <div
   style={
-    !isJellyfishEnabled &&
-    diffUpdateMessageInput && {
+    !isJellyfishEnabled
+    && diffUpdateMessageInput && {
       fontSize: 14,
       color: "#fff"
     }
   }
 />;
 
 <div>
-  {!isJellyfishEnabled &&
-    diffUpdateMessageInput != null && (
+  {!isJellyfishEnabled
+    && diffUpdateMessageInput != null && (
       <div>
         <span>Text</span>
       </div>
@@ -509,21 +509,21 @@ function foo() {
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 function foo() {
   return (
-    this.hasPlugin("dynamicImports") &&
-    this.lookahead().type === tt.parenLeft.right
+    this.hasPlugin("dynamicImports")
+    && this.lookahead().type === tt.parenLeft.right
   );
 }
 
 function foo() {
-  return this.hasPlugin("dynamicImports") &&
-    this.lookahead().type === tt.parenLeft.right
+  return this.hasPlugin("dynamicImports")
+    && this.lookahead().type === tt.parenLeft.right
     ? true
     : false;
 }
 
 function foo() {
-  return this.calculate().compute().first.numberOfThings >
-    this.calculate().compute().last.numberOfThings
+  return this.calculate().compute().first.numberOfThings
+    > this.calculate().compute().last.numberOfThings
     ? true
     : false;
 }
@@ -551,10 +551,10 @@ defaultContent.filter(defaultLocale => {
   // ...
 })[0] || null;
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-this._cumulativeHeights &&
-  Math.abs(
-    this._cachedItemHeight(this._firstVisibleIndex + i) -
-      this._provider.fastHeight(i + this._firstVisibleIndex)
+this._cumulativeHeights
+  && Math.abs(
+    this._cachedItemHeight(this._firstVisibleIndex + i)
+      - this._provider.fastHeight(i + this._firstVisibleIndex)
   ) > 1;
 
 foooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(
@@ -596,42 +596,42 @@ foo(obj.property * new Class() && obj instanceof Class && longVariable ? number
 
 const x = longVariable + longVariable + longVariable;
 const x =
-  longVariable +
-  longVariable +
-  longVariable +
-  longVariable -
-  longVariable +
-  longVariable;
+  longVariable
+  + longVariable
+  + longVariable
+  + longVariable
+  - longVariable
+  + longVariable;
 const x =
-  longVariable +
-  longVariable * longVariable +
-  longVariable -
-  longVariable +
-  longVariable;
+  longVariable
+  + longVariable * longVariable
+  + longVariable
+  - longVariable
+  + longVariable;
 const x =
-  longVariable +
-  (longVariable * longVariable * longVariable) / longVariable +
-  longVariable;
+  longVariable
+  + (longVariable * longVariable * longVariable) / longVariable
+  + longVariable;
 
 const x =
-  longVariable &&
-  longVariable &&
-  longVariable &&
-  longVariable &&
-  longVariable &&
-  longVariable;
+  longVariable
+  && longVariable
+  && longVariable
+  && longVariable
+  && longVariable
+  && longVariable;
 const x =
-  (longVariable && longVariable) ||
-  (longVariable && longVariable) ||
-  (longVariable && longVariable);
+  (longVariable && longVariable)
+  || (longVariable && longVariable)
+  || (longVariable && longVariable);
 const x =
-  firstItemWithAVeryLongNameThatKeepsGoing ||
-  firstItemWithAVeryLongNameThatKeepsGoing ||
-  {};
+  firstItemWithAVeryLongNameThatKeepsGoing
+  || firstItemWithAVeryLongNameThatKeepsGoing
+  || {};
 const x =
-  firstItemWithAVeryLongNameThatKeepsGoing ||
-  firstItemWithAVeryLongNameThatKeepsGoing ||
-  [];
+  firstItemWithAVeryLongNameThatKeepsGoing
+  || firstItemWithAVeryLongNameThatKeepsGoing
+  || [];
 const x =
   call(
     firstItemWithAVeryLongNameThatKeepsGoing,
@@ -659,8 +659,8 @@ const anyTestFailures = !(
 );
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 const anyTestFailures = !(
-  aggregatedResults.numFailedTests === 0 &&
-  aggregatedResults.numRuntimeErrorTestSuites === 0
+  aggregatedResults.numFailedTests === 0
+  && aggregatedResults.numRuntimeErrorTestSuites === 0
 );
 
 `;
diff --git a/tests/class_comment/__snapshots__/jsfmt.spec.js.snap b/tests/class_comment/__snapshots__/jsfmt.spec.js.snap
@@ -90,9 +90,9 @@ class x {
 class X {
   TEMPLATE =
     // tab index is needed so we can focus, which is needed for keyboard events
-    '<div class="ag-large-text" tabindex="0">' +
-    '<div class="ag-large-textarea"></div>' +
-    "</div>";
+    '<div class="ag-large-text" tabindex="0">'
+    + '<div class="ag-large-textarea"></div>'
+    + "</div>";
 }
 
 export class SnapshotLogger {