indenting chained member and function call (#164)

Janther · mattiaerre · commit c7437b75bece · 2019-06-27T22:54:24.000-07:00
diff --git a/src/nodes/MemberAccess.js b/src/nodes/MemberAccess.js
@@ -1,12 +1,30 @@
 const {
   doc: {
-    builders: { concat }
+    builders: { concat, group, indent, softline }
   }
 } = require('prettier');
 
+const isBeginnigOfChain = path => {
+  const parentNodeType = path.getParentNode().type;
+
+  if (parentNodeType === 'MemberAccess') return false;
+  if (parentNodeType === 'FunctionCall') {
+    const grandParentNodeType = path.getParentNode(1).type;
+    return grandParentNodeType !== 'MemberAccess';
+  }
+
+  return true;
+};
+
 const MemberAccess = {
-  print: ({ node, path, print }) =>
-    concat([path.call(print, 'expression'), '.', node.memberName])
+  print: ({ node, path, print }) => {
+    const doc = concat([
+      path.call(print, 'expression'),
+      indent(concat([softline, '.', node.memberName]))
+    ]);
+
+    return isBeginnigOfChain(path) ? group(doc) : doc;
+  }
 };
 
 module.exports = MemberAccess;
diff --git a/tests/FunctionCalls/__snapshots__/jsfmt.spec.js.snap b/tests/FunctionCalls/__snapshots__/jsfmt.spec.js.snap
@@ -9,7 +9,8 @@ contract FunctionCalls {
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 contract FunctionCalls {
     function foo() {
-        address veryLongValidatorAddress = veryVeryVeryLongSignature.popLast20Bytes();
+        address veryLongValidatorAddress = veryVeryVeryLongSignature
+            .popLast20Bytes();
     }
 }
 
diff --git a/tests/IndexOf/__snapshots__/jsfmt.spec.js.snap b/tests/IndexOf/__snapshots__/jsfmt.spec.js.snap
@@ -100,9 +100,8 @@ contract IndexOf {
                 {
                     subindex = 1;
                     while (
-                        subindex < b.length && (
-                            i + subindex
-                        ) < a.length && a[i + subindex] == b[subindex] // search until the chars don't match or until we reach the end of a or b
+                        subindex < b.length && (i + subindex) < a
+                            .length && a[i + subindex] == b[subindex] // search until the chars don't match or until we reach the end of a or b
                     ) {
                         subindex++;
                     }
diff --git a/tests/MemberAccess/MemberAccess.sol b/tests/MemberAccess/MemberAccess.sol
@@ -0,0 +1,15 @@
+pragma solidity ^0.5.0;
+
+contract MemberAccess {
+    function() {
+        a.b.c.d;
+        a.b().c.d;
+        a.b.c.d();
+        a.b().c().d();
+        veryLongVariable.veryLongMember.veryLongMember.veryLongMember.veryLongMember.veryLongMember;
+        veryLongVariable.veryLongCall(veryLongAttribute).veryLongMember.veryLongMember.veryLongMember;
+        veryLongVariable.veryLongMember.veryLongCall(veryLongAttribute).veryLongMember.veryLongMember;
+        veryLongVariable.veryLongMember.veryLongMember.veryLongMember.veryLongCall(veryLongAttribute);
+        veryLongVariable.veryLongCall(veryLongAttribute).veryLongCall(veryLongAttribute).veryLongCall(veryLongAttribute);
+    }
+}
diff --git a/tests/MemberAccess/__snapshots__/jsfmt.spec.js.snap b/tests/MemberAccess/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,56 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`MemberAccess.sol 1`] = `
+pragma solidity ^0.5.0;
+
+contract MemberAccess {
+    function() {
+        a.b.c.d;
+        a.b().c.d;
+        a.b.c.d();
+        a.b().c().d();
+        veryLongVariable.veryLongMember.veryLongMember.veryLongMember.veryLongMember.veryLongMember;
+        veryLongVariable.veryLongCall(veryLongAttribute).veryLongMember.veryLongMember.veryLongMember;
+        veryLongVariable.veryLongMember.veryLongCall(veryLongAttribute).veryLongMember.veryLongMember;
+        veryLongVariable.veryLongMember.veryLongMember.veryLongMember.veryLongCall(veryLongAttribute);
+        veryLongVariable.veryLongCall(veryLongAttribute).veryLongCall(veryLongAttribute).veryLongCall(veryLongAttribute);
+    }
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+pragma solidity ^0.5.0;
+
+contract MemberAccess {
+    function() {
+        a.b.c.d;
+        a.b().c.d;
+        a.b.c.d();
+        a.b().c().d();
+        veryLongVariable
+            .veryLongMember
+            .veryLongMember
+            .veryLongMember
+            .veryLongMember
+            .veryLongMember;
+        veryLongVariable
+            .veryLongCall(veryLongAttribute)
+            .veryLongMember
+            .veryLongMember
+            .veryLongMember;
+        veryLongVariable
+            .veryLongMember
+            .veryLongCall(veryLongAttribute)
+            .veryLongMember
+            .veryLongMember;
+        veryLongVariable
+            .veryLongMember
+            .veryLongMember
+            .veryLongMember
+            .veryLongCall(veryLongAttribute);
+        veryLongVariable
+            .veryLongCall(veryLongAttribute)
+            .veryLongCall(veryLongAttribute)
+            .veryLongCall(veryLongAttribute);
+    }
+}
+
+`;
diff --git a/tests/MemberAccess/jsfmt.spec.js b/tests/MemberAccess/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname);
diff --git a/tests/SplittableCommodity/__snapshots__/jsfmt.spec.js.snap b/tests/SplittableCommodity/__snapshots__/jsfmt.spec.js.snap
@@ -80,15 +80,12 @@ contract SplittableCommodity is MintableCommodity {
         public
         whenNotPaused
     {
-        address supplierProxy = IContractRegistry(
-            contractRegistry
-        ).getLatestProxyAddr("Supplier");
+        address supplierProxy = IContractRegistry(contractRegistry)
+            .getLatestProxyAddr("Supplier");
         require(
-            msg.sender == IContractRegistry(
-                contractRegistry
-            ).getLatestProxyAddr("FifoCrcMarket") || ISupplier(
-                supplierProxy
-            ).isAllowed(this, "IMintableCommodity"),
+            msg.sender == IContractRegistry(contractRegistry)
+                .getLatestProxyAddr("FifoCrcMarket") || ISupplier(supplierProxy)
+                .isAllowed(this, "IMintableCommodity"),
             "Splitting can only be done when both the ISplittableCommodity interface is enabled and is called by a supplier or the FifoCrcMarket is used."
         );
 
@@ -109,9 +106,8 @@ contract SplittableCommodity is MintableCommodity {
         );
 
         if (
-            msg.sender == IContractRegistry(
-                contractRegistry
-            ).getLatestProxyAddr("FifoCrcMarket")
+            msg.sender == IContractRegistry(contractRegistry)
+                .getLatestProxyAddr("FifoCrcMarket")
         ) {
             _transfer(ownerOf(_tokenId), _to, newCRCId);
         } else {
diff --git a/tests/strings/__snapshots__/jsfmt.spec.js.snap b/tests/strings/__snapshots__/jsfmt.spec.js.snap
@@ -1500,12 +1500,8 @@ library strings {
         pure
         returns (bool)
     {
-        return rfindPtr(
-            self._len,
-            self._ptr,
-            needle._len,
-            needle._ptr
-        ) != self._ptr;
+        return rfindPtr(self._len, self._ptr, needle._len, needle._ptr) != self
+            ._ptr;
     }
 
     /*

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ contract FunctionCalls {`
`9`	`9`	`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
`10`	`10`	`contract FunctionCalls {`
`11`	`11`	`function foo() {`
`12`		`- address veryLongValidatorAddress = veryVeryVeryLongSignature.popLast20Bytes();`
	`12`	`+ address veryLongValidatorAddress = veryVeryVeryLongSignature`
	`13`	`+ .popLast20Bytes();`
`13`	`14`	`}`
`14`	`15`	`}`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,8 @@ contract IndexOf {`
`100`	`100`	`{`
`101`	`101`	`subindex = 1;`
`102`	`102`	`while (`
`103`		`- subindex < b.length && (`
`104`		`- i + subindex`
`105`		`- ) < a.length && a[i + subindex] == b[subindex] // search until the chars don't match or until we reach the end of a or b`
	`103`	`+ subindex < b.length && (i + subindex) < a`
	`104`	`+ .length && a[i + subindex] == b[subindex] // search until the chars don't match or until we reach the end of a or b`
`106`	`105`	`) {`
`107`	`106`	`subindex++;`
`108`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1500,12 +1500,8 @@ library strings {`
`1500`	`1500`	`pure`
`1501`	`1501`	`returns (bool)`
`1502`	`1502`	`{`
`1503`		`- return rfindPtr(`
`1504`		`- self._len,`
`1505`		`- self._ptr,`
`1506`		`- needle._len,`
`1507`		`- needle._ptr`
`1508`		`- ) != self._ptr;`
	`1503`	`+ return rfindPtr(self._len, self._ptr, needle._len, needle._ptr) != self`
	`1504`	`+ ._ptr;`
`1509`	`1505`	`}`
`1510`	`1506`
`1511`	`1507`	`/*`