Elements. Tweak for lookUpInheritedMethod2(), move 'importedLibraries2'.

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

Author: scheglov

pkg/analyzer/lib/dart/element/element2.dart

@@ -1324,8 +1324,10 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// failed.
   /// </blockquote>
   // TODO(scheglov): Deprecate and remove it.
-  MethodElement2? lookUpInheritedMethod2(
-      String methodName, LibraryElement2 library);
+  MethodElement2? lookUpInheritedMethod2({
+    required String methodName,
+    required LibraryElement2 library,
+  });
 }
 
 /// The portion of an [InterfaceElement2] contributed by a single declaration.
@@ -1502,12 +1504,6 @@ abstract class LibraryElement2 implements Element2, Annotatable {
   /// of this element's parent.
   String get identifier;
 
-  /// The libraries that are imported into this library.
-  ///
-  /// This includes all of the libraries that are imported using a prefix, and
-  /// those that are imported without a prefix.
-  List<LibraryElement2> get importedLibraries2;
-
   /// Whether the library is the `dart:async` library.
   bool get isDartAsync;
 
@@ -1660,6 +1656,12 @@ abstract class LibraryFragment implements Fragment, Annotatable {
   /// The fragments of the top-level getters declared in this fragment.
   List<GetterFragment> get getters;
 
+  /// The libraries that are imported by this unit.
+  ///
+  /// This includes all of the libraries that are imported using a prefix, and
+  /// those that are imported without a prefix.
+  List<LibraryElement2> get importedLibraries2;
+
   /// The libraries exported by this unit.
   List<LibraryExport> get libraryExports2;
 

pkg/analyzer/lib/src/dart/element/element.dart

@@ -956,6 +956,15 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
   @override
   String get identifier => '${source.uri}';
 
+  @override
+  List<LibraryElement2> get importedLibraries2 {
+    return libraryImports2
+        .map((import) => import.importedLibrary2)
+        .nonNulls
+        .toSet()
+        .toList();
+  }
+
   @override
   ElementKind get kind => ElementKind.COMPILATION_UNIT;
 
@@ -6313,10 +6322,10 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
           typeArguments: typeArguments, nullabilitySuffix: nullabilitySuffix);
 
   @override
-  MethodElement2? lookUpInheritedMethod2(
-    String methodName,
-    LibraryElement2 library,
-  ) {
+  MethodElement2? lookUpInheritedMethod2({
+    required String methodName,
+    required LibraryElement2 library,
+  }) {
     return inheritanceManager
         .getInherited4(
           this,
@@ -6760,16 +6769,6 @@ class LibraryElementImpl extends ElementImpl
         .toList();
   }
 
-  @override
-  List<LibraryElement2> get importedLibraries2 {
-    return fragments
-        .expand((fragment) => fragment.libraryImports2)
-        .map((import) => import.importedLibrary2)
-        .nonNulls
-        .toSet()
-        .toList();
-  }
-
   @override
   bool get isDartAsync => name == "dart.async";