chore: update to analyzer 8

Author: schultek

packages/dart_mappable_builder/lib/src/builders/mappable_builder.dart

@@ -151,7 +151,7 @@ class MappableBuilder implements Builder {
 
     for (var i = 0; i < discovered.length; i++) {
       for (var e in discovered[i].value) {
-        output.write('  p$i.${e.name3}Mapper.ensureInitialized();\n');
+        output.write('  p$i.${e.name}Mapper.ensureInitialized();\n');
       }
     }
 

packages/dart_mappable_builder/lib/src/elements/class/alias_class_mapper_element.dart

@@ -1,6 +1,6 @@
-// ignore_for_file: overridden_fields
 
-import 'package:analyzer/dart/element/element2.dart';
+
+import 'package:analyzer/dart/element/element.dart';
 import 'package:dart_mappable/dart_mappable.dart';
 
 import '../../builder_options.dart';
@@ -20,14 +20,14 @@ class AliasClassMapperElement extends TargetClassMapperElement {
     super.constructor,
   );
 
-  final TypeAliasElement2 alias;
+  final TypeAliasElement alias;
 
   static Future<AliasClassMapperElement> from(
     MapperElementGroup parent,
-    TypeAliasElement2 alias,
+    TypeAliasElement alias,
     MappableOptions options,
   ) async {
-    var element = alias.aliasedType.element3 as ClassElement2;
+    var element = alias.aliasedType.element as ClassElement;
     var constructor = await ConstructorMapperElement.fromClass(element);
     var annotation = await MapperAnnotation.from<MappableClass>(alias);
 
@@ -42,7 +42,7 @@ class AliasClassMapperElement extends TargetClassMapperElement {
   }
 
   @override
-  late final String uniqueClassName = alias.name3 ?? '';
+  late final String uniqueClassName = alias.name ?? '';
 
   @override
   final bool generateMixin = false;

packages/dart_mappable_builder/lib/src/elements/class/class_mapper_element.dart

@@ -1,5 +1,5 @@
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:dart_mappable/dart_mappable.dart';
 
 import '../../utils.dart';
@@ -22,7 +22,7 @@ import 'mixins/type_params_mixin.dart';
 ///   - As factory: FactoryConstructorMapperElement
 ///
 ///
-abstract class ClassMapperElement extends InterfaceMapperElement<ClassElement2>
+abstract class ClassMapperElement extends InterfaceMapperElement<ClassElement>
     with InheritedElementsMixin, ParamElementsMixin, TypeParamsMixin {
   ClassMapperElement(
     super.parent,
@@ -40,7 +40,7 @@ abstract class ClassMapperElement extends InterfaceMapperElement<ClassElement2>
   }
 
   @override
-  late final String className = element.name3 ?? '';
+  late final String className = element.name ?? '';
 
   late final String uniqueId =
       (annotation.value?.read('uniqueId')?.toStringValue() ?? className)
@@ -56,7 +56,7 @@ abstract class ClassMapperElement extends InterfaceMapperElement<ClassElement2>
 
   late final bool hasCallableConstructor =
       constructor.element != null &&
-      !(isAbstract && constructor.element!.redirectedConstructor2 == null);
+      !(isAbstract && constructor.element!.redirectedConstructor == null);
 
   late final bool isAbstract = element.isAbstract;
 
@@ -95,7 +95,7 @@ abstract class ClassMapperElement extends InterfaceMapperElement<ClassElement2>
 
   @override
   late final List<ClassMapperFieldElement> fields = () {
-    var fields = <Element2, ClassMapperFieldElement>{};
+    var fields = <Element, ClassMapperFieldElement>{};
 
     for (var p in params) {
       fields[p.accessor ?? p.parameter] = ClassMapperFieldElement(
@@ -108,7 +108,7 @@ abstract class ClassMapperElement extends InterfaceMapperElement<ClassElement2>
     for (var f in _allFields) {
       if (!fields.containsKey(f) &&
           !fields.keys.any(
-            (e) => e is PropertyInducingElement2 && e.name3 == f.name3,
+            (e) => e is PropertyInducingElement && e.name == f.name,
           )) {
         fields[f] = ClassMapperFieldElement(null, f, this);
       }
@@ -151,18 +151,18 @@ abstract class ClassMapperElement extends InterfaceMapperElement<ClassElement2>
         return safeParams;
       })();
 
-  late final Iterable<PropertyInducingElement2> _allFields = () sync* {
+  late final Iterable<PropertyInducingElement> _allFields = () sync* {
     yield* extendsElement?._allFields ?? [];
 
-    for (var getter in element.getters2) {
+    for (var getter in element.getters) {
       if (getter.isStatic || getter.isSynthetic) continue;
 
       if (fieldChecker.hasAnnotationOf(getter)) {
-        yield getter.variable3!;
+        yield getter.variable;
       }
     }
 
-    for (var field in element.fields2) {
+    for (var field in element.fields) {
       if (field.isStatic || field.isSynthetic) continue;
 
       if (field.isPublic || fieldChecker.hasAnnotationOf(field)) {

packages/dart_mappable_builder/lib/src/elements/class/dependent_class_mapper_element.dart

@@ -1,4 +1,4 @@
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:dart_mappable/dart_mappable.dart';
 
 import '../../builder_options.dart';
@@ -20,7 +20,7 @@ class DependentClassMapperElement extends ClassMapperElement {
 
   static Future<DependentClassMapperElement> from(
     MapperElementGroup parent,
-    ClassElement2 element,
+    ClassElement element,
     MappableOptions options,
   ) async {
     var constructor = await ConstructorMapperElement.fromClass(element);

packages/dart_mappable_builder/lib/src/elements/class/factory_constructor_mapper_element.dart

@@ -1,4 +1,4 @@
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:dart_mappable/dart_mappable.dart';
 
 import '../../builder_options.dart';
@@ -10,7 +10,7 @@ import 'target_class_mapper_element.dart';
 /// Element interface for an annotated factory constructor in the target
 /// library of [parent].
 class FactoryConstructorMapperElement extends TargetClassMapperElement {
-  ConstructorElement2 factoryConstructor;
+  ConstructorElement factoryConstructor;
 
   FactoryConstructorMapperElement._(
     super.parent,
@@ -23,20 +23,20 @@ class FactoryConstructorMapperElement extends TargetClassMapperElement {
 
   static Future<FactoryConstructorMapperElement> from(
     MapperElementGroup parent,
-    ConstructorElement2 factoryConstructor,
+    ConstructorElement factoryConstructor,
     MappableOptions options,
   ) async {
     var constructor = await ConstructorMapperElement.from(
-      factoryConstructor.redirectedConstructor2!,
+      factoryConstructor.redirectedConstructor!,
     );
     var annotation = await MapperAnnotation.from<MappableClass>(
       factoryConstructor,
     );
 
     return FactoryConstructorMapperElement._(
       parent,
-      factoryConstructor.redirectedConstructor2!.returnType.element3
-          as ClassElement2,
+      factoryConstructor.redirectedConstructor!.returnType.element
+          as ClassElement,
       options,
       annotation,
       constructor,

packages/dart_mappable_builder/lib/src/elements/class/mixins/inherited_elements_mixin.dart

@@ -1,10 +1,10 @@
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 
 import '../../../utils.dart';
 import '../../mapper_element.dart';
 import '../class_mapper_element.dart';
 
-mixin InheritedElementsMixin on MapperElement<ClassElement2> {
+mixin InheritedElementsMixin on MapperElement<ClassElement> {
   List<ClassMapperElement> subElements = [];
   ClassMapperElement? extendsElement;
   List<ClassMapperElement> interfaceElements = [];
@@ -34,12 +34,12 @@ mixin InheritedElementsMixin on MapperElement<ClassElement2> {
   late String? discriminatorValueCode =
       annotation.getPropertyNode('discriminatorValue')?.toSource();
 
-  List<ClassElement2> getSubClasses() {
+  List<ClassElement> getSubClasses() {
     return annotation.value
             ?.read('includeSubClasses')
             ?.toTypeList()
-            ?.map((t) => t.element3)
-            .whereType<ClassElement2>()
+            ?.map((t) => t.element)
+            .whereType<ClassElement>()
             .toList() ??
         [];
   }

packages/dart_mappable_builder/lib/src/elements/class/mixins/linked_elements_mixin.dart

@@ -13,7 +13,7 @@ mixin LinkedElementsMixin on ClassMapperElement {
     }
 
     void checkType(DartType t) {
-      var e = t.element3;
+      var e = t.element;
       var m = parent.getMapperForElement(e);
       if (m != null) {
         linked.add(
@@ -30,7 +30,7 @@ mixin LinkedElementsMixin on ClassMapperElement {
       r:
       if (t is RecordType) {
         if (t.alias != null) {
-          var m = parent.getMapperForElement(t.alias!.element2);
+          var m = parent.getMapperForElement(t.alias!.element);
           if (m != null && m is TargetRecordMapperElement) {
             linked.add(
               '${parent.prefixOfElement(m.annotation.element)}${m.mapperName}',
@@ -52,9 +52,9 @@ mixin LinkedElementsMixin on ClassMapperElement {
       checkType(param.parameter.type);
     }
 
-    for (var param in element.typeParameters2) {
+    for (var param in element.typeParameters) {
       if (param.bound != null) {
-        var m = parent.getMapperForElement(param.bound!.element3);
+        var m = parent.getMapperForElement(param.bound!.element);
         if (m is ClassMapperElement) {
           linked.add(
             '${parent.prefixOfElement(m.annotation.element)}${m.mapperName}',

packages/dart_mappable_builder/lib/src/elements/class/mixins/param_elements_mixin.dart

@@ -1,14 +1,14 @@
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:collection/collection.dart';
 
 import '../../constructor/constructor_mapper_element.dart';
 import '../../mapper_element.dart';
 import '../../param/class_mapper_param_element.dart';
 import '../class_mapper_element.dart';
 
-mixin ParamElementsMixin on MapperElement<ClassElement2> {
+mixin ParamElementsMixin on MapperElement<ClassElement> {
   ConstructorMapperElement get constructor;
   ClassMapperElement? get extendsElement;
   List<ClassMapperElement> get interfaceElements;
@@ -32,7 +32,7 @@ mixin ParamElementsMixin on MapperElement<ClassElement2> {
         'break your code, but may lead to unexpected behaviour when '
         'serializing this class. Also \'.copyWith()\' won\'t work on these '
         'parameters.\n\nThe following problematic parameters were detected:\n'
-        '${unresolved.map((p) => '- ${p.parameter.name3}: ${p.message}').join('\n')}\n\n'
+        '${unresolved.map((p) => '- ${p.parameter.name}: ${p.message}').join('\n')}\n\n'
         'Please make sure every constructor parameter can be resolved to a '
         'field or getter.\nIf you think this is a bug with dart_mappable '
         'and the listed parameters should be resolved correctly, please file '
@@ -46,19 +46,19 @@ mixin ParamElementsMixin on MapperElement<ClassElement2> {
   ClassMapperParamElement getParameterConfig(FormalParameterElement param) {
     var dec = param.baseElement;
 
-    if (dec is FieldFormalParameterElement2) {
-      return FieldParamElement(param, dec.field2!, getSuperField(dec.field2!));
+    if (dec is FieldFormalParameterElement) {
+      return FieldParamElement(param, dec.field!, getSuperField(dec.field!));
     }
 
-    if (dec is SuperFormalParameterElement2 && superElement != null) {
-      if (dec.superConstructorParameter2 == null) {
+    if (dec is SuperFormalParameterElement && superElement != null) {
+      if (dec.superConstructorParameter == null) {
         return UnresolvedParamElement(
           param,
           'Cannot resolve formal super parameter',
         );
       }
       var superConfig = superElement!.getParameterConfig(
-        dec.superConstructorParameter2!,
+        dec.superConstructorParameter!,
       );
       if (superConfig is UnresolvedParamElement) {
         return UnresolvedParamElement(
@@ -88,8 +88,8 @@ mixin ParamElementsMixin on MapperElement<ClassElement2> {
       return init;
     }
 
-    var getter = element.thisType.lookUpGetter3(
-      param.name3 ?? '',
+    var getter = element.thisType.lookUpGetter(
+      param.name ?? '',
       parent.library,
     );
     if (getter != null) {
@@ -99,8 +99,8 @@ mixin ParamElementsMixin on MapperElement<ClassElement2> {
       if (s.isAssignableTo(getterType, dec.type)) {
         return FieldParamElement(
           param,
-          getter.variable3!,
-          getSuperField(getter.variable3!),
+          getter.variable,
+          getSuperField(getter.variable),
         );
       }
 
@@ -128,7 +128,7 @@ mixin ParamElementsMixin on MapperElement<ClassElement2> {
         var p = initializer.expression.accept(InitializerExpressionVisitor());
         if (p == param) {
           var f = initializer.fieldName.element;
-          if (f is PropertyInducingElement2) {
+          if (f is PropertyInducingElement) {
             return FieldParamElement(param, f, getSuperField(f));
           }
         }
@@ -146,24 +146,24 @@ mixin ParamElementsMixin on MapperElement<ClassElement2> {
       var last = node.initializers.last;
       if (last is SuperConstructorInvocation) {
         var superConstructorName = last.constructorName?.name ?? 'new';
-        var superConstructor = superElement!.element.constructors2.firstWhere(
-          (c) => c.name3 == superConstructorName,
+        var superConstructor = superElement!.element.constructors.firstWhere(
+          (c) => c.name == superConstructorName,
         );
 
         var args = last.argumentList.arguments;
         var i = 0;
         for (var arg in args) {
           if (arg is SimpleIdentifier) {
-            if (arg.name == param.name3) {
+            if (arg.name == param.name) {
               return superConstructor.formalParameters[i];
             }
           } else if (arg is NamedExpression) {
             var exp = arg.expression;
             if (exp is SimpleIdentifier) {
-              if (exp.name == param.name3) {
+              if (exp.name == param.name) {
                 var superName = arg.name.label.name;
                 return superConstructor.formalParameters.firstWhere(
-                  (p) => p.isNamed && p.name3 == superName,
+                  (p) => p.isNamed && p.name == superName,
                 );
               }
             }
@@ -175,43 +175,43 @@ mixin ParamElementsMixin on MapperElement<ClassElement2> {
     return null;
   }
 
-  PropertyInducingElement2? getSuperField(PropertyInducingElement2 field) {
+  PropertyInducingElement? getSuperField(PropertyInducingElement field) {
     return [if (extendsElement != null) extendsElement!, ...interfaceElements]
         .expand((e) => e.fields)
-        .where((f) => f.field?.name3 == field.name3)
+        .where((f) => f.field?.name == field.name)
         .map((f) => f.field)
         .firstOrNull;
   }
 }
 
-class InitializerExpressionVisitor extends SimpleAstVisitor<Element2> {
+class InitializerExpressionVisitor extends SimpleAstVisitor<Element> {
   @override
-  Element2? visitSimpleIdentifier(SimpleIdentifier node) {
+  Element? visitSimpleIdentifier(SimpleIdentifier node) {
     return node.element;
   }
 
   @override
-  Element2? visitAssignedVariablePattern(AssignedVariablePattern node) {
-    return node.element2;
+  Element? visitAssignedVariablePattern(AssignedVariablePattern node) {
+    return node.element;
   }
 
   @override
-  Element2? visitParenthesizedExpression(ParenthesizedExpression node) {
+  Element? visitParenthesizedExpression(ParenthesizedExpression node) {
     return node.expression.accept(this);
   }
 
   @override
-  Element2? visitNullAssertPattern(NullAssertPattern node) {
+  Element? visitNullAssertPattern(NullAssertPattern node) {
     return node.pattern.accept(this);
   }
 
   @override
-  Element2? visitNullCheckPattern(NullCheckPattern node) {
+  Element? visitNullCheckPattern(NullCheckPattern node) {
     return node.pattern.accept(this);
   }
 
   @override
-  Element2? visitBinaryExpression(BinaryExpression node) {
+  Element? visitBinaryExpression(BinaryExpression node) {
     if (node.operator.lexeme == '??') {
       var left = node.leftOperand.accept(this);
       var right = node.rightOperand.accept(this);