-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This handles unsplit call chains, fully split ones, as well as
block-style calls, like:
```
target.call(
argument,
);
```
This doesn't fully implement the proposal I sketched out because it only
allows a single block call. There's a long TODO(tall) comment about
whether we want to do that, but I figured it makes sense to do that as a
separate iteration since there is so much in here.
But it implements most of it, and I've migrated all of the existing
tests over. It ended up being both simpler than the old formatter while
also producing better output.
The old formatter has a restriction where the indentation of a piece of
code must be fixed regardless of which way it splits. It can't handle:
```
// Block style, so indent argument +2:
target.property.call(
argument
);
// Can't do block style, so indent +6:
target
.slightlyLongerProperty
.call(
argument
);
```
That leads to it sometimes producing gross output like:
```
target
.longProperty
.anotherLongProperty
.method(
wtfIsGoingOnHere,
);
```
To try to avoid that, it has lots of heuristics during Chunk
construction to try to not end up with output like that during line
splitting.
The new formatter doesn't need any of those heuristics because it can
freely choose indentation during line splitting.- Loading branch information
1 parent
295e4c5
commit e8966c1
Showing
13 changed files
with
1,218 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,206 @@ | ||
| // Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file | ||
| // for details. All rights reserved. Use of this source code is governed by a | ||
| // BSD-style license that can be found in the LICENSE file. | ||
|
|
||
| import 'package:analyzer/dart/ast/ast.dart'; | ||
| import 'package:analyzer/dart/ast/token.dart'; | ||
|
|
||
| import '../ast_extensions.dart'; | ||
| import '../piece/chain.dart'; | ||
| import '../piece/piece.dart'; | ||
| import 'piece_factory.dart'; | ||
|
|
||
| /// Creates [Chain] pieces from method calls and property accesses, along with | ||
| /// postfix operations (`!`, index operators, and function invocation | ||
| /// expressions) that follow them. | ||
| /// | ||
| /// In the AST for method calls, selectors are nested bottom up such that this | ||
| /// expression: | ||
| /// | ||
| /// obj.a(1)[2].c(3) | ||
| /// | ||
| /// Is structured like: | ||
| /// | ||
| /// .c() | ||
| /// / \ | ||
| /// [] 3 | ||
| /// / \ | ||
| /// .a() 2 | ||
| /// / \ | ||
| /// obj 1 | ||
| /// | ||
| /// This means visiting the AST from top down visits the selectors from right | ||
| /// to left. It's easier to format if we organize them as a linear series of | ||
| /// selectors from left to right. Further, we want to organize it into a | ||
| /// two-tier hierarchy. We have an outer list of method calls and property | ||
| /// accesses. Then each of those may have one or more postfix selectors | ||
| /// attached: indexers, null-assertions, or invocations. This mirrors how they | ||
| /// are formatted. | ||
| /// | ||
| /// This lets us create a single [ChainPiece] for the entire series of dotted | ||
| /// operations, so that we can control splitting them or not as a unit. | ||
| class ChainBuilder { | ||
| final PieceFactory _visitor; | ||
|
|
||
| /// The left-most target of the chain. | ||
| late Piece _target; | ||
|
|
||
| /// Whether the target expression may contain newlines when the chain is not | ||
| /// fully split. (It may always contain newlines when the chain splits.) | ||
| /// | ||
| /// This is true for most expressions but false for delimited ones to avoid | ||
| /// ugly formatting like: | ||
| /// | ||
| /// function( | ||
| /// argument, | ||
| /// ) | ||
| /// .method(); | ||
| late final bool _allowSplitInTarget; | ||
|
|
||
| /// The dotted property accesses and method calls following the target. | ||
| final List<ChainCall> _calls = []; | ||
|
|
||
| ChainBuilder(this._visitor, Expression expression) { | ||
| _unwrapCall(expression); | ||
| } | ||
|
|
||
| Piece build() { | ||
| // If there are no calls, there's no chain. | ||
| if (_calls.isEmpty) return _target; | ||
|
|
||
| // Count the number of contiguous properties at the beginning of the chain. | ||
| var leadingProperties = 0; | ||
| while (leadingProperties < _calls.length && | ||
| _calls[leadingProperties].type == CallType.property) { | ||
| leadingProperties++; | ||
| } | ||
|
|
||
| // See if there is a call that we can block format. It can either be the | ||
| // very last call, if non-empty: | ||
| // | ||
| // target.property.method().last( | ||
| // argument, | ||
| // ); | ||
| // | ||
| // Or the second-to-last if the last call can't split: | ||
| // | ||
| // target.property.method().penultimate( | ||
| // argument, | ||
| // ).toList(); | ||
| var blockCallIndex = switch (_calls) { | ||
| [..., ChainCall(canSplit: true)] => _calls.length - 1, | ||
| [..., ChainCall(canSplit: true), ChainCall(canSplit: false)] => | ||
| _calls.length - 2, | ||
| _ => -1, | ||
| }; | ||
|
|
||
| return ChainPiece(_target, _calls, leadingProperties, blockCallIndex, | ||
| allowSplitInTarget: _allowSplitInTarget); | ||
| } | ||
|
|
||
| /// Given [expression], which is the outermost expression for some call chain, | ||
| /// recursively traverses the selectors to fill in the list of [_calls]. | ||
| /// | ||
| /// Initializes [_target] with the innermost subexpression that isn't a part | ||
| /// of the call chain. For example, given: | ||
| /// | ||
| /// foo.bar()!.baz[0][1].bang() | ||
| /// | ||
| /// This returns `foo` and fills [_calls] with: | ||
| /// | ||
| /// .bar()! | ||
| /// .baz[0][1] | ||
| /// .bang() | ||
| void _unwrapCall(Expression expression) { | ||
| switch (expression) { | ||
| case Expression(looksLikeStaticCall: true): | ||
| // Don't include things that look like static method or constructor | ||
| // calls in the call chain because that tends to split up named | ||
| // constructors from their class. | ||
| _visitTarget(expression); | ||
|
|
||
| // Selectors. | ||
| case MethodInvocation(:var target?): | ||
| _unwrapCall(target); | ||
|
|
||
| var callPiece = _visitor.buildPiece((b) { | ||
| b.token(expression.operator); | ||
| b.visit(expression.methodName); | ||
| b.visit(expression.typeArguments); | ||
| b.visit(expression.argumentList); | ||
| }); | ||
|
|
||
| var canSplit = expression.argumentList.arguments | ||
| .canSplit(expression.argumentList.rightParenthesis); | ||
| _calls.add(ChainCall(callPiece, | ||
| canSplit ? CallType.splittableCall : CallType.unsplittableCall)); | ||
|
|
||
| case PropertyAccess(:var target?): | ||
| _unwrapCall(target); | ||
|
|
||
| var piece = _visitor.buildPiece((b) { | ||
| b.token(expression.operator); | ||
| b.visit(expression.propertyName); | ||
| }); | ||
|
|
||
| _calls.add(ChainCall(piece, CallType.property)); | ||
|
|
||
| case PrefixedIdentifier(:var prefix): | ||
| _unwrapCall(prefix); | ||
|
|
||
| var piece = _visitor.buildPiece((b) { | ||
| b.token(expression.period); | ||
| b.visit(expression.identifier); | ||
| }); | ||
|
|
||
| _calls.add(ChainCall(piece, CallType.property)); | ||
|
|
||
| // Postfix expressions. | ||
| case FunctionExpressionInvocation(): | ||
| _unwrapPostfix(expression.function, (target) { | ||
| return _visitor.buildPiece((b) { | ||
| b.add(target); | ||
| b.visit(expression.typeArguments); | ||
| b.visit(expression.argumentList); | ||
| }); | ||
| }); | ||
|
|
||
| case IndexExpression(): | ||
| _unwrapPostfix(expression.target!, (target) { | ||
| return _visitor.createIndexExpression(target, expression); | ||
| }); | ||
|
|
||
| case PostfixExpression() when expression.operator.type == TokenType.BANG: | ||
| _unwrapPostfix(expression.operand, (target) { | ||
| return _visitor.buildPiece((b) { | ||
| b.add(target); | ||
| b.token(expression.operator); | ||
| }); | ||
| }); | ||
|
|
||
| default: | ||
| // Otherwise, it isn't a selector so we've reached the target. | ||
| _visitTarget(expression); | ||
| } | ||
| } | ||
|
|
||
| /// Creates a Piece for [target]. | ||
| void _visitTarget(Expression target) { | ||
| _allowSplitInTarget = target.canBlockSplit; | ||
| _target = _visitor.nodePiece(target); | ||
| } | ||
|
|
||
| void _unwrapPostfix( | ||
| Expression operand, Piece Function(Piece target) createPostfix) { | ||
| _unwrapCall(operand); | ||
| // If we don't have a preceding call to hang the postfix expression off of, | ||
| // wrap it around the target expression. For example: | ||
| // | ||
| // (list + another)! | ||
| if (_calls.isEmpty) { | ||
| _target = createPostfix(_target); | ||
| } else { | ||
| _calls.last.wrapPostfix(createPostfix); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.