Update tests for Enum to work with augment.

Fix bugs that resulted in multiple `values` arrays being displayed for
an augmentation chain.

This is done by making `ListLiteralImpl.elements` mutable by setting
`isNodeListFinal: false` in the AST generator, and adding a
new`addElements` method.

Made sure Enum's `TypeParameterFragment`s were linked.

Rename `LibraryDirective.name2` to `name`.

Change-Id: If80668d011cec6df5e22bee37a310de980a4205f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449381
Reviewed-by: Johnni Winther <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: fshcheglov

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

@@ -6324,7 +6324,7 @@ abstract final class DotShorthandConstructorInvocation
 
 @GenerateNodeImpl(
   childEntitiesOrder: [
-    GenerateNodeProperty('constKeyword'),
+    GenerateNodeProperty('constKeyword', isTokenFinal: false),
     GenerateNodeProperty('period'),
     GenerateNodeProperty('constructorName'),
     GenerateNodeProperty('typeArguments', isSuper: true),
@@ -8514,7 +8514,7 @@ abstract final class ExtensionOverride implements Expression {
     GenerateNodeProperty('name'),
     GenerateNodeProperty('typeArguments'),
     GenerateNodeProperty('argumentList'),
-    GenerateNodeProperty('element2', type: ExtensionElementImpl),
+    GenerateNodeProperty('element', type: ExtensionElementImpl),
   ],
 )
 final class ExtensionOverrideImpl extends ExpressionImpl
@@ -11772,6 +11772,9 @@ class GenerateNodeProperty {
   /// and no field or getter is generated, unless [superNullAssertOverride].
   final bool isSuper;
 
+  /// Normally [NodeList] properties are final, but sometimes we mutate nodes.
+  final bool isNodeListFinal;
+
   /// Normally [Token] properties are final, but sometimes we mutate nodes.
   final bool isTokenFinal;
 
@@ -11806,6 +11809,7 @@ class GenerateNodeProperty {
   const GenerateNodeProperty(
     this.name, {
     this.isSuper = false,
+    this.isNodeListFinal = true,
     this.isTokenFinal = true,
     this.withOverride = true,
     this.superNullAssertOverride = false,
@@ -14574,7 +14578,7 @@ abstract final class LibraryDirective implements Directive {
 @GenerateNodeImpl(
   childEntitiesOrder: [
     GenerateNodeProperty('libraryKeyword'),
-    GenerateNodeProperty('name2'),
+    GenerateNodeProperty('name'),
     GenerateNodeProperty('semicolon'),
   ],
 )
@@ -14599,10 +14603,10 @@ final class LibraryDirectiveImpl extends DirectiveImpl
     required super.comment,
     required super.metadata,
     required this.libraryKeyword,
-    required LibraryIdentifierImpl? name2,
+    required LibraryIdentifierImpl? name,
     required this.semicolon,
-  }) : _name = name2 {
-    _becomeParentOf(name2);
+  }) : _name = name {
+    _becomeParentOf(name);
   }
 
   @Deprecated('Use element instead')
@@ -14626,8 +14630,8 @@ final class LibraryDirectiveImpl extends DirectiveImpl
   LibraryIdentifierImpl? get name => _name;
 
   @generated
-  set name(LibraryIdentifierImpl? name2) {
-    _name = _becomeParentOf(name2);
+  set name(LibraryIdentifierImpl? name) {
+    _name = _becomeParentOf(name);
   }
 
   @Deprecated('Use name instead')
@@ -14638,7 +14642,7 @@ final class LibraryDirectiveImpl extends DirectiveImpl
   @override
   ChildEntities get _childEntities => super._childEntities
     ..addToken('libraryKeyword', libraryKeyword)
-    ..addNode('name2', name)
+    ..addNode('name', name)
     ..addToken('semicolon', semicolon);
 
   @generated
@@ -14658,9 +14662,9 @@ final class LibraryDirectiveImpl extends DirectiveImpl
     if (super._childContainingRange(rangeOffset, rangeEnd) case var result?) {
       return result;
     }
-    if (name case var name2?) {
-      if (name2._containsOffset(rangeOffset, rangeEnd)) {
-        return name2;
+    if (name case var name?) {
+      if (name._containsOffset(rangeOffset, rangeEnd)) {
+        return name;
       }
     }
     return null;
@@ -14786,7 +14790,7 @@ abstract final class ListLiteral implements TypedLiteral {
     GenerateNodeProperty('constKeyword', isSuper: true),
     GenerateNodeProperty('typeArguments', isSuper: true),
     GenerateNodeProperty('leftBracket'),
-    GenerateNodeProperty('elements'),
+    GenerateNodeProperty('elements', isNodeListFinal: false),
     GenerateNodeProperty('rightBracket'),
   ],
 )
@@ -14797,7 +14801,7 @@ final class ListLiteralImpl extends TypedLiteralImpl implements ListLiteral {
 
   @generated
   @override
-  final NodeListImpl<CollectionElementImpl> elements = NodeListImpl._();
+  NodeListImpl<CollectionElementImpl> elements = NodeListImpl._();
 
   @generated
   @override
@@ -14845,6 +14849,12 @@ final class ListLiteralImpl extends TypedLiteralImpl implements ListLiteral {
   @override
   E? accept<E>(AstVisitor<E> visitor) => visitor.visitListLiteral(this);
 
+  void addElements(List<CollectionElementImpl> moreElements) {
+    elements = NodeListImpl._()
+      .._initialize(this, [...elements, ...moreElements]);
+    AstNodeImpl.linkNodeTokens(this);
+  }
+
   @generated
   @override
   void resolveExpression(ResolverVisitor resolver, TypeImpl contextType) {

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

@@ -2093,6 +2093,10 @@ class EnumElementImpl extends InterfaceElementImpl implements EnumElement {
       previous.addFragment(current);
       return current;
     });
+    TypeParameterFragmentImpl._linkFragments(
+      fragments,
+      getFragments: (f) => f.typeParameters,
+    );
   }
 }
 

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

@@ -2558,7 +2558,7 @@ class AstBuilder extends StackListener {
         comment: comment,
         metadata: metadata,
         libraryKeyword: libraryKeyword,
-        name2: name,
+        name: name,
         semicolon: semicolon,
       ),
     );

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

@@ -226,13 +226,21 @@ class ElementBuilder {
 
     if (fragment.isAugmentation && lastFragment is EnumFragmentImpl) {
       lastFragment.addFragment(fragment);
+
+      _linkTypeParameters(
+        lastFragments: lastFragment.typeParameters,
+        fragments: fragment.typeParameters,
+        add: fragment.addTypeParameter,
+      );
+
       return;
     }
 
     var element = EnumElementImpl(
       _addTopReference('@enum', fragment.name),
       fragment,
     );
+
     libraryElement.addEnum(element);
     libraryBuilder.declare(element, element.reference);
   }
@@ -311,6 +319,21 @@ class ElementBuilder {
     FieldFragmentImpl fieldFragment,
   ) {
     var instanceFragment = fieldFragment.enclosingFragment;
+
+    // Move elements of `values` from augmentation to the first fragment.
+    if (fieldFragment.name == 'values' &&
+        instanceFragment is EnumFragmentImpl &&
+        instanceFragment.previousFragment != null) {
+      var implicitsMap = libraryBuilder.implicitEnumNodes;
+      var augmentationImplicit = implicitsMap.remove(instanceFragment)!;
+      var firstFragment = instanceFragment.element.firstFragment;
+      var firstImplicit = implicitsMap[firstFragment]!;
+      firstImplicit.valuesInitializer.addElements(
+        augmentationImplicit.valuesInitializer.elements,
+      );
+      return;
+    }
+
     instanceFragment.addField(fieldFragment);
 
     var lastFieldElement = _fieldElement(lastFragment);
@@ -1145,10 +1168,10 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
       _addChildFragment(valuesField);
 
       _libraryBuilder.implicitEnumNodes[fragment] = ImplicitEnumNodes(
-        element: fragment,
+        fragment: fragment,
         valuesTypeNode: valuesTypeNode,
         valuesNode: variableDeclaration,
-        valuesElement: valuesField,
+        valuesFragment: valuesField,
         valuesNames: valuesNames,
         valuesInitializer: initializer,
       );

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

@@ -35,18 +35,18 @@ class DefiningLinkingUnit extends LinkingUnit {
 }
 
 class ImplicitEnumNodes {
-  final EnumFragmentImpl element;
+  final EnumFragmentImpl fragment;
   final ast.NamedTypeImpl valuesTypeNode;
   final ast.VariableDeclarationImpl valuesNode;
-  final FieldFragmentImpl valuesElement;
+  final FieldFragmentImpl valuesFragment;
   final Set<String> valuesNames;
   ast.ListLiteralImpl valuesInitializer;
 
   ImplicitEnumNodes({
-    required this.element,
+    required this.fragment,
     required this.valuesTypeNode,
     required this.valuesNode,
-    required this.valuesElement,
+    required this.valuesFragment,
     required this.valuesNames,
     required this.valuesInitializer,
   });
@@ -206,16 +206,16 @@ class LibraryBuilder {
   void buildEnumChildren() {
     var typeProvider = element.typeProvider;
     for (var enum_ in implicitEnumNodes.values) {
-      enum_.element.element.supertype =
+      enum_.fragment.element.supertype =
           typeProvider.enumType ?? typeProvider.objectType;
       var valuesType = typeProvider.listType(
         element.typeSystem.instantiateInterfaceToBounds(
-          element: enum_.element.asElement2,
+          element: enum_.fragment.asElement2,
           nullabilitySuffix: typeProvider.objectType.nullabilitySuffix,
         ),
       );
       enum_.valuesTypeNode.type = valuesType;
-      enum_.valuesElement.element.type = valuesType;
+      enum_.valuesFragment.element.type = valuesType;
     }
   }
 

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

@@ -213,9 +213,10 @@ class TypesBuilder {
     var fragment = node.declaredFragment!;
     var element = fragment.element;
 
-    element.interfaces = _toInterfaceTypeList(
-      node.implementsClause?.interfaces,
-    );
+    element.interfaces = [
+      ...element.interfaces,
+      ..._toInterfaceTypeList(node.implementsClause?.interfaces),
+    ];
 
     _addFragmentWithClause(fragment, node.withClause);
   }

pkg/analyzer/test/src/dart/resolution/library_directive_test.dart

@@ -23,7 +23,7 @@ library foo.bar;
     assertResolvedNodeText(node, r'''
 LibraryDirective
   libraryKeyword: library
-  name2: LibraryIdentifier
+  name: LibraryIdentifier
     components
       SimpleIdentifier
         token: foo

pkg/analyzer/test/src/fasta/ast_builder_test.dart

@@ -1266,7 +1266,7 @@ library name.and.dots;
     assertParsedNodeText(node, r'''
 LibraryDirective
   libraryKeyword: library
-  name2: LibraryIdentifier
+  name: LibraryIdentifier
     components
       SimpleIdentifier
         token: name