removing unnecessary non-null assertions

Author: Janther

src/slang-nodes/FunctionCallExpression.ts

@@ -45,10 +45,9 @@ export class FunctionCallExpression implements SlangNode {
     // If we are at the end of a MemberAccessChain we should indent the
     // arguments accordingly.
     if (isLabel(operandDoc) && operandDoc.label === 'MemberAccessChain') {
-      operandDoc = group(operandDoc.contents, {
-        id: Symbol('FunctionCallExpression.operand')
-      });
-      argumentsDoc = indentIfBreak(argumentsDoc, { groupId: operandDoc.id! });
+      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]);

src/slang-nodes/IndexAccessExpression.ts

@@ -54,11 +54,10 @@ export class IndexAccessExpression implements SlangNode {
     // If we are at the end of a MemberAccessChain we should indent the
     // arguments accordingly.
     if (isLabel(operandDoc) && operandDoc.label === 'MemberAccessChain') {
-      operandDoc = group(operandDoc.contents, {
-        id: Symbol('IndexAccessExpression.operand')
-      });
+      const groupId = Symbol('Slang.IndexAccessExpression.operand');
+      operandDoc = group(operandDoc.contents, { id: groupId });
 
-      indexDoc = indentIfBreak(indexDoc, { groupId: operandDoc.id! });
+      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]);

src/slang-nodes/StateVariableDefinition.ts

@@ -52,20 +52,17 @@ 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: Symbol('Slang.StateVariableDefinition.attributes')
+      id: groupId
     });
 
     return [
       path.call(print, 'typeName'),
       attributesDoc,
       ' ',
       path.call(print, 'name'),
-      this.value
-        ? indentIfBreak(path.call(print, 'value'), {
-            groupId: attributesDoc.id!
-          })
-        : '',
+      this.value ? indentIfBreak(path.call(print, 'value'), { groupId }) : '',
       ';'
     ];
   }

src/slang-nodes/TupleDeconstructionStatement.ts

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

src/slang-nodes/VariableDeclarationStatement.ts

@@ -57,6 +57,7 @@ export class VariableDeclarationStatement implements SlangNode {
     path: AstPath<VariableDeclarationStatement>,
     print: PrintFunction
   ): Doc {
+    const groupId = Symbol('Slang.VariableDeclarationStatement.variables');
     const declarationDoc = group(
       [
         path.call(print, 'variableType'),
@@ -68,12 +69,12 @@ export class VariableDeclarationStatement implements SlangNode {
           path.call(print, 'name')
         ])
       ],
-      { id: Symbol('Slang.VariableDeclarationStatement.variables') }
+      { id: groupId }
     );
 
     return [
       declarationDoc,
-      indentIfBreak(path.call(print, 'value'), { groupId: declarationDoc.id! }),
+      indentIfBreak(path.call(print, 'value'), { groupId }),
       ';'
     ];
   }