Deprecate DartType.element3, use element instead.

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

Author: fshcheglov

pkg/analysis_server/lib/src/computer/computer_inlay_hint.dart

@@ -186,8 +186,8 @@ class DartInlayHintComputer {
         InlayHintLabelPart(
           // Write type without type args or nullability suffix. Type args need
           // adding as their own parts, and the nullability suffix does after them.
-          value: type.element3?.name3 ?? type.getDisplayString(),
-          location: _locationForElement(type.element3),
+          value: type.element?.name3 ?? type.getDisplayString(),
+          location: _locationForElement(type.element),
         ),
       );
       // Call recursively for any nested type arguments.

pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart

@@ -81,7 +81,7 @@ class DartLazyTypeHierarchyComputer {
     }
 
     return type is InterfaceType
-        ? TypeHierarchyItem.forElement(type.element3)
+        ? TypeHierarchyItem.forElement(type.element)
         : null;
   }
 
@@ -259,28 +259,28 @@ class TypeHierarchyRelatedItem extends TypeHierarchyItem {
 
   static TypeHierarchyRelatedItem? constrainedTo(InterfaceType type) =>
       _forElement(
-        type.element3,
+        type.element,
         relationship: TypeHierarchyItemRelationship.constrainedTo,
       );
 
   static TypeHierarchyRelatedItem? extends_(InterfaceType type) => _forElement(
-    type.element3,
+    type.element,
     relationship: TypeHierarchyItemRelationship.extends_,
   );
 
   static TypeHierarchyRelatedItem? implements(InterfaceType type) =>
       _forElement(
-        type.element3,
+        type.element,
         relationship: TypeHierarchyItemRelationship.implements,
       );
 
   static TypeHierarchyRelatedItem? mixesIn(InterfaceType type) => _forElement(
-    type.element3,
+    type.element,
     relationship: TypeHierarchyItemRelationship.mixesIn,
   );
 
   static TypeHierarchyRelatedItem? unknown(InterfaceType type) => _forElement(
-    type.element3,
+    type.element,
     relationship: TypeHierarchyItemRelationship.unknown,
   );
 

pkg/analysis_server/lib/src/computer/computer_overrides.dart

@@ -174,13 +174,13 @@ class _OverriddenElementsFinder {
     }
     // interfaces
     for (var interfaceType in class_.interfaces) {
-      _addInterfaceOverrides(interfaceType.element3, true);
+      _addInterfaceOverrides(interfaceType.element, true);
     }
     // super
-    _addInterfaceOverrides(class_.supertype?.element3, checkType);
+    _addInterfaceOverrides(class_.supertype?.element, checkType);
     if (class_ is MixinElement) {
       for (var constraint in class_.superclassConstraints) {
-        _addInterfaceOverrides(constraint.element3, true);
+        _addInterfaceOverrides(constraint.element, true);
       }
     }
   }
@@ -203,13 +203,13 @@ class _OverriddenElementsFinder {
       }
     }
 
-    _addSuperOverrides(class_.supertype?.element3);
+    _addSuperOverrides(class_.supertype?.element);
     for (var mixin_ in class_.mixins) {
-      _addSuperOverrides(mixin_.element3);
+      _addSuperOverrides(mixin_.element);
     }
     if (class_ is MixinElement) {
       for (var constraint in class_.superclassConstraints) {
-        _addSuperOverrides(constraint.element3);
+        _addSuperOverrides(constraint.element);
       }
     }
   }

pkg/analysis_server/lib/src/flutter/flutter_outline_computer.dart

@@ -136,7 +136,7 @@ class FlutterOutlineComputer {
     if (type is! InterfaceType || !type.isWidgetType) {
       return null;
     }
-    var className = type.element3.displayName;
+    var className = type.element.displayName;
 
     if (node is InstanceCreationExpression) {
       var attributes = <protocol.FlutterOutlineAttribute>[];

pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/editable_arguments_mixin.dart

@@ -159,8 +159,8 @@ mixin EditableArgumentsMixin {
 
   /// Returns a list of the constants of an enum constant prefixed with the enum
   /// name.
-  List<String> getQualifiedEnumConstantNames(EnumElement element3) =>
-      element3.constants2.map(getQualifiedEnumConstantName).nonNulls.toList();
+  List<String> getQualifiedEnumConstantNames(EnumElement element) =>
+      element.constants2.map(getQualifiedEnumConstantName).nonNulls.toList();
 
   /// Returns the name of an enum constant prefixed with the enum name.
   static String? getQualifiedEnumConstantName(FieldElement enumConstant) {

pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_edit_argument.dart

@@ -210,9 +210,9 @@ class EditArgumentHandler extends SharedMessageHandler<EditArgumentParams, Null>
         ),
       );
     } else if (parameter.type case InterfaceType(
-      :EnumElement element3,
+      :EnumElement element,
     ) when value is String?) {
-      var allowedValues = getQualifiedEnumConstantNames(element3);
+      var allowedValues = getQualifiedEnumConstantNames(element);
       if (allowedValues.contains(value)) {
         return success(value.toString());
       } else {

pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_editable_arguments.dart

@@ -200,11 +200,11 @@ class EditableArgumentsHandler
       type = 'string';
       value = values.argumentValue?.toStringValue();
       defaultValue = values.parameterValue?.toStringValue();
-    } else if (parameter.type case InterfaceType(:EnumElement element3)) {
+    } else if (parameter.type case InterfaceType(:EnumElement element)) {
       type = 'enum';
-      options = getQualifiedEnumConstantNames(element3);
-      value = values.argumentValue?.toEnumStringValue(element3);
-      defaultValue = values.parameterValue?.toEnumStringValue(element3);
+      options = getQualifiedEnumConstantNames(element);
+      value = values.argumentValue?.toEnumStringValue(element);
+      defaultValue = values.parameterValue?.toEnumStringValue(element);
     } else {
       // TODO(dantup): Determine which parameters we don't include (such as
       //  Widgets) and which we include just without values.
@@ -252,14 +252,14 @@ class EditableArgumentsHandler
 }
 
 extension on DartObject? {
-  Object? toEnumStringValue(EnumElement element3) {
+  Object? toEnumStringValue(EnumElement element) {
     var valueObject = this;
     if (valueObject?.type case InterfaceType(
-      element3: EnumElement valueElement,
-    ) when element3 == valueElement) {
+      element: EnumElement valueElement,
+    ) when element == valueElement) {
       var index = valueObject?.getField('index')?.toIntValue();
       if (index != null) {
-        var enumConstant = element3.constants2.elementAtOrNull(index);
+        var enumConstant = element.constants2.elementAtOrNull(index);
         if (enumConstant != null) {
           return EditableArgumentsMixin.getQualifiedEnumConstantName(
             enumConstant,

pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart

@@ -88,7 +88,7 @@ class _SuperComputer {
     // For super classes, we use the first fragment (the original declaration).
     // This differs from methods/getters because we jump to the end of the
     // augmentation chain for those.
-    return element.supertype?.element3.firstFragment;
+    return element.supertype?.element.firstFragment;
   }
 
   Fragment? _findSuperConstructor(ConstructorElement element) {

pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart

@@ -106,9 +106,9 @@ class TypeDefinitionHandler
 
         analyzer.Element? element;
         if (type is InterfaceType) {
-          element = type.element3;
+          element = type.element;
         } else if (type is TypeParameterType) {
-          element = type.element3;
+          element = type.element;
         }
         if (element is! analyzer.Element) {
           return success(_emptyResult);

pkg/analysis_server/lib/src/search/type_hierarchy.dart

@@ -139,19 +139,19 @@ class TypeHierarchyComputer {
       var superType = classElement.supertype;
       if (superType != null) {
         item.superclass = _createSuperItem(
-          superType.element3,
+          superType.element,
           superType.typeArguments,
         );
       }
     }
     // mixins
     for (var type in classElement.mixins) {
-      var id = _createSuperItem(type.element3, type.typeArguments);
+      var id = _createSuperItem(type.element, type.typeArguments);
       item.mixins.add(id);
     }
     // interfaces
     for (var type in classElement.interfaces) {
-      var id = _createSuperItem(type.element3, type.typeArguments);
+      var id = _createSuperItem(type.element, type.typeArguments);
       item.interfaces.add(id);
     }
     // done
@@ -232,7 +232,7 @@ class TypeHierarchyComputerHelper {
     }
     // try to find in the class mixin
     for (var mixin in clazz.mixins.reversed) {
-      var mixinElement = mixin.element3;
+      var mixinElement = mixin.element;
       if (pivotKind == ElementKind.METHOD) {
         result = mixinElement.lookUpMethod(
           name: pivotName,