Skip to content

Commit

Permalink
Simplify ChainPiece. (#1595)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
munificent authored Nov 5, 2024
1 parent 4e6f44d commit e62313b
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions lib/src/piece/chain.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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();
Expand All @@ -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:
Expand All @@ -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);
Expand Down

0 comments on commit e62313b

Please sign in to comment.