Add space after returns keyword (#88)

Author: Franco Victorio

src/printer.js

@@ -112,7 +112,7 @@ function genericPrint(path, options, print) {
       if (node.returnParameters) {
         doc = join(' ', [
           doc,
-          concat(['returns(', path.call(print, 'returnParameters'), ')'])
+          concat(['returns (', path.call(print, 'returnParameters'), ')'])
         ]);
       }
       if (node.body) {
@@ -519,7 +519,7 @@ function genericPrint(path, options, print) {
       const returns = returnTypes => {
         if (returnTypes.length > 0) {
           return concat([
-            'returns(',
+            'returns (',
             join(', ', path.map(print, 'returnTypes')),
             ')'
           ]);

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

@@ -63,7 +63,7 @@ contract BasicIterator {
     }
   }
 
-  function getSum() constant returns(uint) { // "constant" just means this function returns something to the caller
+  function getSum() constant returns (uint) { // "constant" just means this function returns something to the caller
     // which is immediately followed by what type gets returned, in this case a full uint256
     uint8 sum = 0;
     uint8 x = 0;

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

@@ -54,7 +54,7 @@ pragma solidity ^0.4.24;
 
 contract Contract {
   struct StructWithFunctionTypes {
-    function(uint, uint) returns(bool) a;
+    function(uint, uint) returns (bool) a;
     function(bytes32, bytes32) internal view[] b;
     function(bytes32, bytes32) internal[] c;
   }
@@ -69,7 +69,7 @@ contract Contract {
     _;
   }
 
-  function ifBlockInOneLine(uint a) returns(uint b) {
+  function ifBlockInOneLine(uint a) returns (uint b) {
     if (a < 0) b = 0x67;
     else if (a == 0) b = 0x12;
     else b = 0x78;
@@ -81,7 +81,7 @@ contract Contract {
     for (i = 0; i < 10; i++) sum += i;
   }
 
-  function fun(uint256 a) returns(uint) {
+  function fun(uint256 a) returns (uint) {
     if (something) foo();
     // comment
     else if (somethingElse) bar();

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

@@ -78,7 +78,7 @@ contract IndexOf {
 
   int whatwastheval = -10; // -2 = not yet tested, as separate from -1, tested but error
 
-  function indexOf(string _a, string _b) returns(int) { // _a = string to search, _b = string we want to find
+  function indexOf(string _a, string _b) returns (int) { // _a = string to search, _b = string we want to find
     bytes memory a = bytes(_a);
     bytes memory b = bytes(_b);
 
@@ -109,7 +109,7 @@ contract IndexOf {
     }
   }
 
-  function whatWasTheVal() constant returns(int) {
+  function whatWasTheVal() constant returns (int) {
     return whatwastheval;
   }
 

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

@@ -104,7 +104,7 @@ contract Ownable {
   /**
    * @return the address of the owner.
    */
-  function owner() public view returns(address) {
+  function owner() public view returns (address) {
     return _owner;
   }
 
@@ -119,7 +119,7 @@ contract Ownable {
   /**
    * @return true if \`msg.sender\` is the owner of the contract.
    */
-  function isOwner() public view returns(bool) {
+  function isOwner() public view returns (bool) {
     return msg.sender == _owner;
   }
 

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

@@ -94,7 +94,7 @@ contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale {
     require(_goal <= _cap);
   }
 
-  function createTokenContract() internal returns(MintableToken) {
+  function createTokenContract() internal returns (MintableToken) {
     return new SampleCrowdsaleToken();
   }
 

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

@@ -194,7 +194,7 @@ contract SimpleAuction {
   }
 
   /// Withdraw a bid that was overbid.
-  function withdraw() public returns(bool) {
+  function withdraw() public returns (bool) {
     uint amount = pendingReturns[msg.sender];
     if (amount > 0) {
       // It is important to set this to zero because the recipient

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

@@ -26,7 +26,7 @@ contract SimpleStorage {
     storedData = x;
   }
 
-  function get() public view returns(uint) {
+  function get() public view returns (uint) {
     return storedData;
   }
 }

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

@@ -787,7 +787,7 @@ library strings {
      * @param self The string to make a slice from.
      * @return A newly allocated slice containing the entire string.
      */
-  function toSlice(string memory self) internal pure returns(slice memory) {
+  function toSlice(string memory self) internal pure returns (slice memory) {
     uint ptr;
     assembly {
       ptr := add(self, 0x20)
@@ -800,7 +800,7 @@ library strings {
      * @param self The value to find the length of.
      * @return The length of the string, from 0 to 32.
      */
-  function len(bytes32 self) internal pure returns(uint) {
+  function len(bytes32 self) internal pure returns (uint) {
     uint ret;
     if (self == 0) return 0;
     if (self & 0xffffffffffffffffffffffffffffffff == 0) {
@@ -832,7 +832,7 @@ library strings {
      * @return A new slice containing the value of the input argument up to the
      *         first null.
      */
-  function toSliceB32(bytes32 self) internal pure returns(slice memory ret) {
+  function toSliceB32(bytes32 self) internal pure returns (slice memory ret) {
     // Allocate space for \`self\` in memory, copy it there, and point ret at it
     assembly {
       let ptr := mload(0x40)
@@ -848,7 +848,7 @@ library strings {
      * @param self The slice to copy.
      * @return A new slice containing the same data as \`self\`.
      */
-  function copy(slice memory self) internal pure returns(slice memory) {
+  function copy(slice memory self) internal pure returns (slice memory) {
     return slice(self._len, self._ptr);
   }
 
@@ -857,7 +857,7 @@ library strings {
      * @param self The slice to copy.
      * @return A newly allocated string containing the slice's text.
      */
-  function toString(slice memory self) internal pure returns(string memory) {
+  function toString(slice memory self) internal pure returns (string memory) {
     string memory ret = new string(self._len);
     uint retptr;
     assembly {
@@ -876,7 +876,7 @@ library strings {
      * @param self The slice to operate on.
      * @return The length of the slice in runes.
      */
-  function len(slice memory self) internal pure returns(uint l) {
+  function len(slice memory self) internal pure returns (uint l) {
     // Starting at ptr-31 means the LSB will be the byte we care about
     uint ptr = self._ptr - 31;
     uint end = ptr + self._len;
@@ -906,7 +906,7 @@ library strings {
      * @param self The slice to operate on.
      * @return True if the slice is empty, False otherwise.
      */
-  function empty(slice memory self) internal pure returns(bool) {
+  function empty(slice memory self) internal pure returns (bool) {
     return self._len == 0;
   }
 
@@ -919,9 +919,10 @@ library strings {
      * @param other The second slice to compare.
      * @return The result of the comparison.
      */
-  function compare(slice memory self, slice memory other) internal pure returns(
-    int
-  ) {
+  function compare(
+    slice memory self,
+    slice memory other
+  ) internal pure returns (int) {
     uint shortest = self._len;
     if (other._len < self._len) shortest = other._len;
 
@@ -955,7 +956,7 @@ library strings {
      * @param self The second slice to compare.
      * @return True if the slices are equal, false otherwise.
      */
-  function equals(slice memory self, slice memory other) internal pure returns(
+  function equals(slice memory self, slice memory other) internal pure returns (
     bool
   ) {
     return compare(self, other) == 0;
@@ -968,9 +969,10 @@ library strings {
      * @param rune The slice that will contain the first rune.
      * @return \`rune\`.
      */
-  function nextRune(slice memory self, slice memory rune) internal pure returns(
-    slice memory
-  ) {
+  function nextRune(
+    slice memory self,
+    slice memory rune
+  ) internal pure returns (slice memory) {
     rune._ptr = self._ptr;
 
     if (self._len == 0) {
@@ -1014,7 +1016,9 @@ library strings {
      * @param self The slice to operate on.
      * @return A slice containing only the first rune from \`self\`.
      */
-  function nextRune(slice memory self) internal pure returns(slice memory ret) {
+  function nextRune(slice memory self) internal pure returns (
+    slice memory ret
+  ) {
     nextRune(self, ret);
   }
 
@@ -1023,7 +1027,7 @@ library strings {
      * @param self The slice to operate on.
      * @return The number of the first codepoint in the slice.
      */
-  function ord(slice memory self) internal pure returns(uint ret) {
+  function ord(slice memory self) internal pure returns (uint ret) {
     if (self._len == 0) {
       return 0;
     }
@@ -1074,7 +1078,7 @@ library strings {
      * @param self The slice to hash.
      * @return The hash of the slice.
      */
-  function keccak(slice memory self) internal pure returns(bytes32 ret) {
+  function keccak(slice memory self) internal pure returns (bytes32 ret) {
     assembly {
       ret := keccak256(mload(add(self, 32)), mload(self))
     }
@@ -1089,7 +1093,7 @@ library strings {
   function startsWith(
     slice memory self,
     slice memory needle
-  ) internal pure returns(bool) {
+  ) internal pure returns (bool) {
     if (self._len < needle._len) {
       return false;
     }
@@ -1115,9 +1119,10 @@ library strings {
      * @param needle The slice to search for.
      * @return \`self\`
      */
-  function beyond(slice memory self, slice memory needle) internal pure returns(
-    slice memory
-  ) {
+  function beyond(
+    slice memory self,
+    slice memory needle
+  ) internal pure returns (slice memory) {
     if (self._len < needle._len) {
       return self;
     }
@@ -1149,7 +1154,7 @@ library strings {
   function endsWith(
     slice memory self,
     slice memory needle
-  ) internal pure returns(bool) {
+  ) internal pure returns (bool) {
     if (self._len < needle._len) {
       return false;
     }
@@ -1177,7 +1182,7 @@ library strings {
      * @param needle The slice to search for.
      * @return \`self\`
      */
-  function until(slice memory self, slice memory needle) internal pure returns(
+  function until(slice memory self, slice memory needle) internal pure returns (
     slice memory
   ) {
     if (self._len < needle._len) {
@@ -1208,7 +1213,7 @@ library strings {
     uint selfptr,
     uint needlelen,
     uint needleptr
-  ) private pure returns(uint) {
+  ) private pure returns (uint) {
     uint ptr = selfptr;
     uint idx;
 
@@ -1262,7 +1267,7 @@ library strings {
     uint selfptr,
     uint needlelen,
     uint needleptr
-  ) private pure returns(uint) {
+  ) private pure returns (uint) {
     uint ptr;
 
     if (needlelen <= selflen) {
@@ -1316,7 +1321,7 @@ library strings {
      * @param needle The text to search for.
      * @return \`self\`.
      */
-  function find(slice memory self, slice memory needle) internal pure returns(
+  function find(slice memory self, slice memory needle) internal pure returns (
     slice memory
   ) {
     uint ptr = findPtr(self._len, self._ptr, needle._len, needle._ptr);
@@ -1333,7 +1338,7 @@ library strings {
      * @param needle The text to search for.
      * @return \`self\`.
      */
-  function rfind(slice memory self, slice memory needle) internal pure returns(
+  function rfind(slice memory self, slice memory needle) internal pure returns (
     slice memory
   ) {
     uint ptr = rfindPtr(self._len, self._ptr, needle._len, needle._ptr);
@@ -1355,7 +1360,7 @@ library strings {
     slice memory self,
     slice memory needle,
     slice memory token
-  ) internal pure returns(slice memory) {
+  ) internal pure returns (slice memory) {
     uint ptr = findPtr(self._len, self._ptr, needle._len, needle._ptr);
     token._ptr = self._ptr;
     token._len = ptr - self._ptr;
@@ -1378,7 +1383,7 @@ library strings {
      * @param needle The text to search for in \`self\`.
      * @return The part of \`self\` up to the first occurrence of \`delim\`.
      */
-  function split(slice memory self, slice memory needle) internal pure returns(
+  function split(slice memory self, slice memory needle) internal pure returns (
     slice memory token
   ) {
     split(self, needle, token);
@@ -1398,7 +1403,7 @@ library strings {
     slice memory self,
     slice memory needle,
     slice memory token
-  ) internal pure returns(slice memory) {
+  ) internal pure returns (slice memory) {
     uint ptr = rfindPtr(self._len, self._ptr, needle._len, needle._ptr);
     token._ptr = ptr;
     token._len = self._len - (ptr - self._ptr);
@@ -1420,9 +1425,10 @@ library strings {
      * @param needle The text to search for in \`self\`.
      * @return The part of \`self\` after the last occurrence of \`delim\`.
      */
-  function rsplit(slice memory self, slice memory needle) internal pure returns(
-    slice memory token
-  ) {
+  function rsplit(
+    slice memory self,
+    slice memory needle
+  ) internal pure returns (slice memory token) {
     rsplit(self, needle, token);
   }
 
@@ -1432,7 +1438,7 @@ library strings {
      * @param needle The text to search for in \`self\`.
      * @return The number of occurrences of \`needle\` found in \`self\`.
      */
-  function count(slice memory self, slice memory needle) internal pure returns(
+  function count(slice memory self, slice memory needle) internal pure returns (
     uint cnt
   ) {
     uint ptr = findPtr(
@@ -1461,7 +1467,7 @@ library strings {
   function contains(
     slice memory self,
     slice memory needle
-  ) internal pure returns(bool) {
+  ) internal pure returns (bool) {
     return rfindPtr(
       self._len,
       self._ptr,
@@ -1477,7 +1483,7 @@ library strings {
      * @param other The second slice to concatenate.
      * @return The concatenation of the two strings.
      */
-  function concat(slice memory self, slice memory other) internal pure returns(
+  function concat(slice memory self, slice memory other) internal pure returns (
     string memory
   ) {
     string memory ret = new string(self._len + other._len);
@@ -1498,7 +1504,7 @@ library strings {
      * @return A newly allocated string containing all the slices in \`parts\`,
      *         joined with \`self\`.
      */
-  function join(slice memory self, slice[] memory parts) internal pure returns(
+  function join(slice memory self, slice[] memory parts) internal pure returns (
     string memory
   ) {
     if (parts.length == 0) return "";