Omit semicolon in for statements init and loop expressions (#69)

* Omit semicolon in for statements init and loop expressions

* fix snap

* use omitSemicolon on VariableDeclarationStatement

* bump version

Author: Franco Victorio

package.json

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

src/parser.js

@@ -5,6 +5,18 @@ const parser = require('solidity-parser-antlr');
 const parse = text => {
   const parsed = parser.parse(text, { loc: true, range: true });
   parsed.comments = extract(text);
+
+  parser.visit(parsed, {
+    ForStatement(ctx) {
+      if (ctx.initExpression) {
+        ctx.initExpression.omitSemicolon = true;
+      }
+      if (ctx.loopExpression) {
+        ctx.loopExpression.omitSemicolon = true;
+      }
+    }
+  });
+
   return parsed;
 };
 

src/printer.js

@@ -162,10 +162,9 @@ function genericPrint(path, options, print) {
       ]);
 
     case 'ExpressionStatement': {
-      const addSemicolon = path.getParentNode().type !== 'ForStatement';
       return concat([
         node.expression ? path.call(print, 'expression') : '',
-        addSemicolon ? ';' : ''
+        node.omitSemicolon ? '' : ';'
       ]);
     }
     case 'FunctionCall':
@@ -245,8 +244,7 @@ function genericPrint(path, options, print) {
       if (node.initialValue) {
         doc = concat([doc, ' = ', path.call(print, 'initialValue')]);
       }
-      const addSemicolon = path.getParentNode().type !== 'ForStatement';
-      return concat([doc, addSemicolon ? ';' : '']);
+      return concat([doc, node.omitSemicolon ? '' : ';']);
     }
     case 'StateVariableDeclaration':
       doc = concat(

tests/Etc/Etc.sol

@@ -26,4 +26,10 @@ contract Contract {
   function ifBlockInOneLine(uint a) returns (uint b) {
     if (a < 0) b = 0x67; else if (a == 0) b = 0x12; else b = 0x78;
   }
+
+  function forWithoutBlock() {
+    uint i;
+    uint sum;
+    for ( i = 0; i < 10; i++ ) sum   +=  i;
+  }
 }

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

@@ -29,6 +29,12 @@ contract Contract {
   function ifBlockInOneLine(uint a) returns (uint b) {
     if (a < 0) b = 0x67; else if (a == 0) b = 0x12; else b = 0x78;
   }
+
+  function forWithoutBlock() {
+    uint i;
+    uint sum;
+    for ( i = 0; i < 10; i++ ) sum   +=  i;
+  }
 }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 pragma solidity ^0.4.24;
@@ -61,6 +67,12 @@ contract Contract {
     else if (a == 0) b = 0x12;
     else b = 0x78;
   }
+
+  function forWithoutBlock() {
+    uint i;
+    uint sum;
+    for (i = 0; i < 10; i++) sum += i;
+  }
 }
 
 `;