Skip to content

Commit 050b740

Browse files
fishythefishCommit Queue
authored andcommitted
[js_ast] Update pubspec to 3.8 and reformat.
Change-Id: Ie26f89b4a1cf8bd72d014062379091d2d3c00315 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/427582 Auto-Submit: Mayank Patke <[email protected]> Commit-Queue: Stephen Adams <[email protected]> Reviewed-by: Stephen Adams <[email protected]>
1 parent abd4e77 commit 050b740

File tree

7 files changed

+48
-40
lines changed

7 files changed

+48
-40
lines changed

pkg/js_ast/lib/src/builder.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -687,10 +687,10 @@ class MiniJsParser {
687687
// parses as a an equals token followed by a regexp literal start.
688688
newCat =
689689
(code == char_codes.$BANG ||
690-
code == char_codes.$SLASH ||
691-
code == char_codes.$TILDE)
692-
? _Category.none
693-
: _category(code);
690+
code == char_codes.$SLASH ||
691+
code == char_codes.$TILDE)
692+
? _Category.none
693+
: _category(code);
694694
} while (!_singleCharCategory(cat) &&
695695
(cat == newCat ||
696696
(cat == _Category.alpha &&
@@ -956,8 +956,9 @@ class MiniJsParser {
956956
_expectCategory(_Category.comma);
957957
}
958958
}
959-
receiver =
960-
constructor ? New(receiver, arguments) : Call(receiver, arguments);
959+
receiver = constructor
960+
? New(receiver, arguments)
961+
: Call(receiver, arguments);
961962
constructor = false;
962963
} else if (!constructor && _acceptCategory(_Category.lsquare)) {
963964
Expression inBraces = parseExpression();

pkg/js_ast/lib/src/nodes.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -623,9 +623,9 @@ abstract class Node {
623623
final source = _sourceInformation;
624624
return source is _SourceInformationAndAnnotations
625625
? _SourceInformationAndAnnotations(
626-
newSourceInformation,
627-
source._annotations,
628-
)
626+
newSourceInformation,
627+
source._annotations,
628+
)
629629
: newSourceInformation;
630630
}
631631

pkg/js_ast/lib/src/printer.dart

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -796,10 +796,9 @@ class Printer implements NodeVisitor<void> {
796796
required bool newInForInit,
797797
required bool newAtStatementBegin,
798798
}) {
799-
Precedence precedenceLevel =
800-
(isDebugContext && !node.isFinalized)
801-
? Precedence.call
802-
: node.precedenceLevel;
799+
Precedence precedenceLevel = (isDebugContext && !node.isFinalized)
800+
? Precedence.call
801+
: node.precedenceLevel;
803802
bool needsParentheses =
804803
// a - (b + c).
805804
(requiredPrecedence != Precedence.expression &&
@@ -1365,12 +1364,11 @@ class Printer implements NodeVisitor<void> {
13651364
VarCollector vars = VarCollector();
13661365
vars.visitNamedFunction(namedFunction);
13671366
startNode(namedFunction.function);
1368-
int closingPosition =
1369-
currentNode!.closingPosition = functionOut(
1370-
namedFunction.function,
1371-
namedFunction.name,
1372-
vars,
1373-
);
1367+
int closingPosition = currentNode!.closingPosition = functionOut(
1368+
namedFunction.function,
1369+
namedFunction.name,
1370+
vars,
1371+
);
13741372
endNode(namedFunction.function);
13751373
// Use closing position of `namedFunction.function` as the closing position
13761374
// of the named function itself.

pkg/js_ast/lib/src/template.dart

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ class InstantiatorGeneratorVisitor implements NodeVisitor<Instantiator> {
196196
throw message;
197197
}
198198

199-
static Instantiator same(Node node) => (arguments) => node;
199+
static Instantiator same(Node node) =>
200+
(arguments) => node;
200201
static Null makeNull(dynamic arguments) => null;
201202

202203
Instantiator visit(Node node) {
@@ -368,8 +369,9 @@ class InstantiatorGeneratorVisitor implements NodeVisitor<Instantiator> {
368369

369370
@override
370371
Instantiator visitProgram(Program node) {
371-
List<Instantiator> instantiators =
372-
node.body.map(visitSplayableStatement).toList();
372+
List<Instantiator> instantiators = node.body
373+
.map(visitSplayableStatement)
374+
.toList();
373375
return (arguments) => Program(splayStatements(instantiators, arguments));
374376
}
375377

@@ -393,8 +395,9 @@ class InstantiatorGeneratorVisitor implements NodeVisitor<Instantiator> {
393395

394396
@override
395397
Instantiator visitBlock(Block node) {
396-
List<Instantiator> instantiators =
397-
node.statements.map(visitSplayableStatement).toList();
398+
List<Instantiator> instantiators = node.statements
399+
.map(visitSplayableStatement)
400+
.toList();
398401
return (arguments) => Block(splayStatements(instantiators, arguments));
399402
}
400403

@@ -507,7 +510,8 @@ class InstantiatorGeneratorVisitor implements NodeVisitor<Instantiator> {
507510
(arguments) => Continue(node.targetLabel);
508511

509512
@override
510-
Instantiator visitBreak(Break node) => (arguments) => Break(node.targetLabel);
513+
Instantiator visitBreak(Break node) =>
514+
(arguments) => Break(node.targetLabel);
511515

512516
@override
513517
Instantiator visitReturn(Return node) {
@@ -598,8 +602,9 @@ class InstantiatorGeneratorVisitor implements NodeVisitor<Instantiator> {
598602

599603
@override
600604
Instantiator visitVariableDeclarationList(VariableDeclarationList node) {
601-
List<Instantiator> declarationMakers =
602-
node.declarations.map(visit).toList();
605+
List<Instantiator> declarationMakers = node.declarations
606+
.map(visit)
607+
.toList();
603608
return (arguments) {
604609
List<VariableInitialization> declarations = [];
605610
for (Instantiator instantiator in declarationMakers) {
@@ -656,8 +661,9 @@ class InstantiatorGeneratorVisitor implements NodeVisitor<Instantiator> {
656661

657662
Instantiator handleCallOrNew(Call node, Function(dynamic, dynamic) finish) {
658663
Instantiator makeTarget = visit(node.target);
659-
Iterable<Instantiator> argumentMakers =
660-
node.arguments.map(visitSplayableExpression).toList();
664+
Iterable<Instantiator> argumentMakers = node.arguments
665+
.map(visitSplayableExpression)
666+
.toList();
661667

662668
// TODO(sra): Avoid copying call arguments if no interpolation or forced
663669
// copying.
@@ -695,7 +701,8 @@ class InstantiatorGeneratorVisitor implements NodeVisitor<Instantiator> {
695701
(arguments) => VariableUse(node.name);
696702

697703
@override
698-
Instantiator visitThis(This node) => (arguments) => This();
704+
Instantiator visitThis(This node) =>
705+
(arguments) => This();
699706

700707
@override
701708
Instantiator visitVariableDeclaration(VariableDeclaration node) =>
@@ -777,7 +784,8 @@ class InstantiatorGeneratorVisitor implements NodeVisitor<Instantiator> {
777784
Instantiator visitDeferredNumber(DeferredNumber node) => same(node);
778785

779786
@override
780-
Instantiator visitDeferredString(DeferredString node) => (arguments) => node;
787+
Instantiator visitDeferredString(DeferredString node) =>
788+
(arguments) => node;
781789

782790
@override
783791
Instantiator visitLiteralBool(LiteralBool node) =>
@@ -844,8 +852,9 @@ class InstantiatorGeneratorVisitor implements NodeVisitor<Instantiator> {
844852

845853
@override
846854
Instantiator visitObjectInitializer(ObjectInitializer node) {
847-
List<Instantiator> propertyMakers =
848-
node.properties.map(visitSplayable).toList();
855+
List<Instantiator> propertyMakers = node.properties
856+
.map(visitSplayable)
857+
.toList();
849858
bool isOneLiner = node.isOneLiner;
850859
return (arguments) {
851860
List<Property> properties = splay(propertyMakers, arguments);

pkg/js_ast/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: js_ast
33
publish_to: none
44

55
environment:
6-
sdk: '^3.7.0'
6+
sdk: '^3.8.0'
77

88
resolution: workspace
99

pkg/js_ast/test/deferred_expression_test.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import 'package:js_ast/src/precedence.dart';
99
void main() {
1010
Map<Expression, DeferredExpression> map = {};
1111
VariableUse variableUse = VariableUse('variable');
12-
DeferredExpression deferred =
13-
map[variableUse] = _DeferredExpression(variableUse);
12+
DeferredExpression deferred = map[variableUse] = _DeferredExpression(
13+
variableUse,
14+
);
1415
VariableUse variableUseAlias = VariableUse('variable');
1516
map[variableUseAlias] = _DeferredExpression(variableUseAlias);
1617

pkg/js_ast/test/string_escape_test.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ const int $RCURLY = $CLOSE_CURLY_BRACKET;
1111

1212
void main() {
1313
void check(Object input, Object expected, {bool utf8 = false}) {
14-
String string =
15-
input is String
16-
? input
17-
: String.fromCharCodes(List<int>.from(input as Iterable));
14+
String string = input is String
15+
? input
16+
: String.fromCharCodes(List<int>.from(input as Iterable));
1817
String actual = DebugPrint(js.string(string), utf8: utf8);
1918
if (expected is List) {
2019
expect(actual.codeUnits, expected);

0 commit comments

Comments
 (0)