Fine. Support for enums.

Change-Id: I56d7a40e2d140c8e25e9050e54c0ecc36307ea73
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/425880
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -110,7 +110,7 @@ testFineAfterLibraryAnalyzerHook;
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 459;
+  static const int DATA_VERSION = 460;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

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

@@ -1462,6 +1462,23 @@ sealed class AstNodeImpl implements AstNode {
     // Handle the general case.
     return offset <= rangeOffset && end >= rangeEnd;
   }
+
+  static void linkNodeTokens(AstNode parent) {
+    Token? lastToken;
+    for (var entity in parent.childEntities) {
+      switch (entity) {
+        case Token token:
+          lastToken?.next = token;
+          token.previous = lastToken;
+          lastToken = token;
+        case AstNode node:
+          linkNodeTokens(node);
+          lastToken?.next = node.beginToken;
+          node.beginToken.previous = lastToken;
+          lastToken = node.endToken;
+      }
+    }
+  }
 }
 
 /// Mixin for any [AstNodeImpl] that can potentially introduce a new scope.

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

@@ -718,31 +718,14 @@ class ClassFragmentImpl extends ClassOrMixinFragmentImpl
               rightParenthesis: Tokens.closeParenthesis(),
             ),
           );
-          _linkTokens(superInvocation);
+          AstNodeImpl.linkNodeTokens(superInvocation);
           superInvocation.element = superclassConstructor.asElement2;
           implicitConstructor.constantInitializers = [superInvocation];
 
           return implicitConstructor;
         })
         .toList(growable: false);
   }
-
-  static void _linkTokens(AstNode parent) {
-    Token? lastToken;
-    for (var entity in parent.childEntities) {
-      switch (entity) {
-        case Token token:
-          lastToken?.next = token;
-          token.previous = lastToken;
-          lastToken = token;
-        case AstNode node:
-          _linkTokens(node);
-          lastToken?.next = node.beginToken;
-          node.beginToken.previous = lastToken;
-          lastToken = node.endToken;
-      }
-    }
-  }
 }
 
 abstract class ClassOrMixinFragmentImpl extends InterfaceFragmentImpl {

pkg/analyzer/lib/src/fine/library_manifest.dart

@@ -24,6 +24,7 @@ class LibraryManifest {
   final Map<LookupName, ManifestItemId> reExportMap;
 
   final Map<LookupName, ClassItem> declaredClasses;
+  final Map<LookupName, EnumItem> declaredEnums;
   final Map<LookupName, MixinItem> declaredMixins;
   final Map<LookupName, TopLevelGetterItem> declaredGetters;
   final Map<LookupName, TopLevelSetterItem> declaredSetters;
@@ -33,6 +34,7 @@ class LibraryManifest {
   LibraryManifest({
     required this.reExportMap,
     required this.declaredClasses,
+    required this.declaredEnums,
     required this.declaredMixins,
     required this.declaredGetters,
     required this.declaredSetters,
@@ -46,6 +48,9 @@ class LibraryManifest {
       declaredClasses: reader.readLookupNameMap(
         readValue: () => ClassItem.read(reader),
       ),
+      declaredEnums: reader.readLookupNameMap(
+        readValue: () => EnumItem.read(reader),
+      ),
       declaredMixins: reader.readLookupNameMap(
         readValue: () => MixinItem.read(reader),
       ),
@@ -68,6 +73,7 @@ class LibraryManifest {
   /// or `null` if there is no such element.
   ManifestItemId? getExportedId(LookupName name) {
     return declaredClasses[name]?.id ??
+        declaredEnums[name]?.id ??
         declaredMixins[name]?.id ??
         declaredGetters[name]?.id ??
         declaredSetters[name]?.id ??
@@ -78,6 +84,7 @@ class LibraryManifest {
   void write(BufferedSink sink) {
     reExportMap.write(sink);
     declaredClasses.write(sink);
+    declaredEnums.write(sink);
     declaredMixins.write(sink);
     declaredGetters.write(sink);
     declaredSetters.write(sink);
@@ -227,6 +234,33 @@ class LibraryManifestBuilder {
     }
   }
 
+  void _addEnum({
+    required EncodeContext encodingContext,
+    required Map<LookupName, TopLevelItem> newItems,
+    required EnumElementImpl2 element,
+    required LookupName lookupName,
+  }) {
+    var enumItem = _getOrBuildElementItem(element, () {
+      return EnumItem.fromElement(
+        id: ManifestItemId.generate(),
+        context: encodingContext,
+        element: element,
+      );
+    });
+    newItems[lookupName] = enumItem;
+
+    encodingContext.withTypeParameters(element.typeParameters2, (
+      typeParameters,
+    ) {
+      enumItem.beforeUpdatingMembers();
+      _addInterfaceElementMembers(
+        encodingContext: encodingContext,
+        instanceElement: element,
+        interfaceItem: enumItem,
+      );
+    });
+  }
+
   void _addInstanceElementField({
     required EncodeContext encodingContext,
     required InstanceItem instanceItem,
@@ -564,6 +598,7 @@ class LibraryManifestBuilder {
     for (var libraryElement in libraryElements) {
       var libraryUri = libraryElement.uri;
       var newClassItems = <LookupName, ClassItem>{};
+      var newEnumItems = <LookupName, EnumItem>{};
       var newMixinItems = <LookupName, MixinItem>{};
       var newTopLevelGetters = <LookupName, TopLevelGetterItem>{};
       var newTopLevelSetters = <LookupName, TopLevelSetterItem>{};
@@ -584,6 +619,13 @@ class LibraryManifestBuilder {
               element: element,
               lookupName: lookupName,
             );
+          case EnumElementImpl2():
+            _addEnum(
+              encodingContext: encodingContext,
+              newItems: newEnumItems,
+              element: element,
+              lookupName: lookupName,
+            );
           case GetterElementImpl():
             _addTopLevelGetter(
               encodingContext: encodingContext,
@@ -627,6 +669,7 @@ class LibraryManifestBuilder {
       var newManifest = LibraryManifest(
         reExportMap: {},
         declaredClasses: newClassItems,
+        declaredEnums: newEnumItems,
         declaredMixins: newMixinItems,
         declaredGetters: newTopLevelGetters,
         declaredSetters: newTopLevelSetters,
@@ -778,6 +821,7 @@ class LibraryManifestBuilder {
         LibraryManifest(
           reExportMap: {},
           declaredClasses: {},
+          declaredEnums: {},
           declaredMixins: {},
           declaredGetters: {},
           declaredSetters: {},
@@ -893,6 +937,10 @@ class _LibraryMatch {
           if (!_matchClass(name: name, element: element)) {
             structureMismatched.add(element);
           }
+        case EnumElementImpl2():
+          if (!_matchEnum(name: name, element: element)) {
+            structureMismatched.add(element);
+          }
         case GetterElementImpl():
           if (!_matchTopGetter(name: name, element: element)) {
             structureMismatched.add(element);
@@ -961,6 +1009,37 @@ class _LibraryMatch {
     return true;
   }
 
+  bool _matchEnum({
+    required LookupName? name,
+    required EnumElementImpl2 element,
+  }) {
+    var item = manifest.declaredEnums[name];
+    if (item is! EnumItem) {
+      return false;
+    }
+
+    var matchContext = MatchContext(parent: null);
+    if (!item.match(matchContext, element)) {
+      return false;
+    }
+
+    _addMatchingElementItem(element, item, matchContext);
+
+    _matchInterfaceElementConstructors(
+      matchContext: matchContext,
+      interfaceElement: element,
+      item: item,
+    );
+
+    _matchInstanceElementExecutables(
+      matchContext: matchContext,
+      element: element,
+      item: item,
+    );
+
+    return true;
+  }
+
   void _matchInstanceElementExecutables({
     required InstanceElementImpl2 element,
     required InstanceItem item,

pkg/analyzer/lib/src/fine/manifest_item.dart

@@ -79,6 +79,71 @@ class ClassItem extends InterfaceItem<ClassElementImpl2> {
   }
 }
 
+class EnumItem extends InterfaceItem<EnumElementImpl2> {
+  EnumItem({
+    required super.id,
+    required super.metadata,
+    required super.typeParameters,
+    required super.declaredConflicts,
+    required super.declaredFields,
+    required super.declaredGetters,
+    required super.declaredSetters,
+    required super.declaredMethods,
+    required super.declaredConstructors,
+    required super.inheritedConstructors,
+    required super.interface,
+    required super.supertype,
+    required super.mixins,
+    required super.interfaces,
+  });
+
+  factory EnumItem.fromElement({
+    required ManifestItemId id,
+    required EncodeContext context,
+    required EnumElementImpl2 element,
+  }) {
+    return context.withTypeParameters(element.typeParameters2, (
+      typeParameters,
+    ) {
+      return EnumItem(
+        id: id,
+        metadata: ManifestMetadata.encode(context, element.metadata2),
+        typeParameters: typeParameters,
+        declaredConflicts: {},
+        declaredFields: {},
+        declaredGetters: {},
+        declaredSetters: {},
+        declaredMethods: {},
+        declaredConstructors: {},
+        inheritedConstructors: {},
+        interface: ManifestInterface.empty(),
+        supertype: element.supertype?.encode(context),
+        mixins: element.mixins.encode(context),
+        interfaces: element.interfaces.encode(context),
+      );
+    });
+  }
+
+  factory EnumItem.read(SummaryDataReader reader) {
+    return EnumItem(
+      id: ManifestItemId.read(reader),
+      metadata: ManifestMetadata.read(reader),
+      typeParameters: ManifestTypeParameter.readList(reader),
+      declaredConflicts: reader.readLookupNameToIdMap(),
+      declaredFields: InstanceItemFieldItem.readMap(reader),
+      declaredGetters: InstanceItemGetterItem.readMap(reader),
+      declaredSetters: InstanceItemSetterItem.readMap(reader),
+      declaredMethods: InstanceItemMethodItem.readMap(reader),
+      declaredConstructors: InterfaceItemConstructorItem.readMap(reader),
+      inheritedConstructors: reader.readLookupNameToIdMap(),
+      supertype: ManifestType.readOptional(reader),
+      mixins: ManifestType.readList(reader),
+      interfaces: ManifestType.readList(reader),
+      interface: ManifestInterface.read(reader),
+    );
+  }
+}
+
 /// The item for [InstanceElementImpl2].
 sealed class InstanceItem<E extends InstanceElementImpl2>
     extends TopLevelItem<E> {

pkg/analyzer/lib/src/fine/requirements.dart

@@ -64,6 +64,7 @@ class ExportRequirement {
     var actualCount = 0;
     var declaredTopEntries = <MapEntry<LookupName, TopLevelItem>>[
       ...libraryManifest.declaredClasses.entries,
+      ...libraryManifest.declaredEnums.entries,
       ...libraryManifest.declaredMixins.entries,
       ...libraryManifest.declaredGetters.entries,
       ...libraryManifest.declaredSetters.entries,
@@ -380,6 +381,7 @@ class RequirementsManifest {
 
         var instanceItem =
             libraryManifest.declaredClasses[instanceName] ??
+            libraryManifest.declaredEnums[instanceName] ??
             libraryManifest.declaredMixins[instanceName];
         if (instanceItem is! InstanceItem) {
           return TopLevelNotInterface(
@@ -463,6 +465,7 @@ class RequirementsManifest {
         var interfaceName = interfaceEntry.key;
         var interfaceItem =
             libraryManifest.declaredClasses[interfaceName] ??
+            libraryManifest.declaredEnums[interfaceName] ??
             libraryManifest.declaredMixins[interfaceName];
         if (interfaceItem is! InterfaceItem) {
           return TopLevelNotInterface(
@@ -817,6 +820,7 @@ class RequirementsManifest {
     var instancesMap = instances[libraryElement.uri] ??= {};
     var instanceItem =
         manifest.declaredClasses[instanceName] ??
+        manifest.declaredEnums[instanceName] ??
         manifest.declaredMixins[instanceName];
 
     // SAFETY: every instance element must be in the manifest.
@@ -848,6 +852,7 @@ class RequirementsManifest {
     var interfacesMap = interfaces[libraryElement.uri] ??= {};
     var interfaceItem =
         manifest.declaredClasses[interfaceName] ??
+        manifest.declaredEnums[interfaceName] ??
         manifest.declaredMixins[interfaceName];
 
     // SAFETY: every interface element must be in the manifest.

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

@@ -368,7 +368,8 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
         constant.metadata,
       );
 
-      var constructorSelector = constant.arguments?.constructorSelector;
+      var constantArguments = constant.arguments;
+      var constructorSelector = constantArguments?.constructorSelector;
       var constructorName = constructorSelector?.name.name;
 
       var initializer = InstanceCreationExpressionImpl(
@@ -377,7 +378,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
           type: NamedTypeImpl(
             importPrefix: null,
             name: StringToken(TokenType.STRING, fragment.name, -1),
-            typeArguments: constant.arguments?.typeArguments,
+            typeArguments: constantArguments?.typeArguments,
             question: null,
           ),
           period: constructorName != null ? Tokens.period() : null,
@@ -388,11 +389,14 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
                   )
                   : null,
         ),
-        argumentList: ArgumentListImpl(
-          leftParenthesis: Tokens.openParenthesis(),
-          arguments: [...?constant.arguments?.argumentList.arguments],
-          rightParenthesis: Tokens.closeParenthesis(),
-        ),
+        argumentList:
+            constantArguments != null
+                ? constantArguments.argumentList
+                : ArgumentListImpl(
+                  leftParenthesis: Tokens.openParenthesis(),
+                  arguments: [],
+                  rightParenthesis: Tokens.closeParenthesis(),
+                ),
         typeArguments: null,
       );
 
@@ -415,6 +419,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       );
       _linker.elementNodes[field] = variableDeclaration;
 
+      AstNodeImpl.linkNodeTokens(initializer);
       field.constantInitializer = initializer;
 
       var refName = field.name2 ?? '${_nextUnnamedId++}';
@@ -441,6 +446,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       elements: valuesElements,
       rightBracket: Tokens.closeSquareBracket(),
     );
+    AstNodeImpl.linkNodeTokens(initializer);
     valuesField.constantInitializer = initializer;
 
     var variableDeclaration = VariableDeclarationImpl(