Merge pull request #7 from maxsam4/dev

Dev

Author: maxsam4

README.md

@@ -44,7 +44,7 @@ You may add the command script to your package.json file and then use `npm run s
 4) Low level `call` now returns 2 parameters rather than 1. This plugin does not rafactor it.
 
 ### Known bugs
-1) Incomplete tupples like `(hello, )` get incorrectly refactored to `(hello)`.
+None. Please report the bugs you may find.
 
 ### TODO
 1) Add test cases.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-solidity-refactor",
-  "version": "1.0.0-alpha.12",
+  "version": "1.0.0-alpha.13",
   "description": "prettier plugin for solidity that refactors solidity 0.4.x code to solidity 0.5.x code",
   "main": "src",
   "repository": {
@@ -30,7 +30,7 @@
     "escape-string-regexp": "^1.0.5",
     "extract-comments": "^1.1.0",
     "prettier": "^1.15.3",
-    "solidity-parser-antlr": "^0.3.3",
+    "solidity-parser-antlr": "^0.4.0",
     "string-width": "^3.0.0"
   }
 }

src/printer.js

@@ -31,6 +31,10 @@ function printPreservingEmptyLines(path, key, options, print) {
 function genericPrint(path, options, print) {
   const node = path.getValue();
   let doc;
+  if (node === null) {
+    return '';
+  }
+
   switch (node.type) {
     case 'SourceUnit':
       return concat([
@@ -338,12 +342,7 @@ function genericPrint(path, options, print) {
 
       doc = join(
         ', ',
-        path.map(statementPath => {
-          if (!statementPath.getValue()) {
-            return ', ';
-          }
-          return print(statementPath);
-        }, 'variables')
+        path.map(statementPath => print(statementPath), 'variables')
       );
 
       if (node.variables.length > 1 || startsWithVar) {

yarn.lock

@@ -57,10 +57,10 @@ prettier@^1.15.3:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
   integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==
 
-solidity-parser-antlr@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.3.3.tgz#0352e35f914095daa7eef9f3a55cf8074e28cc5b"
-  integrity sha512-RNUc18pjf7DLWs//WF+V+VnvrbetEbNFUYxm2JFbXU62G9WSu+nVyDxV5r+FG4wu8jom17vLdM/3I7bMBGfZ9g==
+solidity-parser-antlr@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.4.0.tgz#005f38c396ca23cf7aada9b1a10d875176788201"
+  integrity sha512-RrIsh5VoHmrMQia6yLY8u8rx3JPREhSiCFz4Xb0h1Oh0prUYU2ukyWO8gG892V0UMHIXCWqvdZ3wSctNwdWThg==
 
 string-width@^3.0.0:
   version "3.0.0"