Remove Xyz2 suffix getters from /analysis

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

Author: fshcheglov

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

@@ -37,7 +37,7 @@ class ImportElementsComputer {
     var filteredImportedElements = _filterImportedElements(
       importedElementsList,
     );
-    var libraryElement = libraryResult.libraryElement2;
+    var libraryElement = libraryResult.libraryElement;
     var uriConverter = libraryResult.session.uriConverter;
     var existingImports = <ImportDirective>[];
     for (var directive in unit.directives) {
@@ -358,7 +358,7 @@ class ImportElementsComputer {
   }
 
   bool _hasElement(String prefix, String name) {
-    var scope = libraryResult.libraryElement2.firstFragment.scope;
+    var scope = libraryResult.libraryElement.firstFragment.scope;
 
     if (prefix.isNotEmpty) {
       var prefixElement = scope.lookup(prefix).getter;

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

@@ -40,7 +40,7 @@ class EditImportElementsHandler extends LegacyHandler {
       sendResponse(Response.importElementsInvalidFile(request));
       return;
     }
-    var libraryUnit = result.libraryElement2.firstFragment;
+    var libraryUnit = result.libraryElement.firstFragment;
     if (libraryUnit != result.libraryFragment) {
       // The file in the request is a part of a library. We need to pass the
       // defining compilation unit to the computer, not the part.

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

@@ -115,7 +115,7 @@ extension SomeResolvedLibraryResultExtension on SomeResolvedLibraryResult? {
   Version get effectiveLanguageVersion {
     var self = this;
     if (self is ResolvedLibraryResult) {
-      return self.element2.languageVersion.effective;
+      return self.element.languageVersion.effective;
     }
     return DartFormatter.latestLanguageVersion;
   }

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

@@ -138,7 +138,7 @@ class NotImportedCompletionPass {
       }
 
       var library = request.libraryElement;
-      var element = elementResult.element2;
+      var element = elementResult.element;
       if (element == library) {
         // Don't suggest elements from the library in which completion is being
         // requested. They've already been suggested.

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

@@ -132,11 +132,11 @@ class ChangeTo extends ResolvedCorrectionProducer {
       );
       // Check elements of this library.
       if (prefixName == null) {
-        finder._updateList(unitResult.libraryElement2.classes);
+        finder._updateList(unitResult.libraryElement.classes);
       }
       // Check elements from imports.
       for (var importElement
-          in unitResult.libraryElement2.firstFragment.libraryImports) {
+          in unitResult.libraryElement.firstFragment.libraryImports) {
         if (importElement.prefix?.element.name == prefixName) {
           var namespace = getImportNamespace(importElement);
           finder._updateList(namespace.values);
@@ -237,13 +237,13 @@ class ChangeTo extends ResolvedCorrectionProducer {
       );
       // Check to this library units.
       if (prefixName == null) {
-        for (var function in unitResult.libraryElement2.topLevelFunctions) {
+        for (var function in unitResult.libraryElement.topLevelFunctions) {
           finder._update(function);
         }
       }
       // Check unprefixed imports.
       for (var importElement
-          in unitResult.libraryElement2.firstFragment.libraryImports) {
+          in unitResult.libraryElement.firstFragment.libraryImports) {
         if (importElement.prefix?.element.name == prefixName) {
           var namespace = getImportNamespace(importElement);
           finder._updateList(namespace.values);

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

@@ -33,7 +33,7 @@ class ConvertPartOfToUri extends ResolvedCorrectionProducer {
     }
 
     var pathContext = resourceProvider.pathContext;
-    var libraryFragment = unitResult.libraryElement2.firstFragment;
+    var libraryFragment = unitResult.libraryElement.firstFragment;
     var libraryPath = libraryFragment.source.fullName;
     var partPath = unitResult.path;
     var relativePath = pathContext.relative(

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

@@ -51,7 +51,7 @@ class CreateFile extends ResolvedCorrectionProducer {
         if (source != null) {
           var pathContext = resourceProvider.pathContext;
           var relativePath = pathContext.relative(
-            unitResult.libraryElement2.firstFragment.source.fullName,
+            unitResult.libraryElement.firstFragment.source.fullName,
             from: pathContext.dirname(source.fullName),
           );
 

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

@@ -25,7 +25,7 @@ class DataDriven extends MultiCorrectionProducer {
   @override
   Future<List<ResolvedCorrectionProducer>> get producers async {
     var importedUris = <Uri>[];
-    var library = unitResult.libraryElement2;
+    var library = unitResult.libraryElement;
     var fragment = library.firstFragment;
     for (var importElement in fragment.libraryImports) {
       // TODO(brianwilkerson): Filter based on combinators to help avoid making

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

@@ -506,7 +506,7 @@ class ImportLibrary extends MultiCorrectionProducer {
 
     var names = <_PrefixedName>[];
     var name = Name.forLibrary(
-      dartFixContext.unitResult.libraryElement2,
+      dartFixContext.unitResult.libraryElement,
       memberName,
     );
     await for (var libraryToImport in librariesWithExtensions(name)) {
@@ -918,7 +918,7 @@ class _ImportLibraryCombinatorMultiple extends ResolvedCorrectionProducer {
         newCombinatorCode = ' ${keyword.lexeme} ${names.join(', ')}';
       }
       var libraryPath =
-          unitResult.libraryElement2.firstFragment.source.fullName;
+          unitResult.libraryElement.firstFragment.source.fullName;
       await builder.addDartFileEdit(libraryPath, (builder) {
         builder.addSimpleReplacement(
           SourceRange(offset - 1, length + 1),

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

@@ -103,10 +103,7 @@ class _UseDifferentDivisionOperator extends ResolvedCorrectionProducer {
     }
     // All extensions available in the current scope for the left operand that
     // define the other division operator.
-    var name = Name.forLibrary(
-      unitResult.libraryElement2,
-      otherOperator.lexeme,
-    );
+    var name = Name.forLibrary(unitResult.libraryElement, otherOperator.lexeme);
     var hasNoExtensionWithOtherDivisionOperator =
         await librariesWithExtensions(name).where((library) {
           return library.exportedExtensions