solving the indentation at the beginning of a var declaration that splits (#565)

Author: Janther

src/nodes/VariableDeclarationStatement.js

@@ -1,28 +1,41 @@
 const {
   doc: {
-    builders: { group }
+    builders: { group, ifBreak, indent }
   }
 } = require('prettier');
 
 const printSeparatedList = require('./print-separated-list');
 
-const embraceVariables = (doc, embrace) => (embrace ? ['(', doc, ')'] : doc);
+const embraceVariables = (doc, embrace) =>
+  embrace ? ['(', printSeparatedList(doc), ')'] : doc;
 
 const initialValue = (node, path, print) =>
   node.initialValue ? [' = ', path.call(print, 'initialValue')] : '';
 
+let groupIndex = 0;
 const VariableDeclarationStatement = {
   print: ({ node, path, print }) => {
     const startsWithVar =
       node.variables.filter((x) => x && x.typeName).length === 0;
 
+    const declarationDoc = group(
+      [
+        startsWithVar ? 'var ' : '',
+        embraceVariables(
+          path.map(print, 'variables'),
+          node.variables.length > 1 || startsWithVar
+        )
+      ],
+      { id: `VariableDeclarationStatement.variables-${groupIndex}` }
+    );
+    groupIndex += 1;
+    const initialValueDoc = initialValue(node, path, print);
+
     return group([
-      startsWithVar ? 'var ' : '',
-      embraceVariables(
-        printSeparatedList(path.map(print, 'variables')),
-        node.variables.length > 1 || startsWithVar
-      ),
-      initialValue(node, path, print),
+      declarationDoc,
+      ifBreak(indent(initialValueDoc), initialValueDoc, {
+        groupId: declarationDoc.id
+      }),
       node.omitSemicolon ? '' : ';'
     ]);
   }

tests/format/Issues/Issue564.sol

@@ -0,0 +1,9 @@
+contract Issue564 {
+    function isAuthorized(
+        bytes32 serviceId,
+        address client
+    ) external view override returns (bool) {
+        WhitelistStatus storage whitelistStatus = serviceIdToClientToWhitelistStatus[serviceId][client];
+        return true;
+    }
+}

tests/format/Issues/__snapshots__/jsfmt.spec.js.snap

@@ -137,3 +137,38 @@ contract Issue385 {
 
 ================================================================================
 `;
+
+exports[`Issue564.sol format 1`] = `
+====================================options=====================================
+parsers: ["solidity-parse"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+contract Issue564 {
+    function isAuthorized(
+        bytes32 serviceId,
+        address client
+    ) external view override returns (bool) {
+        WhitelistStatus storage whitelistStatus = serviceIdToClientToWhitelistStatus[serviceId][client];
+        return true;
+    }
+}
+
+=====================================output=====================================
+contract Issue564 {
+    function isAuthorized(bytes32 serviceId, address client)
+        external
+        view
+        override
+        returns (bool)
+    {
+        WhitelistStatus
+            storage whitelistStatus = serviceIdToClientToWhitelistStatus[
+                serviceId
+            ][client];
+        return true;
+    }
+}
+
+================================================================================
+`;