Print else on new line when consequent is not a block (#68)

* Print else on new line when consequent is not a block

* bump version

Author: Franco Victorio

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-solidity",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0-alpha.9",
   "description": "prettier plugin for solidity",
   "main": "src",
   "scripts": {

src/printer.js

@@ -325,7 +325,13 @@ function genericPrint(path, options, print) {
         path.call(print, 'trueBody')
       ]);
       if (node.falseBody) {
-        doc = concat([doc, ' else ', path.call(print, 'falseBody')]);
+        const elseOnSameLine = node.trueBody.type === 'Block';
+        doc = concat([
+          doc,
+          elseOnSameLine ? ' ' : hardline,
+          'else ',
+          path.call(print, 'falseBody')
+        ]);
       }
       return doc;
     case 'EnumDefinition':

tests/Etc/Etc.sol

@@ -22,4 +22,8 @@ contract Contract {
     require(msg.sender != x);
     _;
   }
+
+  function ifBlockInOneLine(uint a) returns (uint b) {
+    if (a < 0) b = 0x67; else if (a == 0) b = 0x12; else b = 0x78;
+  }
 }

tests/Etc/__snapshots__/jsfmt.spec.js.snap

@@ -25,6 +25,10 @@ contract Contract {
     require(msg.sender != x);
     _;
   }
+
+  function ifBlockInOneLine(uint a) returns (uint b) {
+    if (a < 0) b = 0x67; else if (a == 0) b = 0x12; else b = 0x78;
+  }
 }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 pragma solidity ^0.4.24;
@@ -51,6 +55,12 @@ contract Contract {
     require(msg.sender != x);
     _;
   }
+
+  function ifBlockInOneLine(uint a) returns(uint b) {
+    if (a < 0) b = 0x67;
+    else if (a == 0) b = 0x12;
+    else b = 0x78;
+  }
 }
 
 `;