Migrate enum.dart

Author: keertip

lib/src/model/enum.dart

@@ -2,8 +2,6 @@
 // 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.
 
-// ignore_for_file: analyzer_use_new_elements
-
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
@@ -16,12 +14,13 @@ import 'package:meta/meta.dart';
 
 class Enum extends InheritingContainer with Constructable, MixedInTypes {
   @override
-  final EnumElement element;
+  // ignore: analyzer_use_new_elements
+  EnumElement get element => element2.asElement;
 
   @override
-  EnumElement2 get element2 => element.asElement2;
+  final EnumElement2 element2;
 
-  Enum(this.element, super.library, super.packageGraph);
+  Enum(this.element2, super.library, super.packageGraph);
 
   @override
   late final List<ModelElement> allModelElements = [
@@ -88,19 +87,19 @@ class Enum extends InheritingContainer with Constructable, MixedInTypes {
 class EnumField extends Field {
   final int index;
 
-  EnumField.forConstant(this.index, FieldElement element, Library library,
+  EnumField.forConstant(this.index, FieldElement2 element, Library library,
       PackageGraph packageGraph, Accessor? getter)
-      : super(
+      : super.element2(
             element, library, packageGraph, getter as ContainerAccessor?, null);
 
   @override
   bool get isEnumValue => true;
 
   @override
   bool get hasConstantValueForDisplay {
-    final enum_ = element.enclosingElement3 as EnumElement;
+    final enum_ = element2.enclosingElement2 as EnumElement2;
     final enumHasDefaultConstructor =
-        enum_.constructors.any((c) => c.isDefaultConstructor);
+        enum_.constructors2.any((c) => c.isDefaultConstructor);
     // If this enum does not have any explicit constructors (and so only has a
     // default constructor), then there is no meaningful constant initializer to
     // display.
@@ -109,7 +108,7 @@ class EnumField extends Field {
 
   @override
   String get constantValueBase =>
-      element.library.featureSet.isEnabled(Feature.enhanced_enums)
+      element2.library2.featureSet.isEnabled(Feature.enhanced_enums)
           ? super.constantValueBase
           : renderedName;
 

lib/src/model/field.dart

@@ -49,6 +49,22 @@ class Field extends ModelElement
     setter?.enclosingCombo = this;
   }
 
+  Field.element2(
+    Element2 element2,
+    super.library,
+    super.packageGraph,
+    this.getter,
+    this.setter,
+  )   : element = element2.asElement as FieldElement,
+        isInherited = false,
+        enclosingElement =
+            ModelElement.for2_(element2.enclosingElement2!, library, packageGraph)
+                as Container,
+        assert(getter != null || setter != null) {
+    getter?.enclosingCombo = this;
+    setter?.enclosingCombo = this;
+  }
+
   Field.providedByExtension(
     this.element,
     this.enclosingElement,

lib/src/model/model_element.dart

@@ -170,7 +170,7 @@ abstract class ModelElement
           }
           var index = constantIndex.toIntValue()!;
           newModelElement =
-              EnumField.forConstant(index, e, library, packageGraph, getter);
+              EnumField.forConstant(index, e.asElement2, library, packageGraph, getter);
         } else if (e.enclosingElement3 is ExtensionElement) {
           newModelElement = Field(e, library, packageGraph,
               getter as ContainerAccessor?, setter as ContainerAccessor?);
@@ -307,7 +307,7 @@ abstract class ModelElement
     return switch (e) {
       LibraryElement() => packageGraph.findButDoNotCreateLibraryFor(e)!,
       PrefixElement() => Prefix(e.asElement2, library, packageGraph),
-      EnumElement() => Enum(e, library, packageGraph),
+      EnumElement() => Enum(e.asElement2, library, packageGraph),
       MixinElement() => Mixin(e.asElement2, library, packageGraph),
       ClassElement() => Class(e, library, packageGraph),
       ExtensionElement() => Extension(e.asElement2, library, packageGraph),