From e62313b8f118da69da8beca2b193b87be91cbbb3 Mon Sep 17 00:00:00 2001
From: Bob Nystrom <rnystrom@google.com>
Date: Tue, 5 Nov 2024 11:26:08 -0800
Subject: [PATCH] Simplify ChainPiece. (#1595)

We were still passing in allowNewlines to _formatCall() even though that
parameter was no longer used once Piece got the allowChildInState() API.
So I removed that.

Then I noticed that the switch in _formatCall() could be more cleanly
handled by having the cases in format() calculate separate directly. So
I did that.

That left _formatCall() not actually doing anything useful, so I got rid
of it.

There are no behavioral change, it's just a code clean-up.
---
 lib/src/piece/chain.dart | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/lib/src/piece/chain.dart b/lib/src/piece/chain.dart
index f888aac2..71b69442 100644
--- a/lib/src/piece/chain.dart
+++ b/lib/src/piece/chain.dart
@@ -168,7 +168,7 @@ final class ChainPiece extends Piece {
         writer.format(_target);
 
         for (var i = 0; i < _calls.length; i++) {
-          _formatCall(writer, state, i, allowNewlines: false);
+          writer.format(_calls[i]._call);
         }
 
       case _splitAfterProperties:
@@ -177,7 +177,10 @@ final class ChainPiece extends Piece {
 
         for (var i = 0; i < _calls.length; i++) {
           writer.splitIf(i >= _leadingProperties, space: false);
-          _formatCall(writer, state, i, allowNewlines: i >= _leadingProperties);
+
+          // Every non-property call except the last will be on its own line.
+          writer.format(_calls[i]._call,
+              separate: i >= _leadingProperties && i < _calls.length - 1);
         }
 
         writer.popIndent();
@@ -186,7 +189,7 @@ final class ChainPiece extends Piece {
         writer.format(_target);
 
         for (var i = 0; i < _calls.length; i++) {
-          _formatCall(writer, state, i, allowNewlines: i == _blockCallIndex);
+          writer.format(_calls[i]._call);
         }
 
       case State.split:
@@ -195,27 +198,16 @@ final class ChainPiece extends Piece {
 
         for (var i = 0; i < _calls.length; i++) {
           writer.newline();
-          _formatCall(writer, state, i);
+
+          // The chain is fully split so every call except for the last is on
+          // its own line.
+          writer.format(_calls[i]._call, separate: i < _calls.length - 1);
         }
 
         writer.popIndent();
     }
   }
 
-  void _formatCall(CodeWriter writer, State state, int i,
-      {bool allowNewlines = true}) {
-    // If the chain is fully split, then every call except for the last will
-    // be on its own line. If the chain is split after properties, then
-    // every non-property call except the last will be on its own line.
-    var separate = switch (state) {
-      _splitAfterProperties => i >= _leadingProperties && i < _calls.length - 1,
-      State.split => i < _calls.length - 1,
-      _ => false,
-    };
-
-    writer.format(_calls[i]._call, separate: separate);
-  }
-
   @override
   void forEachChild(void Function(Piece piece) callback) {
     callback(_target);