Use AstNodeImpl for a few NodeList(s).

Change-Id: I2a078c35458ffc509e93108bd189aa29de7a6b7f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/262822
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

Author: scheglov

pkg/analyzer/lib/src/clients/dart_style/rewrite_cascade.dart

@@ -13,6 +13,7 @@ ExpressionStatement fixCascadeByParenthesizingTarget({
   required ExpressionStatement expressionStatement,
   required CascadeExpression cascadeExpression,
 }) {
+  cascadeExpression as CascadeExpressionImpl;
   assert(cascadeExpression.cascadeSections.length == 1);
 
   var newTarget = astFactory.parenthesizedExpression(

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -36,12 +36,12 @@ import 'package:meta/meta.dart';
 ///        [StringLiteral] [StringLiteral]+
 class AdjacentStringsImpl extends StringLiteralImpl implements AdjacentStrings {
   /// The strings that are implicitly concatenated.
-  final NodeListImpl<StringLiteral> _strings = NodeListImpl._();
+  final NodeListImpl<StringLiteralImpl> _strings = NodeListImpl._();
 
   /// Initialize a newly created list of adjacent strings. To be syntactically
   /// valid, the list of [strings] must contain at least two elements.
   AdjacentStringsImpl({
-    required List<StringLiteral> strings,
+    required List<StringLiteralImpl> strings,
   }) {
     _strings._initialize(this, strings);
   }
@@ -53,7 +53,7 @@ class AdjacentStringsImpl extends StringLiteralImpl implements AdjacentStrings {
   Token get endToken => _strings.endToken!;
 
   @override
-  NodeListImpl<StringLiteral> get strings => _strings;
+  NodeListImpl<StringLiteralImpl> get strings => _strings;
 
   @override
   ChildEntities get _childEntities {
@@ -77,8 +77,7 @@ class AdjacentStringsImpl extends StringLiteralImpl implements AdjacentStrings {
   void _appendStringValue(StringBuffer buffer) {
     int length = strings.length;
     for (int i = 0; i < length; i++) {
-      var stringLiteral = strings[i] as StringLiteralImpl;
-      stringLiteral._appendStringValue(buffer);
+      strings[i]._appendStringValue(buffer);
     }
   }
 }
@@ -342,7 +341,7 @@ class ArgumentListImpl extends AstNodeImpl implements ArgumentList {
   Token leftParenthesis;
 
   /// The expressions producing the values of the arguments.
-  final NodeListImpl<Expression> _arguments = NodeListImpl._();
+  final NodeListImpl<ExpressionImpl> _arguments = NodeListImpl._();
 
   /// The right parenthesis.
   @override
@@ -360,14 +359,14 @@ class ArgumentListImpl extends AstNodeImpl implements ArgumentList {
   /// be `null` if there are no arguments.
   ArgumentListImpl({
     required this.leftParenthesis,
-    required List<Expression> arguments,
+    required List<ExpressionImpl> arguments,
     required this.rightParenthesis,
   }) {
     _arguments._initialize(this, arguments);
   }
 
   @override
-  NodeListImpl<Expression> get arguments => _arguments;
+  NodeListImpl<ExpressionImpl> get arguments => _arguments;
 
   @override
   Token get beginToken => leftParenthesis;
@@ -1227,7 +1226,7 @@ class BlockImpl extends StatementImpl implements Block {
   Token leftBracket;
 
   /// The statements contained in the block.
-  final NodeListImpl<Statement> _statements = NodeListImpl._();
+  final NodeListImpl<StatementImpl> _statements = NodeListImpl._();
 
   /// The right curly bracket.
   @override
@@ -1236,7 +1235,7 @@ class BlockImpl extends StatementImpl implements Block {
   /// Initialize a newly created block of code.
   BlockImpl({
     required this.leftBracket,
-    required List<Statement> statements,
+    required List<StatementImpl> statements,
     required this.rightBracket,
   }) {
     _statements._initialize(this, statements);
@@ -1249,7 +1248,7 @@ class BlockImpl extends StatementImpl implements Block {
   Token get endToken => rightBracket;
 
   @override
-  NodeListImpl<Statement> get statements => _statements;
+  NodeListImpl<StatementImpl> get statements => _statements;
 
   @override
   ChildEntities get _childEntities => ChildEntities()
@@ -1397,13 +1396,13 @@ class CascadeExpressionImpl extends ExpressionImpl
   ExpressionImpl _target;
 
   /// The cascade sections sharing the common target.
-  final NodeListImpl<Expression> _cascadeSections = NodeListImpl._();
+  final NodeListImpl<ExpressionImpl> _cascadeSections = NodeListImpl._();
 
   /// Initialize a newly created cascade expression. The list of
   /// [cascadeSections] must contain at least one element.
   CascadeExpressionImpl({
     required ExpressionImpl target,
-    required List<Expression> cascadeSections,
+    required List<ExpressionImpl> cascadeSections,
   }) : _target = target {
     _becomeParentOf(_target);
     _cascadeSections._initialize(this, cascadeSections);
@@ -1413,7 +1412,7 @@ class CascadeExpressionImpl extends ExpressionImpl
   Token get beginToken => _target.beginToken;
 
   @override
-  NodeListImpl<Expression> get cascadeSections => _cascadeSections;
+  NodeListImpl<ExpressionImpl> get cascadeSections => _cascadeSections;
 
   @override
   Token get endToken => _cascadeSections.endToken!;
@@ -1875,7 +1874,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl
   Token leftBracket;
 
   /// The members defined by the class or mixin.
-  final NodeListImpl<ClassMember> _members = NodeListImpl._();
+  final NodeListImpl<ClassMemberImpl> _members = NodeListImpl._();
 
   /// The right curly bracket.
   @override
@@ -1903,7 +1902,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl
     required ImplementsClauseImpl? implementsClause,
     required NativeClauseImpl? nativeClause,
     required this.leftBracket,
-    required List<ClassMember> members,
+    required List<ClassMemberImpl> members,
     required this.rightBracket,
   })  : _typeParameters = typeParameters,
         _extendsClause = extendsClause,
@@ -1946,7 +1945,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl
   }
 
   @override
-  NodeListImpl<ClassMember> get members => _members;
+  NodeListImpl<ClassMemberImpl> get members => _members;
 
   @override
   NativeClauseImpl? get nativeClause => _nativeClause;

pkg/analyzer/lib/src/dart/ast/to_source_visitor.dart

@@ -186,9 +186,9 @@ class ToSourceVisitor implements AstVisitor<void> {
   @override
   void visitClassDeclaration(covariant ClassDeclarationImpl node) {
     _visitNodeList(node.metadata, separator: ' ', suffix: ' ');
+    _visitToken(node.augmentKeyword, suffix: ' ');
     _visitToken(node.abstractKeyword, suffix: ' ');
     _visitToken(node.macroKeyword, suffix: ' ');
-    _visitToken(node.augmentKeyword, suffix: ' ');
     sink.write('class ');
     _visitToken(node.name);
     _visitNode(node.typeParameters);

pkg/analyzer/lib/src/dart/element/element.dart

@@ -857,7 +857,7 @@ class ClassElementImpl extends ClassOrMixinElementImpl implements ClassElement {
           superclassConstructor.isConst && !hasMixinWithInstanceVariables;
       List<ParameterElement> superParameters = superclassConstructor.parameters;
       int count = superParameters.length;
-      var argumentsForSuperInvocation = <Expression>[];
+      var argumentsForSuperInvocation = <ExpressionImpl>[];
       if (count > 0) {
         var implicitParameters = <ParameterElement>[];
         for (int i = 0; i < count; i++) {

pkg/analyzer/lib/src/dart/resolver/invocation_inferrer.dart

@@ -492,7 +492,7 @@ class InvocationInferrer<Node extends AstNodeImpl> {
       Expression value;
       ParameterElement? parameter;
       Object parameterKey;
-      if (argument is NamedExpression) {
+      if (argument is NamedExpressionImpl) {
         value = argument.expression;
         parameterKey = argument.name.label.name;
       } else {

pkg/analyzer/lib/src/fasta/ast_builder.dart

@@ -201,7 +201,7 @@ class AstBuilder extends StackListener {
       push(
         CascadeExpressionImpl(
           target: expression,
-          cascadeSections: <Expression>[],
+          cascadeSections: <ExpressionImpl>[],
         ),
       );
     }
@@ -656,7 +656,7 @@ class AstBuilder extends StackListener {
     assert(optional(')', rightParenthesis));
     debugEvent("Arguments");
 
-    var expressions = popTypedList2<Expression>(count);
+    var expressions = popTypedList2<ExpressionImpl>(count);
     final arguments = ArgumentListImpl(
       leftParenthesis: leftParenthesis,
       arguments: expressions,
@@ -707,7 +707,7 @@ class AstBuilder extends StackListener {
       case Assert.Expression:
         // The parser has already reported an error indicating that assert
         // cannot be used in an expression. Insert a placeholder.
-        List<Expression> arguments = <Expression>[condition];
+        final arguments = <ExpressionImpl>[condition];
         if (message != null) {
           arguments.add(message);
         }
@@ -821,7 +821,7 @@ class AstBuilder extends StackListener {
     assert(optional('}', rightBracket));
     debugEvent("Block");
 
-    var statements = popTypedList2<Statement>(count);
+    var statements = popTypedList2<StatementImpl>(count);
     push(
       BlockImpl(
         leftBracket: leftBracket,
@@ -837,7 +837,7 @@ class AstBuilder extends StackListener {
     assert(optional('}', rightBracket));
     debugEvent("BlockFunctionBody");
 
-    var statements = popTypedList2<Statement>(count);
+    var statements = popTypedList2<StatementImpl>(count);
     final block = BlockImpl(
       leftBracket: leftBracket,
       statements: statements,
@@ -870,13 +870,13 @@ class AstBuilder extends StackListener {
   void endCascade() {
     debugEvent("Cascade");
 
-    var expression = pop() as Expression;
+    var expression = pop() as ExpressionImpl;
     var cascade = pop() as CascadeExpressionImpl;
     pop(); // Token.
     push(
       CascadeExpressionImpl(
         target: cascade.target,
-        cascadeSections: <Expression>[
+        cascadeSections: <ExpressionImpl>[
           ...cascade.cascadeSections,
           expression,
         ],
@@ -950,7 +950,7 @@ class AstBuilder extends StackListener {
       handleRecoverableError(
           messageConstConstructorWithBody, bodyToken, bodyToken);
     }
-    ConstructorDeclaration constructor = ConstructorDeclarationImpl(
+    var constructor = ConstructorDeclarationImpl(
       comment: comment,
       metadata: metadata,
       externalKeyword: modifiers?.externalKeyword,
@@ -4764,7 +4764,7 @@ class AstBuilder extends StackListener {
   void handleStringJuxtaposition(Token startToken, int literalCount) {
     debugEvent("StringJuxtaposition");
 
-    var strings = popTypedList2<StringLiteral>(literalCount);
+    var strings = popTypedList2<StringLiteralImpl>(literalCount);
     push(AdjacentStringsImpl(strings: strings));
   }
 
@@ -5210,7 +5210,7 @@ class _ClassLikeDeclarationBuilder {
   final TypeParameterListImpl? typeParameters;
 
   Token leftBracket;
-  final List<ClassMember> members = [];
+  final List<ClassMemberImpl> members = [];
   Token rightBracket;
 
   _ClassLikeDeclarationBuilder({

pkg/analyzer/lib/src/generated/testing/ast_test_factory.dart

@@ -24,14 +24,6 @@ import 'package:meta/meta.dart';
 /// rather than 'integerLiteral'.
 @internal
 class AstTestFactory {
-  static ArgumentListImpl argumentList(
-          [List<Expression> arguments = const []]) =>
-      ArgumentListImpl(
-        leftParenthesis: TokenFactory.tokenFromType(TokenType.OPEN_PAREN),
-        arguments: arguments,
-        rightParenthesis: TokenFactory.tokenFromType(TokenType.CLOSE_PAREN),
-      );
-
   static AssignmentExpressionImpl assignmentExpression(Expression leftHandSide,
           TokenType operator, Expression rightHandSide) =>
       AssignmentExpressionImpl(
@@ -40,37 +32,6 @@ class AstTestFactory {
         rightHandSide: rightHandSide as ExpressionImpl,
       );
 
-  static ClassDeclarationImpl classDeclaration(
-          Keyword? abstractKeyword,
-          String name,
-          TypeParameterList? typeParameters,
-          ExtendsClause? extendsClause,
-          WithClause? withClause,
-          ImplementsClause? implementsClause,
-          {List<ClassMember> members = const [],
-          bool isMacro = false,
-          bool isAugmentation = false}) =>
-      ClassDeclarationImpl(
-          comment: null,
-          metadata: null,
-          abstractKeyword: abstractKeyword == null
-              ? null
-              : TokenFactory.tokenFromKeyword(abstractKeyword),
-          macroKeyword: isMacro ? TokenFactory.tokenFromString('macro') : null,
-          augmentKeyword:
-              isAugmentation ? TokenFactory.tokenFromString('augment') : null,
-          classKeyword: TokenFactory.tokenFromKeyword(Keyword.CLASS),
-          name: TokenFactory.tokenFromTypeAndString(TokenType.IDENTIFIER, name),
-          typeParameters: typeParameters as TypeParameterListImpl?,
-          extendsClause: extendsClause as ExtendsClauseImpl?,
-          withClause: withClause as WithClauseImpl?,
-          implementsClause: implementsClause as ImplementsClauseImpl?,
-          nativeClause: null,
-          leftBracket: TokenFactory.tokenFromType(TokenType.OPEN_CURLY_BRACKET),
-          members: members,
-          rightBracket:
-              TokenFactory.tokenFromType(TokenType.CLOSE_CURLY_BRACKET));
-
   static ConstructorDeclarationImpl constructorDeclaration(
           Identifier returnType,
           String? name,
@@ -223,14 +184,6 @@ class AstTestFactory {
           [List<Combinator> combinators = const []]) =>
       importDirective([], uri, false, prefix, combinators);
 
-  static InstanceCreationExpressionImpl instanceCreationExpression(
-          Keyword? keyword, ConstructorName name,
-          [List<Expression> arguments = const []]) =>
-      astFactory.instanceCreationExpression(
-          keyword == null ? null : TokenFactory.tokenFromKeyword(keyword),
-          name,
-          argumentList(arguments));
-
   static InterpolationExpressionImpl interpolationExpression(
           Expression expression) =>
       astFactory.interpolationExpression(
@@ -413,19 +366,6 @@ class AstTestFactory {
   static SimpleStringLiteralImpl string2(String content) => astFactory
       .simpleStringLiteral(TokenFactory.tokenFromString("'$content'"), content);
 
-  static SuperConstructorInvocationImpl superConstructorInvocation(
-          [List<Expression> arguments = const []]) =>
-      superConstructorInvocation2(null, arguments);
-
-  static SuperConstructorInvocationImpl superConstructorInvocation2(
-          String? name,
-          [List<Expression> arguments = const []]) =>
-      astFactory.superConstructorInvocation(
-          TokenFactory.tokenFromKeyword(Keyword.SUPER),
-          name == null ? null : TokenFactory.tokenFromType(TokenType.PERIOD),
-          name == null ? null : identifier3(name),
-          argumentList(arguments));
-
   static SuperExpressionImpl superExpression() =>
       astFactory.superExpression(TokenFactory.tokenFromKeyword(Keyword.SUPER));
 

pkg/analyzer/lib/src/summary2/ast_binary_reader.dart

@@ -191,7 +191,7 @@ class AstBinaryReader {
   }
 
   AdjacentStrings _readAdjacentStrings() {
-    var components = _readNodeList<StringLiteral>();
+    var components = _readNodeList<StringLiteralImpl>();
     var node = AdjacentStringsImpl(strings: components);
     _readExpressionResolution(node);
     return node;
@@ -215,7 +215,7 @@ class AstBinaryReader {
   }
 
   ArgumentList _readArgumentList() {
-    var arguments = _readNodeList<Expression>();
+    var arguments = _readNodeList<ExpressionImpl>();
 
     return ArgumentListImpl(
       leftParenthesis: Tokens.openParenthesis(),
@@ -306,7 +306,7 @@ class AstBinaryReader {
 
   CascadeExpression _readCascadeExpression() {
     var target = readNode() as ExpressionImpl;
-    var sections = _readNodeList<Expression>();
+    var sections = _readNodeList<ExpressionImpl>();
     var node = CascadeExpressionImpl(
       target: target,
       cascadeSections: sections,