Deprecate constants2, lookUpInheritedMethod2, lookUpInheritedMethod2, classes2, classes2, extensionTypes2, extensions2, functions2, libraryExports2, libraryImports2, libraryImports2, mixins2, topLevelVariables2, typeAliases2, join2, isNonSubtypableClass2, and typeParameters2.

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

Author: fshcheglov

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

@@ -172,7 +172,7 @@ class CiderCompletionComputer {
     var suggestionBuilders = <CompletionSuggestionBuilder>[];
     var importedLibraries =
         target.withEnclosing2
-            .expand((fragment) => fragment.libraryImports2)
+            .expand((fragment) => fragment.libraryImports)
             .map((import) => import.importedLibrary)
             .nonNulls
             .toSet();

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

@@ -257,7 +257,7 @@ class CheckNameResponse {
       }
     } else if (element is MockLibraryImportElement) {
       var unit = (await canRename._fileResolver.resolve(path: sourcePath)).unit;
-      var index = element.libraryFragment.libraryImports2.indexOf(
+      var index = element.libraryFragment.libraryImports.indexOf(
         element.import,
       );
       var node = unit.directives.whereType<ImportDirective>().elementAt(index);

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

@@ -18,16 +18,16 @@ class ImplementedComputer {
   ImplementedComputer(this.searchEngine, this.unitElement);
 
   Future<void> compute() async {
-    for (var fragment in unitElement.classes2) {
+    for (var fragment in unitElement.classes) {
       await _computeForInterfaceElement(fragment.element);
     }
-    for (var fragment in unitElement.enums2) {
+    for (var fragment in unitElement.enums) {
       await _computeForInterfaceElement(fragment.element);
     }
-    for (var fragment in unitElement.extensionTypes2) {
+    for (var fragment in unitElement.extensionTypes) {
       await _computeForInterfaceElement(fragment.element);
     }
-    for (var fragment in unitElement.mixins2) {
+    for (var fragment in unitElement.mixins) {
       await _computeForInterfaceElement(fragment.element);
     }
   }

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -317,7 +317,7 @@ class DeclarationHelper {
 
   void addImportPrefixes() {
     var library = request.libraryElement;
-    for (var element in library.firstFragment.libraryImports2) {
+    for (var element in library.firstFragment.libraryImports) {
       var importPrefix = element.prefix2;
       if (importPrefix == null) {
         continue;
@@ -940,7 +940,7 @@ class DeclarationHelper {
     // TODO(brianwilkerson): This will create suggestions for elements that
     //  conflict with different elements imported from a different library. Not
     //  sure whether that's the desired behavior.
-    for (var importElement in library.firstFragment.libraryImports2) {
+    for (var importElement in library.firstFragment.libraryImports) {
       var importedLibrary = importElement.importedLibrary;
       if (importedLibrary != null) {
         _addConstructorsImportedFrom(
@@ -958,7 +958,7 @@ class DeclarationHelper {
     // TODO(brianwilkerson): This will create suggestions for elements that
     //  conflict with different elements imported from a different library. Not
     //  sure whether that's the desired behavior.
-    for (var importElement in library.firstFragment.libraryImports2) {
+    for (var importElement in library.firstFragment.libraryImports) {
       var importedLibrary = importElement.importedLibrary;
       if (importedLibrary != null) {
         _addDeclarationsImportedFrom(

pkg/analysis_server/lib/src/services/completion/dart/not_imported_completion_pass.dart

@@ -218,7 +218,7 @@ class _ImportSummary {
 
   _ImportSummary(LibraryElement library) {
     for (var fragment in library.fragments) {
-      for (var import in fragment.libraryImports2) {
+      for (var import in fragment.libraryImports) {
         var importedLibrary = import.importedLibrary;
         if (importedLibrary != null) {
           if (import.combinators.isEmpty) {

pkg/analysis_server/lib/src/services/correction/dart/change_to.dart

@@ -136,7 +136,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
       }
       // Check elements from imports.
       for (var importElement
-          in unitResult.libraryElement2.firstFragment.libraryImports2) {
+          in unitResult.libraryElement2.firstFragment.libraryImports) {
         if (importElement.prefix2?.element.name == prefixName) {
           var namespace = getImportNamespace(importElement);
           finder._updateList(namespace.values);
@@ -243,7 +243,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
       }
       // Check unprefixed imports.
       for (var importElement
-          in unitResult.libraryElement2.firstFragment.libraryImports2) {
+          in unitResult.libraryElement2.firstFragment.libraryImports) {
         if (importElement.prefix2?.element.name == prefixName) {
           var namespace = getImportNamespace(importElement);
           finder._updateList(namespace.values);

pkg/analysis_server/lib/src/services/correction/dart/create_class.dart

@@ -199,7 +199,7 @@ class _CreateClass extends ResolvedCorrectionProducer {
       filePath = file;
       prefix = '$eol$eol';
     } else {
-      for (var import in libraryElement2.firstFragment.libraryImports2) {
+      for (var import in libraryElement2.firstFragment.libraryImports) {
         if (_prefixElement is PrefixElement &&
             import.prefix2?.element == _prefixElement) {
           var library = import.importedLibrary;

pkg/analysis_server/lib/src/services/correction/dart/create_mixin.dart

@@ -153,7 +153,7 @@ class _CreateMixin extends ResolvedCorrectionProducer {
       filePath = file;
       prefix = '$eol$eol';
     } else {
-      for (var import in libraryElement2.firstFragment.libraryImports2) {
+      for (var import in libraryElement2.firstFragment.libraryImports) {
         if (prefixElement is PrefixElement &&
             import.prefix2?.element == prefixElement) {
           var library = import.importedLibrary;

pkg/analysis_server/lib/src/services/correction/dart/data_driven.dart

@@ -27,7 +27,7 @@ class DataDriven extends MultiCorrectionProducer {
     var importedUris = <Uri>[];
     var library = unitResult.libraryElement2;
     var fragment = library.firstFragment;
-    for (var importElement in fragment.libraryImports2) {
+    for (var importElement in fragment.libraryImports) {
       // TODO(brianwilkerson): Filter based on combinators to help avoid making
       //  invalid suggestions.
       var uri = importElement.uri;

pkg/analysis_server/lib/src/services/correction/dart/import_library.dart

@@ -236,7 +236,7 @@ class ImportLibrary extends MultiCorrectionProducer {
     // Maybe there is an existing import, but it is with prefix and we don't use
     // this prefix.
     var alreadyImportedWithPrefix = <LibraryElement>{};
-    for (var import in unitResult.libraryFragment.libraryImports2) {
+    for (var import in unitResult.libraryFragment.libraryImports) {
       // Prepare the element.
       var libraryElement = import.importedLibrary;
       if (libraryElement == null) {
@@ -400,7 +400,7 @@ class ImportLibrary extends MultiCorrectionProducer {
     // additional analysis.
     var foundImport = false;
     var names = <_PrefixedName>[];
-    for (var import in unitResult.libraryFragment.libraryImports2) {
+    for (var import in unitResult.libraryFragment.libraryImports) {
       // prepare element
       var importedLibrary = import.importedLibrary;
       if (importedLibrary == null || importedLibrary != libraryToImport) {