Elements. Deprecate Element.enclosingElement2, use enclosingElement.

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

Author: scheglov

pkg/analysis_server/lib/src/cider/local_library_contributor.dart

@@ -104,7 +104,7 @@ class LibraryElementSuggestionBuilder
         (opType.includeAnnotationSuggestions &&
             variable != null &&
             variable.isConst)) {
-      var parent = element.enclosingElement2;
+      var parent = element.enclosingElement;
       if (parent is InterfaceElement || parent is ExtensionElement) {
         if (element.isSynthetic) {
           if (variable is FieldElement) {
@@ -143,7 +143,7 @@ class LibraryElementSuggestionBuilder
         (opType.includeAnnotationSuggestions &&
             variable != null &&
             variable.isConst)) {
-      var parent = element.enclosingElement2;
+      var parent = element.enclosingElement;
       if (parent is InterfaceElement || parent is ExtensionElement) {
         if (!element.isSynthetic) {
           builder.suggestSetter(element, inheritanceDistance: 0.0);

pkg/analysis_server/lib/src/cider/rename.dart

@@ -74,7 +74,7 @@ class CanRenameResponse {
     RefactoringStatus result,
     String newName,
   ) {
-    var parentClass = element.enclosingElement2;
+    var parentClass = element.enclosingElement;
     // Check if the "newName" is the name of the enclosing class.
     if (parentClass.name3 == newName) {
       result.addError(
@@ -362,7 +362,7 @@ class CheckNameResponse {
 
   Future<CiderReplaceMatch?> _replaceSyntheticConstructor() async {
     var element = canRename.refactoringElement.element;
-    var interfaceElement = element.enclosingElement2!;
+    var interfaceElement = element.enclosingElement!;
 
     var fileResolver = canRename._fileResolver;
     var libraryPath = interfaceElement.library2!.firstFragment.source.fullName;
@@ -452,7 +452,7 @@ class CiderRenameComputer {
   }
 
   bool _canRenameElement(Element element) {
-    var enclosingElement = element.enclosingElement2;
+    var enclosingElement = element.enclosingElement;
     if (element is ConstructorElement) {
       return true;
     }

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

@@ -108,7 +108,7 @@ class CallHierarchyItem {
       file = element.firstFragment.libraryFragment!.source.fullName,
       kind = CallHierarchyKind.forElement(element) {
     var enclosingElement =
-        element.enclosingElement2 ??
+        element.enclosingElement ??
         element.firstFragment.enclosingFragment?.element;
     var container =
         enclosingElement != null ? _getContainer(enclosingElement) : null;
@@ -145,7 +145,7 @@ class CallHierarchyItem {
   static Element _nonSynthetic(Element element) {
     element = element.nonSynthetic2;
     if (element.isSynthetic) {
-      element = element.enclosingElement2 ?? element;
+      element = element.enclosingElement ?? element;
     }
     return element;
   }

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

@@ -74,7 +74,7 @@ class ColorComputer {
 
     var constructor = expression.constructorName;
     var staticElement = constructor.element;
-    var classElement = staticElement?.enclosingElement2;
+    var classElement = staticElement?.enclosingElement;
     var className = classElement?.name3;
     var constructorName = constructor.name?.name;
     var constructorArgs = expression.argumentList.arguments.toList();

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

@@ -19,7 +19,7 @@ class DartDocumentationComputer {
   }) {
     var element = switch (elementBeingDocumented) {
       FieldFormalParameterElement() => elementBeingDocumented.field2,
-      FormalParameterElement() => elementBeingDocumented.enclosingElement2,
+      FormalParameterElement() => elementBeingDocumented.enclosingElement,
       _ => elementBeingDocumented,
     };
     if (element == null) {
@@ -68,9 +68,9 @@ class DartDocumentationComputer {
       includeSummary: includeSummary,
     );
 
-    var documentedElementClass = documentedElement.enclosingElement2;
+    var documentedElementClass = documentedElement.enclosingElement;
     if (documentedElementClass != null &&
-        documentedElementClass != element.enclosingElement2) {
+        documentedElementClass != element.enclosingElement) {
       var documentedClass = documentedElementClass.displayName;
       result.full = '${result.full}\n\nCopied from `$documentedClass`.';
     }

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

@@ -71,7 +71,7 @@ class DartUnitHoverComputer {
           hover.isDeprecated = a.metadata2.hasDeprecated;
         }
         // not local element
-        if (element.enclosingElement2 is! ExecutableElement) {
+        if (element.enclosingElement is! ExecutableElement) {
           // containing class
           hover.containingClassDescription = _containingClass(element);
           // containing library
@@ -211,7 +211,7 @@ class DartUnitHoverComputer {
       return null;
     }
     var parameter = node.correspondingParameter;
-    return switch (parameter?.enclosingElement2) {
+    return switch (parameter?.enclosingElement) {
       // Expressions passed as arguments to setters and binary expressions
       // will have parameters here but we don't want them to show as such in
       // hovers because information about those functions are already available

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

@@ -11,7 +11,7 @@ import 'package:collection/collection.dart';
 
 /// Return the elements that the given [element] overrides.
 OverriddenElements findOverriddenElements(Element element) {
-  if (element.enclosingElement2 is InterfaceElement) {
+  if (element.enclosingElement is InterfaceElement) {
     return _OverriddenElementsFinder(element).find();
   }
   return OverriddenElements(element, <Element>[], <Element>[]);
@@ -123,7 +123,7 @@ class _OverriddenElementsFinder {
   final Set<InterfaceElement> _visited = {};
 
   factory _OverriddenElementsFinder(Element seed) {
-    var class_ = seed.enclosingElement2 as InterfaceElement;
+    var class_ = seed.enclosingElement as InterfaceElement;
     var library = class_.library2;
     var name = seed.displayName;
     List<ElementKind> kinds;

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

@@ -115,7 +115,7 @@ class _Visitor extends UnifyingAstVisitor<void> {
     if (element is PrefixElement) {
       return;
     }
-    if (element.enclosingElement2 is! LibraryElement) {
+    if (element.enclosingElement is! LibraryElement) {
       return;
     }
 

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

@@ -164,7 +164,7 @@ mixin EditableArgumentsMixin {
 
   /// Returns the name of an enum constant prefixed with the enum name.
   static String? getQualifiedEnumConstantName(FieldElement enumConstant) {
-    var enumName = enumConstant.enclosingElement2.name3;
+    var enumName = enumConstant.enclosingElement.name3;
     var name = enumConstant.name3;
     return enumName != null && name != null ? '$enumName.$name' : null;
   }
@@ -182,7 +182,7 @@ extension on InvocationExpressionImpl {
     // We only support @widgetFactory on extension methods.
     var element = switch (function) {
       Identifier(:var element)
-          when element?.enclosingElement2 is ExtensionElement =>
+          when element?.enclosingElement is ExtensionElement =>
         element,
       _ => null,
     };

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

@@ -82,7 +82,7 @@ class ImportsHandler
         }
       }
 
-      var enclosingElement = element.enclosingElement2;
+      var enclosingElement = element.enclosingElement;
       if (enclosingElement is ExtensionElement) {
         element = enclosingElement;
       }