alpha (#34)

* ready to alpha

* moar lines

* s/default/

* reorg test

* fix indentation

Author: mattiaerre

.gitignore

@@ -63,3 +63,5 @@ typings/
 .DS_Store
 
 package-lock.json
+
+yarn.lock

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org

README.md

@@ -17,3 +17,9 @@ node_modules/.bin/prettier --write **/*.sol --plugin=./src
 ```bash
 node_modules/.bin/prettier --write **/*.sol --plugin=./node_modules/prettier-plugin-solidity
 ```
+
+## Install
+
+```bash
+npm install mattiaerre/prettier-plugin-solidity
+```

package.json

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

src/printer.js

@@ -49,7 +49,8 @@ function genericPrint(path, options, print) {
         indent(line),
         indent(join(hardline, path.map(print, 'subNodes'))),
         line,
-        '}'
+        '}',
+        line
       ]);
     case 'InheritanceSpecifier':
       return path.call(print, 'baseName');
@@ -91,7 +92,7 @@ function genericPrint(path, options, print) {
         ]);
       }
       if (node.body) {
-        return join(' ', [doc, path.call(print, 'body')]);
+        return concat([line, join(' ', [doc, path.call(print, 'body')])]);
       }
       return concat([doc, ';']);
     case 'ParameterList':
@@ -254,6 +255,9 @@ function genericPrint(path, options, print) {
       if (node.isIndexed) {
         doc = join(' ', [doc, 'indexed']);
       }
+      if (node.visibility === 'default') {
+        return join(' ', [doc, node.name]);
+      }
       return join(' ', [doc, node.visibility, node.name]);
     case 'ArrayTypeName':
       return concat([

tests/contract/inbox.sol tests/Inbox.soltests/contract/inbox.sol renamed to tests/Inbox.sol

@@ -0,0 +1,14 @@
+pragma solidity ^0.4.0;
+
+contract SimpleStorage {
+  string public name = "SimpleStorage";
+  uint storedData;
+
+  function set(uint x) public {
+    storedData = x;
+  }
+
+  function get() public view returns (uint) {
+    return storedData;
+  }
+}

tests/SimpleStorage.sol

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`inbox.sol 1`] = `
+exports[`Inbox.sol 1`] = `
 // This comment spans one line
 
 /*
@@ -28,11 +28,46 @@ contract Inbox {
 pragma solidity ^0.4.23;
 contract Inbox {
   string public message;
+
   constructor(string initialMessage) public {
     message = initialMessage;
   }
+
   function setMessage(string newMessage) public {
     message = newMessage;
   }
 }
+
+`;
+
+exports[`SimpleStorage.sol 1`] = `
+pragma solidity ^0.4.0;
+
+contract SimpleStorage {
+  string public name = "SimpleStorage";
+  uint storedData;
+
+  function set(uint x) public {
+    storedData = x;
+  }
+
+  function get() public view returns (uint) {
+    return storedData;
+  }
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+pragma solidity ^0.4.0;
+contract SimpleStorage {
+  string public name = "SimpleStorage";
+  uint storedData;
+
+  function set(uint x) public {
+    storedData = x;
+  }
+
+  function get() public view returns(uint) {
+    return storedData;
+  }
+}
+
 `;