avoid calling path.node when we already have the reference

Author: Janther

src/slang-nodes/ContractMembers.ts

@@ -36,9 +36,10 @@ export class ContractMembers extends SlangNode {
     options: ParserOptions<AstNode>
   ): Doc {
     return this.items.length > 0 || (this.comments?.length || 0) > 0
-      ? printSeparatedItem(printPreservingEmptyLines(path, print, options), {
-          firstSeparator: hardline
-        })
+      ? printSeparatedItem(
+          printPreservingEmptyLines(this, path, print, options),
+          { firstSeparator: hardline }
+        )
       : '';
   }
 }

src/slang-nodes/InterfaceMembers.ts

@@ -36,9 +36,10 @@ export class InterfaceMembers extends SlangNode {
     options: ParserOptions<AstNode>
   ): Doc {
     return this.items.length > 0 || (this.comments?.length || 0) > 0
-      ? printSeparatedItem(printPreservingEmptyLines(path, print, options), {
-          firstSeparator: hardline
-        })
+      ? printSeparatedItem(
+          printPreservingEmptyLines(this, path, print, options),
+          { firstSeparator: hardline }
+        )
       : '';
   }
 }

src/slang-nodes/LibraryMembers.ts

@@ -36,9 +36,10 @@ export class LibraryMembers extends SlangNode {
     options: ParserOptions<AstNode>
   ): Doc {
     return this.items.length > 0 || (this.comments?.length || 0) > 0
-      ? printSeparatedItem(printPreservingEmptyLines(path, print, options), {
-          firstSeparator: hardline
-        })
+      ? printSeparatedItem(
+          printPreservingEmptyLines(this, path, print, options),
+          { firstSeparator: hardline }
+        )
       : '';
   }
 }

src/slang-nodes/MemberAccessExpression.ts

@@ -10,19 +10,18 @@ import { TerminalNode } from './TerminalNode.js';
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
-import type { AstNode } from './types.d.ts';
+import type { AstNode, ChainableExpression } from './types.d.ts';
 
 const { group, indent, label, softline } = doc.builders;
 
 function isEndOfChain(
-  node: MemberAccessExpression,
+  node: ChainableExpression,
   path: AstPath<Expression['variant']>
 ): boolean {
-  for (
-    let i = 1, current: Expression['variant'] = node, parent = path.getNode(i);
-    parent && isChainableExpression(parent);
-    i++, current = parent, parent = path.getNode(i)
-  ) {
+  for (let i = 1, current = node; ; i++) {
+    const parent = path.getNode(i)!;
+    if (!isChainableExpression(parent)) break;
+
     switch (parent.kind) {
       case NonterminalKind.MemberAccessExpression:
         // If `parent` is a MemberAccessExpression we are not at the end
@@ -41,6 +40,7 @@ function isEndOfChain(
         if (current !== parent.operand) return true;
         break;
     }
+    current = parent;
   }
   return true;
 }

src/slang-nodes/Parameters.ts

@@ -36,7 +36,7 @@ export class Parameters extends SlangNode {
       return printSeparatedList(path.map(print, 'items'), { grouped: false });
     }
 
-    const parameterComments = printComments(path, options);
+    const parameterComments = printComments(this, path, options);
 
     return parameterComments.length > 0
       ? printSeparatedItem(parameterComments)

src/slang-nodes/PositionalArguments.ts

@@ -36,7 +36,7 @@ export class PositionalArguments extends SlangNode {
     if (this.items.length > 0) {
       return printSeparatedList(path.map(print, 'items'));
     }
-    const argumentComments = printComments(path, options);
+    const argumentComments = printComments(this, path, options);
 
     return argumentComments.length > 0
       ? printSeparatedItem(argumentComments)

src/slang-nodes/SourceUnitMembers.ts

@@ -31,6 +31,6 @@ export class SourceUnitMembers extends SlangNode {
     print: PrintFunction,
     options: ParserOptions<AstNode>
   ): Doc {
-    return printPreservingEmptyLines(path, print, options);
+    return printPreservingEmptyLines(this, path, print, options);
   }
 }

src/slang-nodes/Statements.ts

@@ -36,9 +36,10 @@ export class Statements extends SlangNode {
     options: ParserOptions<AstNode>
   ): Doc {
     return this.items.length > 0 || (this.comments?.length || 0) > 0
-      ? printSeparatedItem(printPreservingEmptyLines(path, print, options), {
-          firstSeparator: hardline
-        })
+      ? printSeparatedItem(
+          printPreservingEmptyLines(this, path, print, options),
+          { firstSeparator: hardline }
+        )
       : '';
   }
 }

src/slang-nodes/YulStatements.ts

@@ -36,9 +36,10 @@ export class YulStatements extends SlangNode {
     options: ParserOptions<AstNode>
   ): Doc {
     return this.items.length > 0 || (this.comments?.length || 0) > 0
-      ? printSeparatedItem(printPreservingEmptyLines(path, print, options), {
-          firstSeparator: hardline
-        })
+      ? printSeparatedItem(
+          printPreservingEmptyLines(this, path, print, options),
+          { firstSeparator: hardline }
+        )
       : '';
   }
 }

src/slang-nodes/types.d.ts

@@ -494,6 +494,11 @@ export type BinaryOperation = Extract<
   }
 >;
 
+export type ChainableExpression =
+  | FunctionCallExpression
+  | IndexAccessExpression
+  | MemberAccessExpression;
+
 export type AstNode =
   | StrictAstNode
   | Comment