FunctionTypeName (#133)

Author: Janther

src/nodes/FunctionTypeName.js

@@ -1,36 +1,65 @@
+/* eslint-disable implicit-arrow-linebreak */
 const {
   doc: {
-    builders: { concat, join }
+    builders: { concat, group, indent, join, line, softline }
   }
 } = require('prettier');
 
-const FunctionTypeName = {
-  print: ({ node, path, print }) => {
-    const returns = returnTypes => {
-      if (returnTypes.length > 0) {
-        return concat([
-          'returns (',
-          join(', ', path.map(print, 'returnTypes')),
-          ')'
-        ]);
-      }
-      return null;
-    };
-
-    return join(
-      ' ',
-      [
+const parameterTypes = (node, path, print) =>
+  group(
+    concat([
+      indent(
         concat([
-          'function(',
-          join(', ', path.map(print, 'parameterTypes')),
-          ')'
-        ]),
-        returns(node.returnTypes),
-        node.visibility === 'default' ? null : node.visibility,
-        node.stateMutability
-      ].filter(element => element)
-    );
+          softline,
+          join(concat([',', line]), path.map(print, 'parameterTypes'))
+        ])
+      ),
+      softline
+    ])
+  );
+
+const returnTypes = (node, path, print) => {
+  if (node.returnTypes.length > 0) {
+    return concat([
+      line,
+      'returns (',
+      join(', ', path.map(print, 'returnTypes')),
+      ')'
+    ]);
+  }
+  return '';
+};
+
+const visibility = node => {
+  if (node.visibility && node.visibility !== 'default') {
+    return concat([line, node.visibility]);
   }
+  return '';
+};
+
+const stateMutability = node => {
+  if (node.stateMutability && node.stateMutability !== 'default') {
+    return concat([line, node.stateMutability]);
+  }
+  return '';
+};
+
+const FunctionTypeName = {
+  print: ({ node, path, print }) =>
+    concat([
+      'function(',
+      parameterTypes(node, path, print),
+      ')',
+      indent(
+        group(
+          concat([
+            returnTypes(node, path, print),
+            visibility(node),
+            stateMutability(node)
+          ])
+        )
+      )
+    ])
 };
 
 module.exports = FunctionTypeName;

tests/Etc/Etc.sol

@@ -11,6 +11,8 @@ contract Contract {
     function (uint, uint) returns(bool)a;
     function(bytes32, bytes32)   internal view[]  b;
     function  (bytes32, bytes32)internal[]   c;
+    function(bytes32, bytes32, bytes32, bytes32, bytes32, bytes32)   internal view[]  d;
+    function(bytes32, bytes32, bytes32, bytes32, bytes32, bytes32, bytes32, bytes32, bytes32)   internal view[]  e;
   }
 
   modifier modifierWithoutParams() {

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

@@ -14,6 +14,8 @@ contract Contract {
     function (uint, uint) returns(bool)a;
     function(bytes32, bytes32)   internal view[]  b;
     function  (bytes32, bytes32)internal[]   c;
+    function(bytes32, bytes32, bytes32, bytes32, bytes32, bytes32)   internal view[]  d;
+    function(bytes32, bytes32, bytes32, bytes32, bytes32, bytes32, bytes32, bytes32, bytes32)   internal view[]  e;
   }
 
   modifier modifierWithoutParams() {
@@ -57,6 +59,20 @@ contract Contract {
         function(uint, uint) returns (bool) a;
         function(bytes32, bytes32) internal view[] b;
         function(bytes32, bytes32) internal[] c;
+        function(bytes32, bytes32, bytes32, bytes32, bytes32, bytes32)
+            internal
+            view[] d;
+        function(
+            bytes32,
+            bytes32,
+            bytes32,
+            bytes32,
+            bytes32,
+            bytes32,
+            bytes32,
+            bytes32,
+            bytes32
+        ) internal view[] e;
     }
 
     modifier modifierWithoutParams() {