since using the constant groupId there is no need for the group to be stored in a variable and can go directly in the resulting document

Author: Janther

src/slang-nodes/FunctionCallExpression.ts

@@ -39,18 +39,19 @@ export class FunctionCallExpression implements SlangNode {
   }
 
   print(path: AstPath<FunctionCallExpression>, print: PrintFunction): Doc {
-    let operandDoc = path.call(print, 'operand');
-    let argumentsDoc = path.call(print, 'arguments');
+    const operandDoc = path.call(print, 'operand');
+    const argumentsDoc = path.call(print, 'arguments');
 
     // If we are at the end of a MemberAccessChain we should indent the
     // arguments accordingly.
     if (isLabel(operandDoc) && operandDoc.label === 'MemberAccessChain') {
       const groupId = Symbol('Slang.FunctionCallExpression.operand');
-      operandDoc = group(operandDoc.contents, { id: groupId });
-      argumentsDoc = indentIfBreak(argumentsDoc, { groupId });
       // We wrap the expression in a label in case there is an IndexAccess or
       // a FunctionCall following this IndexAccess.
-      return label('MemberAccessChain', [operandDoc, argumentsDoc]);
+      return label('MemberAccessChain', [
+        group(operandDoc.contents, { id: groupId }),
+        indentIfBreak(argumentsDoc, { groupId })
+      ]);
     }
 
     return [operandDoc, argumentsDoc].flat();

src/slang-nodes/IndexAccessExpression.ts

@@ -43,8 +43,8 @@ export class IndexAccessExpression implements SlangNode {
   }
 
   print(path: AstPath<IndexAccessExpression>, print: PrintFunction): Doc {
-    let operandDoc: Doc = path.call(print, 'operand');
-    let indexDoc: Doc = group([
+    const operandDoc: Doc = path.call(print, 'operand');
+    const indexDoc: Doc = group([
       '[',
       indent([softline, path.call(print, 'start'), path.call(print, 'end')]),
       softline,
@@ -55,12 +55,12 @@ export class IndexAccessExpression implements SlangNode {
     // arguments accordingly.
     if (isLabel(operandDoc) && operandDoc.label === 'MemberAccessChain') {
       const groupId = Symbol('Slang.IndexAccessExpression.operand');
-      operandDoc = group(operandDoc.contents, { id: groupId });
-
-      indexDoc = indentIfBreak(indexDoc, { groupId });
       // We wrap the expression in a label in case there is an IndexAccess or
       // a FunctionCall following this IndexAccess.
-      return label('MemberAccessChain', [operandDoc, indexDoc]);
+      return label('MemberAccessChain', [
+        group(operandDoc.contents, { id: groupId }),
+        indentIfBreak(indexDoc, { groupId })
+      ]);
     }
 
     return [operandDoc, indexDoc].flat();

src/slang-nodes/StateVariableDefinition.ts

@@ -53,13 +53,9 @@ export class StateVariableDefinition implements SlangNode {
 
   print(path: AstPath<StateVariableDefinition>, print: PrintFunction): Doc {
     const groupId = Symbol('Slang.StateVariableDefinition.attributes');
-    const attributesDoc = group(indent(path.call(print, 'attributes')), {
-      id: groupId
-    });
-
     return [
       path.call(print, 'typeName'),
-      attributesDoc,
+      group(indent(path.call(print, 'attributes')), { id: groupId }),
       ' ',
       path.call(print, 'name'),
       this.value ? indentIfBreak(path.call(print, 'value'), { groupId }) : '',

src/slang-nodes/TupleDeconstructionStatement.ts

@@ -45,13 +45,11 @@ export class TupleDeconstructionStatement implements SlangNode {
     print: PrintFunction
   ): Doc {
     const groupId = Symbol('Slang.VariableDeclarationStatement.variables');
-    const declarationDoc = group(
-      [this.varKeyword ? 'var (' : '(', path.call(print, 'elements'), ')'],
-      { id: groupId }
-    );
-
     return [
-      declarationDoc,
+      group(
+        [this.varKeyword ? 'var (' : '(', path.call(print, 'elements'), ')'],
+        { id: groupId }
+      ),
       indentIfBreak([' = ', path.call(print, 'expression'), ';'], { groupId })
     ];
   }

src/slang-nodes/VariableDeclarationStatement.ts

@@ -58,22 +58,20 @@ export class VariableDeclarationStatement implements SlangNode {
     print: PrintFunction
   ): Doc {
     const groupId = Symbol('Slang.VariableDeclarationStatement.variables');
-    const declarationDoc = group(
-      [
-        path.call(print, 'variableType'),
-        indent([
-          this.storageLocation
-            ? [line, path.call(print, 'storageLocation')]
-            : '',
-          ' ',
-          path.call(print, 'name')
-        ])
-      ],
-      { id: groupId }
-    );
-
     return [
-      declarationDoc,
+      group(
+        [
+          path.call(print, 'variableType'),
+          indent([
+            this.storageLocation
+              ? [line, path.call(print, 'storageLocation')]
+              : '',
+            ' ',
+            path.call(print, 'name')
+          ])
+        ],
+        { id: groupId }
+      ),
       indentIfBreak(path.call(print, 'value'), { groupId }),
       ';'
     ];