Deprecate appendToWithoutDelimiters2, correspondingSetter2, unnamedConstructor2, getNamedConstructor2, entryPoint2, exportedLibraries2, getClass2, getEnum2, getMixin2, exportedLibrary2, accessibleExtensions2, importedLibraries2, importedLibrary2, isImplementableIn2, join2, variable3, getter2, setter2, correspondingGetter2, superConstructorParameter2, aliasedElement2, typeParameters2, constantInitializer2, and isNonSubtypableClass2

Change-Id: I091804b9f200f525baf3979773dd489e3be17697
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/439640
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>

Author: fshcheglov

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

@@ -173,7 +173,7 @@ class CiderCompletionComputer {
     var importedLibraries =
         target.withEnclosing2
             .expand((fragment) => fragment.libraryImports2)
-            .map((import) => import.importedLibrary2)
+            .map((import) => import.importedLibrary)
             .nonNulls
             .toSet();
     for (var importedLibrary in importedLibraries) {

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

@@ -99,7 +99,7 @@ class LibraryElementSuggestionBuilder
 
   @override
   void visitGetterElement(GetterElement element) {
-    var variable = element.variable3;
+    var variable = element.variable;
     if (opType.includeReturnValueSuggestions ||
         (opType.includeAnnotationSuggestions &&
             variable != null &&
@@ -130,15 +130,15 @@ class LibraryElementSuggestionBuilder
   visitMixinElement(MixinElement element) {
     AstNode node = request.target.containingNode;
     if (node is ImplementsClause &&
-        !element.isImplementableIn2(request.libraryElement)) {
+        !element.isImplementableIn(request.libraryElement)) {
       return;
     }
     _visitInterfaceElement(element);
   }
 
   @override
   void visitSetterElement(SetterElement element) {
-    var variable = element.variable3;
+    var variable = element.variable;
     if (opType.includeReturnValueSuggestions ||
         (opType.includeAnnotationSuggestions &&
             variable != null &&
@@ -228,7 +228,7 @@ class LibraryElementSuggestionBuilder
               field.isAccessibleIn(request.libraryElement) &&
               typeSystem.isSubtypeOf(field.type, contextType)) {
             if (field.isSynthetic) {
-              var getter = field.getter2;
+              var getter = field.getter;
               if (getter != null) {
                 builder.suggestGetter(
                   getter,

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

@@ -99,8 +99,8 @@ class CanRenameResponse {
       var oldStateName = '${element.displayName}State';
       var library = element.library;
       var state =
-          library.getClass2(oldStateName) ??
-          library.getClass2('_$oldStateName');
+          library.getClass(oldStateName) ??
+          library.getClass('_$oldStateName');
       if (state != null) {
         var flutterWidgetStateNewName = '${newName}State';
         // If the State was private, ensure that it stays private.
@@ -131,8 +131,8 @@ class CheckNameResponse {
     var element = canRename.refactoringElement.element;
     if (element is PropertyInducingElement && element.isSynthetic) {
       var property = element;
-      var getter = property.getter2;
-      var setter = property.setter2;
+      var getter = property.getter;
+      var setter = property.setter;
       elements.addIfNotNull(getter);
       elements.addIfNotNull(setter);
     } else {
@@ -235,7 +235,7 @@ class CheckNameResponse {
   ) async {
     var infos = <ReplaceInfo>[];
     if (element is PropertyInducingElement && element.isSynthetic) {
-      var getter = element.getter2;
+      var getter = element.getter;
       if (getter != null) {
         infos.add(
           ReplaceInfo(
@@ -245,7 +245,7 @@ class CheckNameResponse {
           ),
         );
       }
-      var setter = element.setter2;
+      var setter = element.setter;
       if (setter != null) {
         infos.add(
           ReplaceInfo(
@@ -436,7 +436,7 @@ class CiderRenameComputer {
       return null;
     }
     if (element is PropertyAccessorElement) {
-      element = element.variable3;
+      element = element.variable;
       if (element == null) {
         return null;
       }

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

@@ -33,16 +33,15 @@ class DartDocumentationComputer {
       element,
       ...overridden.superElements,
       ...overridden.interfaceElements,
-      if (element case PropertyAccessorElement(variable3: var variable?))
-        variable,
+      if (element case PropertyAccessorElement(:var variable?)) variable,
     ];
     for (var candidate in candidates) {
       if (candidate.documentationCommentOrNull != null) {
         documentedElement = candidate;
         break;
       }
       if (documentedGetter == null && candidate is SetterElement) {
-        var getter = candidate.correspondingGetter2;
+        var getter = candidate.correspondingGetter;
         if (getter != null && getter.documentationComment != null) {
           documentedGetter = getter;
         }
@@ -108,9 +107,9 @@ extension on Element {
       // Treat a super formal parameter like a field formal parameter if it's
       // eventually assigned to a field, but as any other formal parameter if it
       // isn't.
-      var superParameter = self.superConstructorParameter2;
+      var superParameter = self.superConstructorParameter;
       while (superParameter is SuperFormalParameterElement) {
-        superParameter = superParameter.superConstructorParameter2;
+        superParameter = superParameter.superConstructorParameter;
       }
       if (superParameter is FieldFormalParameterElement) {
         return superParameter.field;

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

@@ -271,7 +271,7 @@ class DartUnitHighlightsComputer {
       type = HighlightRegionType.TOP_LEVEL_VARIABLE_DECLARATION;
     } else if (element is GetterElement) {
       var accessor = element;
-      var variable = accessor.variable3;
+      var variable = accessor.variable;
       if (variable is TopLevelVariableElement) {
         type = HighlightRegionType.TOP_LEVEL_GETTER_REFERENCE;
       } else if (variable is FieldElement && variable.isEnumConstant) {
@@ -283,7 +283,7 @@ class DartUnitHighlightsComputer {
       }
     } else if (element is SetterElement) {
       var accessor = element;
-      var variable = accessor.variable3;
+      var variable = accessor.variable;
       if (variable is TopLevelVariableElement) {
         type = HighlightRegionType.TOP_LEVEL_SETTER_REFERENCE;
       } else if (variable is FieldElement && variable.isEnumConstant) {

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

@@ -381,7 +381,7 @@ class ImportElementsComputer {
     if (libraryImport == null) {
       return false;
     }
-    var library = libraryImport.importedLibrary2;
+    var library = libraryImport.importedLibrary;
     return library != null &&
         library.firstFragment.source.fullName == importedElements.path &&
         (import.prefix?.name ?? '') == importedElements.prefix;

pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart

@@ -100,8 +100,8 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
-    if (node.declaredElement case BindPatternVariableElement(:var join2?)) {
-      _addOccurrence(join2.baseElement, node.name);
+    if (node.declaredElement case BindPatternVariableElement(:var join?)) {
+      _addOccurrence(join.baseElement, node.name);
     } else {
       _addOccurrence(node.declaredElement!, node.name);
     }
@@ -307,9 +307,9 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
     if (canonicalElement is FieldFormalParameterElement) {
       canonicalElement = canonicalElement.field;
     } else if (canonicalElement case PropertyAccessorElement(
-      :var variable3?,
-    ) when !variable3.isSynthetic) {
-      canonicalElement = variable3;
+      :var variable?,
+    ) when !variable.isSynthetic) {
+      canonicalElement = variable;
     }
     return canonicalElement?.baseElement;
   }

pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart

@@ -36,7 +36,7 @@ class SearchFindElementReferencesHandler extends LegacyHandler {
       element = element.field;
     }
     if (element is PropertyAccessorElement) {
-      element = element.variable3;
+      element = element.variable;
     }
     // respond
     var searchId = (server.nextSearchId++).toString();

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

@@ -249,7 +249,7 @@ class DocumentColorPresentationHandler
           parent is PrefixedIdentifier ? parent.element : node.element;
 
       return switch (element) {
-        PropertyAccessorElement(:var variable3) => variable3?.isConst ?? false,
+        PropertyAccessorElement(:var variable) => variable?.isConst ?? false,
         VariableElement() => element.isConst,
         _ => false,
       };

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

@@ -69,7 +69,7 @@ class ReferencesHandler
 
     var element = switch (node?.getElement()) {
       FieldFormalParameterElement(:var field?) => field,
-      PropertyAccessorElement(:var variable3?) => variable3,
+      PropertyAccessorElement(:var variable?) => variable,
       var element => element,
     };