Update to latest analyzer release and fix deprecations (google#1510)

Author: kevmoo

analysis_options.yaml

@@ -4,9 +4,6 @@ include: package:dart_flutter_team_lints/analysis_options.yaml
 analyzer:
   language:
     strict-casts: true
-  errors:
-    # Analyzer v7.4.0 crazy
-    deprecated_member_use: ignore
 
 linter:
   rules:

json_serializable/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.10.0-wip
+
+- Required `analyzer: ^7.4.0`.
+
 ## 6.10.0-dev
 
 - Switch to analyzer element2 model and `build: ^3.0.0-dev`.

json_serializable/lib/src/enum_utils.dart

@@ -13,7 +13,7 @@ import 'json_literal_generator.dart';
 import 'utils.dart';
 
 String constMapName(DartType targetType) =>
-    '_\$${targetType.element!.name}EnumMap';
+    '_\$${targetType.element3!.name3}EnumMap';
 
 /// If [targetType] is not an enum, return `null`.
 ///
@@ -45,7 +45,7 @@ String? enumValueMapFromType(
   final items = enumMap.entries
       .map(
         (e) =>
-            '  ${targetType.element!.name}.${e.key.name3}: '
+            '  ${targetType.element3!.name3}.${e.key.name3}: '
             '${jsonLiteralAsDart(e.value)},',
       )
       .join();
@@ -57,7 +57,7 @@ Map<FieldElement2, Object?>? _enumMap(
   DartType targetType, {
   bool nullWithNoAnnotation = false,
 }) {
-  final targetTypeElement = targetType.element;
+  final targetTypeElement = targetType.element3;
   if (targetTypeElement == null) return null;
   final annotation = _jsonEnumChecker.firstAnnotationOf(targetTypeElement);
   final jsonEnum = _fromAnnotation(annotation);

json_serializable/lib/src/helper_core.dart

@@ -79,7 +79,7 @@ $converterOrKeyInstructions
   } else if (field.type != error.type) {
     message = '$message because of type `${typeToCode(error.type)}`';
   } else {
-    final element = error.type.element?.name;
+    final element = error.type.element3?.name3;
     todo =
         '''
 To support the type `${element ?? error.type}` you can:

json_serializable/lib/src/json_key_utils.dart

@@ -66,7 +66,7 @@ KeyConfig _from(FieldElement2 element, ClassConfig classAnnotation) {
       // literal, which is NOT supported!
       badType = 'Function';
     } else if (!reader.isLiteral) {
-      badType = dartObject.type!.element?.name;
+      badType = dartObject.type!.element3?.name3;
     }
 
     if (badType != null) {
@@ -196,7 +196,7 @@ KeyConfig _from(FieldElement2 element, ClassConfig classAnnotation) {
         (n) => n,
       );
 
-      return '${annotationType.element!.name}.$enumValueName';
+      return '${annotationType.element3!.name3}.$enumValueName';
     } else {
       final defaultValueLiteral = literalForObject(fieldName, objectValue, []);
       if (defaultValueLiteral == null) {
@@ -333,7 +333,7 @@ bool _includeIfNull(
 bool _interfaceTypesEqual(DartType a, DartType b) {
   if (a is InterfaceType && b is InterfaceType) {
     // Handle nullability case. Pretty sure this is fine for enums.
-    return a.element == b.element;
+    return a.element3 == b.element3;
   }
   return a == b;
 }

json_serializable/lib/src/type_helpers/json_converter_helper.dart

@@ -244,7 +244,7 @@ _JsonConvertData? _typeConverterFrom(
 
   if (match.genericTypeArg != null) {
     return _JsonConvertData.genericClass(
-      match.annotation.type!.element!.name!,
+      match.annotation.type!.element3!.name3!,
       match.genericTypeArg!,
       reviver.accessor,
       match.jsonType,
@@ -253,7 +253,7 @@ _JsonConvertData? _typeConverterFrom(
   }
 
   return _JsonConvertData.className(
-    match.annotation.type!.element!.name!,
+    match.annotation.type!.element3!.name3!,
     reviver.accessor,
     match.jsonType,
     match.fieldType,
@@ -291,7 +291,7 @@ _ConverterMatch? _compatibleMatch(
     return null;
   }
 
-  assert(jsonConverterSuper.element.typeParameters.length == 2);
+  assert(jsonConverterSuper.element3.typeParameters2.length == 2);
   assert(jsonConverterSuper.typeArguments.length == 2);
 
   final fieldType = jsonConverterSuper.typeArguments[0];
@@ -308,7 +308,7 @@ _ConverterMatch? _compatibleMatch(
   }
 
   if (fieldType is TypeParameterType && targetType is TypeParameterType) {
-    assert(annotation?.element is! PropertyAccessorElement2);
+    assert(annotation?.element2 is! PropertyAccessorElement2);
     assert(converterClassElement.typeParameters2.isNotEmpty);
     if (converterClassElement.typeParameters2.length > 1) {
       throw InvalidGenerationSourceError(
@@ -323,7 +323,7 @@ _ConverterMatch? _compatibleMatch(
       annotation,
       constantValue,
       jsonConverterSuper.typeArguments[1],
-      '${targetType.element.name}${targetType.isNullableType ? '?' : ''}',
+      '${targetType.element3.name3}${targetType.isNullableType ? '?' : ''}',
       fieldType,
     );
   }

json_serializable/lib/src/type_helpers/json_helper.dart

@@ -157,8 +157,8 @@ List<String> _helperParams(
   final args = <String>[];
 
   for (var helperArg in rest) {
-    final typeParamIndex = type.element.typeParameters.indexOf(
-      helperArg.element,
+    final typeParamIndex = type.element3.typeParameters2.indexOf(
+      helperArg.element3,
     );
 
     // TODO: throw here if `typeParamIndex` is -1 ?
@@ -181,7 +181,7 @@ TypeParameterType _decodeHelper(
       type.normalParameterTypes.length == 1) {
     final funcReturnType = type.returnType;
 
-    if (param.name3 == fromJsonForName(funcReturnType.element!.name!)) {
+    if (param.name3 == fromJsonForName(funcReturnType.element3!.name3!)) {
       final funcParamType = type.normalParameterTypes.single;
 
       if ((funcParamType.isDartCoreObject && funcParamType.isNullableType) ||
@@ -212,7 +212,7 @@ TypeParameterType _encodeHelper(
       type.normalParameterTypes.length == 1) {
     final funcParamType = type.normalParameterTypes.single;
 
-    if (param.name3 == toJsonForName(funcParamType.element!.name!)) {
+    if (param.name3 == toJsonForName(funcParamType.element3!.name3!)) {
       if (funcParamType is TypeParameterType) {
         return funcParamType;
       }
@@ -252,7 +252,7 @@ InterfaceType? _instantiate(
   InterfaceType classType,
 ) {
   final argTypes = ctorParamType.typeArguments.map((arg) {
-    final typeParamIndex = classType.element.typeParameters.indexWhere(
+    final typeParamIndex = classType.element3.typeParameters2.indexWhere(
       // TODO: not 100% sure `nullabilitySuffix` is right
       (e) => e.instantiate(nullabilitySuffix: arg.nullabilitySuffix) == arg,
     );
@@ -269,7 +269,7 @@ InterfaceType? _instantiate(
     return null;
   }
 
-  return ctorParamType.element.instantiate(
+  return ctorParamType.element3.instantiate(
     typeArguments: argTypes.cast<DartType>(),
     nullabilitySuffix: ctorParamType.nullabilitySuffix,
   );

json_serializable/lib/src/utils.dart

@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/constant/value.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:json_annotation/json_annotation.dart';
@@ -17,22 +16,17 @@ const _jsonKeyChecker = TypeChecker.fromRuntime(JsonKey);
 
 DartObject? _jsonKeyAnnotation(FieldElement2 element) =>
     _jsonKeyChecker.firstAnnotationOf(element) ??
-    (element.getter2 == null
-        ? null
-        : _jsonKeyChecker.firstAnnotationOf(element.getter2!));
+    (element.getter2 == null ? null : _jsonKeyChecker.firstAnnotationOf(element.getter2!));
 
-ConstantReader jsonKeyAnnotation(FieldElement2 element) =>
-    ConstantReader(_jsonKeyAnnotation(element));
+ConstantReader jsonKeyAnnotation(FieldElement2 element) => ConstantReader(_jsonKeyAnnotation(element));
 
 /// Returns `true` if [element] is annotated with [JsonKey].
-bool hasJsonKeyAnnotation(FieldElement2 element) =>
-    _jsonKeyAnnotation(element) != null;
+bool hasJsonKeyAnnotation(FieldElement2 element) => _jsonKeyAnnotation(element) != null;
 
-Never throwUnsupported(FieldElement2 element, String message) =>
-    throw InvalidGenerationSourceError(
-      'Error with `@JsonKey` on the `${element.name3}` field. $message',
-      element: element,
-    );
+Never throwUnsupported(FieldElement2 element, String message) => throw InvalidGenerationSourceError(
+  'Error with `@JsonKey` on the `${element.name3}` field. $message',
+  element: element,
+);
 
 T? readEnum<T extends Enum>(ConstantReader reader, List<T> values) =>
     reader.isNull ? null : enumValueForDartObject<T>(reader.objectValue, values, (f) => f.name);
@@ -69,11 +63,7 @@ JsonSerializable _valueForAnnotation(ConstantReader reader) => JsonSerializable(
 /// Note: if [JsonSerializable.genericArgumentFactories] is `false` for [reader]
 /// and `true` for [config], the corresponding field in the return value will
 /// only be `true` if [classElement] has type parameters.
-ClassConfig mergeConfig(
-  ClassConfig config,
-  ConstantReader reader, {
-  required ClassElement2 classElement,
-}) {
+ClassConfig mergeConfig(ClassConfig config, ConstantReader reader, {required ClassElement2 classElement}) {
   final annotation = _valueForAnnotation(reader);
   assert(config.ctorParamDefaults.isEmpty);
 
@@ -104,19 +94,15 @@ ClassConfig mergeConfig(
     fieldRename: annotation.fieldRename ?? config.fieldRename,
     genericArgumentFactories:
         annotation.genericArgumentFactories ??
-        (classElement.typeParameters2.isNotEmpty &&
-            config.genericArgumentFactories),
+        (classElement.typeParameters2.isNotEmpty && config.genericArgumentFactories),
     ignoreUnannotated: annotation.ignoreUnannotated ?? config.ignoreUnannotated,
     includeIfNull: annotation.includeIfNull ?? config.includeIfNull,
     ctorParamDefaults: paramDefaultValueMap,
     converters: converters.isNull ? const [] : converters.listValue,
   );
 }
 
-ConstructorElement2? _constructorByNameOrNull(
-  ClassElement2 classElement,
-  String name,
-) {
+ConstructorElement2? _constructorByNameOrNull(ClassElement2 classElement, String name) {
   try {
     return constructorByName(classElement, name);
   } on InvalidGenerationSourceError {
@@ -147,20 +133,19 @@ ConstructorElement2 constructorByName(ClassElement2 classElement, String name) {
   return ctor;
 }
 
-/// If [targetType] is an enum, returns the [FieldElement] instances associated
+/// If [targetType] is an enum, returns the [FieldElement2] instances associated
 /// with its values.
 ///
 /// Otherwise, `null`.
 Iterable<FieldElement2>? iterateEnumFields(DartType targetType) {
-  if ( /*targetType is InterfaceType && */ targetType.element3
-      is EnumElement2) {
+  if ( /*targetType is InterfaceType && */ targetType.element3 is EnumElement2) {
     return (targetType.element3 as EnumElement2).constants2;
   }
   return null;
 }
 
 extension DartTypeExtension on DartType {
-  DartType promoteNonNullable() => element?.library?.typeSystem.promoteToNonNull(this) ?? this;
+  DartType promoteNonNullable() => element3?.library2?.typeSystem.promoteToNonNull(this) ?? this;
 
   String toStringNonNullable() {
     final val = getDisplayString(withNullability: false);
@@ -190,7 +175,7 @@ String typeToCode(DartType type, {bool forceNullable = false}) {
     return 'dynamic';
   } else if (type is InterfaceType) {
     return [
-      type.element.name,
+      type.element3.name3,
       if (type.typeArguments.isNotEmpty) '<${type.typeArguments.map(typeToCode).join(', ')}>',
       (type.isNullableType || forceNullable) ? '?' : '',
     ].join();
@@ -227,7 +212,7 @@ String? defaultDecodeLogic(DartType targetType, String expression, {bool default
 
 extension ExecutableElementExtension on ExecutableElement2 {
   /// Returns the name of `this` qualified with the class name if it's a
-  /// [MethodElement].
+  /// [MethodElement2].
   String get qualifiedName {
     if (this is TopLevelFunctionElement) {
       return name3!;

json_serializable/pubspec.yaml

@@ -1,5 +1,5 @@
 name: json_serializable
-version: 6.10.0-dev
+version: 6.10.0-wip
 description: >-
   Automatically generate code for converting to and from JSON by annotating
   Dart classes.