1.2.2

prettier · Apr 19, 2017 · 88e0041 · 88e0041
1 parent bae08d4
commit 88e0041
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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"