Deprecate 'Element.library2', use 'library' instead.

Deprecate `LibraryElement.loadLibraryFunction2`, use `loadLibraryFunction` instead.


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

Author: fshcheglov

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

@@ -97,7 +97,7 @@ class CanRenameResponse {
   FlutterWidgetState? _findFlutterStateClass(Element element, String newName) {
     if (element is ClassElement && element.isStatefulWidgetDeclaration) {
       var oldStateName = '${element.displayName}State';
-      var library = element.library2;
+      var library = element.library;
       var state =
           library.getClass2(oldStateName) ??
           library.getClass2('_$oldStateName');
@@ -217,7 +217,7 @@ class CheckNameResponse {
         );
       }
       // add element declaration
-      var sourcePath = element.library2!.firstFragment.source.fullName;
+      var sourcePath = element.library!.firstFragment.source.fullName;
       var infos = await _addElementDeclaration(element, sourcePath);
       replaceMatches.addMatch(sourcePath, infos);
     }
@@ -365,7 +365,7 @@ class CheckNameResponse {
     var interfaceElement = element.enclosingElement!;
 
     var fileResolver = canRename._fileResolver;
-    var libraryPath = interfaceElement.library2!.firstFragment.source.fullName;
+    var libraryPath = interfaceElement.library!.firstFragment.source.fullName;
     var resolvedLibrary = await fileResolver.resolveLibrary2(path: libraryPath);
     var result = resolvedLibrary.getFragmentDeclaration(
       interfaceElement.firstFragment,
@@ -429,7 +429,7 @@ class CiderRenameComputer {
     if (node == null || element == null) {
       return null;
     }
-    if (element.library2?.isInSdk == true) {
+    if (element.library?.isInSdk == true) {
       return null;
     }
     if (element is MethodElement && element.isOperator) {

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

@@ -228,16 +228,16 @@ class ColorComputer {
   }
 
   /// Checks whether this elements library is dart:ui.
-  bool _isDartUi(Element? element) => element?.library2?.name3 == 'dart.ui';
+  bool _isDartUi(Element? element) => element?.library?.name3 == 'dart.ui';
 
   /// Checks whether this elements library is Flutter Material colors.
   bool _isFlutterMaterial(Element? element) =>
-      element?.library2?.identifier ==
+      element?.library?.identifier ==
       'package:flutter/src/material/colors.dart';
 
   /// Checks whether this elements library is Flutter Painting colors.
   bool _isFlutterPainting(Element? element) =>
-      element?.library2?.identifier ==
+      element?.library?.identifier ==
       'package:flutter/src/painting/colors.dart';
 
   /// Tries to record a color from [colorConst] for [expression].

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

@@ -151,7 +151,7 @@ class DartUnitHoverComputer {
 
   /// Returns information about the library that contains [element].
   _LibraryInfo _libraryInfo(Element element) {
-    var library = element.library2;
+    var library = element.library;
     if (library == null) {
       return null;
     }

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

@@ -653,7 +653,7 @@ class _FunctionBodyOutlinesVisitor extends RecursiveAstVisitor<void> {
   /// Return `true` if the given [element] is a top-level member of the test
   /// package.
   bool _isInsideTestPackage(engine.TopLevelFunctionElement element) {
-    var parent = element.library2;
+    var parent = element.library;
     return parent.firstFragment.source.fullName.endsWith('test.dart');
   }
 }

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

@@ -123,7 +123,7 @@ class _OverriddenElementsFinder {
 
   factory _OverriddenElementsFinder(Element seed) {
     var class_ = seed.enclosingElement as InterfaceElement;
-    var library = class_.library2;
+    var library = class_.library;
     var name = seed.displayName;
     List<ElementKind> kinds;
     if (seed is FieldElement) {
@@ -217,7 +217,7 @@ class _OverriddenElementsFinder {
   Element? _lookupMember(InterfaceElement classElement) {
     Element? findMatchingElement(Iterable<Element> elements) {
       return elements.firstWhereOrNull((Element element) {
-        if (!identical(element.library2, _library) && _name.startsWith('_')) {
+        if (!identical(element.library, _library) && _name.startsWith('_')) {
           return false;
         }
         return element.name3 == _name;

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

@@ -119,7 +119,7 @@ class _Visitor extends UnifyingAstVisitor<void> {
       return;
     }
 
-    var path = element.library2?.firstFragment.source.fullName;
+    var path = element.library?.firstFragment.source.fullName;
     if (path == null) {
       return;
     }

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

@@ -194,7 +194,7 @@ class TypeHierarchyComputerHelper {
 
     return TypeHierarchyComputerHelper(
       pivotElement,
-      pivotElement.library2!,
+      pivotElement.library!,
       pivotElement.kind,
       pivotElement.name3,
       pivotFieldFinal,

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

@@ -218,7 +218,7 @@ class DeclarationHelper {
             collector.addSuggestion(
               LoadLibraryFunctionSuggestion(
                 kind: CompletionSuggestionKind.INVOCATION,
-                element: importedLibrary.loadLibraryFunction2,
+                element: importedLibrary.loadLibraryFunction,
                 matcherScore: matcherScore,
               ),
             );
@@ -1627,7 +1627,7 @@ class DeclarationHelper {
     if (element.isInternal) {
       switch (request.fileState.workspacePackage) {
         case PubPackage pubPackage:
-          var librarySource = element.library2.firstFragment.source;
+          var librarySource = element.library.firstFragment.source;
           if (!pubPackage.contains(librarySource)) {
             return false;
           }
@@ -1640,7 +1640,7 @@ class DeclarationHelper {
         return false;
       }
 
-      if (elementInterface.library2 != requestLibrary) {
+      if (elementInterface.library != requestLibrary) {
         var contextInterface = request.target.enclosingInterfaceElement;
         if (contextInterface == null) {
           return false;
@@ -1654,12 +1654,12 @@ class DeclarationHelper {
     }
 
     if (element.isVisibleForTesting) {
-      if (element.library2 != requestLibrary) {
+      if (element.library != requestLibrary) {
         var fileState = request.fileState;
         switch (fileState.workspacePackage) {
           case PubPackage pubPackage:
             // Must be in the same package.
-            var librarySource = element.library2.firstFragment.source;
+            var librarySource = element.library.firstFragment.source;
             if (!pubPackage.contains(librarySource)) {
               return false;
             }
@@ -2698,7 +2698,7 @@ extension on Element {
   /// An element is visible if it's declared in the [referencingLibrary] or if
   /// the name is not private.
   bool isVisibleIn(LibraryElement referencingLibrary) {
-    if (library2 == referencingLibrary) {
+    if (library == referencingLibrary) {
       return true;
     }
     var name = name3;

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

@@ -1281,7 +1281,7 @@ parent3: ${node.parent?.parent?.parent}
     if (type is! InterfaceType) {
       return null;
     }
-    var declaredElement = field.element2?.library2;
+    var declaredElement = field.element2?.library;
     var uri = declaredElement?.uri;
     var member = type.element.getInterfaceMember(Name(uri, name));
     if (member is GetterElement) {

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

@@ -77,7 +77,7 @@ class OverrideHelper {
   /// yet declared in the class.
   List<Name> _namesToOverride(InterfaceElement interfaceElement) {
     var namesToOverride = <Name>[];
-    var libraryUri = interfaceElement.library2.uri;
+    var libraryUri = interfaceElement.library.uri;
     var memberNames = interfaceElement.interfaceMembers.keys;
     for (var name in memberNames) {
       if (name.isAccessibleFor(libraryUri)) {