From 88e004184b67cc073d43b2b6a152b03240705f84 Mon Sep 17 00:00:00 2001
From: Christopher Chedeau <vjeux@fb.com>
Date: Wed, 19 Apr 2017 13:19:26 -0700
Subject: [PATCH] 1.2.2

---
 CHANGELOG.md         | 6 ++++++
 docs/prettier.min.js | 4 ++--
 package.json         | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ead77e9043aa..a7b1ff4507d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.2.2
+
+[link](https://github.com/jlongster/prettier/compare/1.2.1...1.2.2)
+
+* Only break for conditionals (#1350)
+
 # 1.2.1
 
 [link](https://github.com/jlongster/prettier/compare/1.2.0...1.2.1)
diff --git a/docs/prettier.min.js b/docs/prettier.min.js
index 80f0dcd05144..cf45cd7dae4e 100644
--- a/docs/prettier.min.js
+++ b/docs/prettier.min.js
@@ -9988,7 +9988,7 @@ function printComments(path, print, options, needsSemi) {
 var comments$1 = { attach, printComments, printDanglingComments };
 
 var name = "prettier";
-var version$2 = "1.2.1";
+var version$2 = "1.2.2";
 var description = "Prettier is an opinionated JavaScript formatter";
 var bin = {"prettier":"./bin/prettier.js"};
 var repository = "prettier/prettier";
@@ -13834,7 +13834,7 @@ function printBinaryishExpressions(path, print, options, isNested, isInsideParen
     // in order to avoid having a small right part like -1 be on its own line.
     const parent = path.getParentNode();
     const shouldGroup =
-      !isInsideParenthesis &&
+      !(isInsideParenthesis && node.type === "LogicalExpression") &&
       parent.type !== node.type &&
       node.left.type !== node.type &&
       node.right.type !== node.type;
diff --git a/package.json b/package.json
index 1071fe23444b..410d6ec28757 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Prettier is an opinionated JavaScript formatter",
   "bin": {
     "prettier": "./bin/prettier.js"