Elements. Remove V1 LibraryElement.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -2968,7 +2968,6 @@ package:analyzer/dart/element/element.dart:
     new (constructor: DirectiveUri Function())
   DirectiveUriWithLibrary (class extends DirectiveUriWithSource):
     new (constructor: DirectiveUriWithLibrary Function())
-    library (getter: LibraryElement, deprecated)
     library2 (getter: LibraryElement2)
   DirectiveUriWithRelativeUri (class extends DirectiveUriWithRelativeUriString):
     new (constructor: DirectiveUriWithRelativeUri Function())
@@ -3021,7 +3020,6 @@ package:analyzer/dart/element/element.dart:
     isPublic (getter: bool)
     isSynthetic (getter: bool)
     kind (getter: ElementKind)
-    library (getter: LibraryElement?, deprecated)
     location (getter: ElementLocation?)
     metadata (getter: List<ElementAnnotation>)
     name (getter: String?)
@@ -3033,7 +3031,6 @@ package:analyzer/dart/element/element.dart:
     source (getter: Source?)
     getDisplayString (method: String Function({bool multiline, bool withNullability}))
     getExtendedDisplayName (method: String Function(String?))
-    isAccessibleIn (method: bool Function(LibraryElement), deprecated)
     thisOrAncestorMatching (method: E? Function<E extends Element>(bool Function(Element)), deprecated)
     thisOrAncestorMatching3 (method: E? Function<E extends Element>(bool Function(Element)), deprecated)
     thisOrAncestorOfType (method: E? Function<E extends Element>(), deprecated)
@@ -3124,24 +3121,6 @@ package:analyzer/dart/element/element.dart:
   HideElementCombinator (class extends Object implements NamespaceCombinator):
     new (constructor: HideElementCombinator Function())
     hiddenNames (getter: List<String>)
-  LibraryElement (class extends Object implements _ExistingElement, deprecated):
-    new (constructor: LibraryElement Function())
-    enclosingElement3 (getter: Null)
-    exportNamespace (getter: Namespace)
-    featureSet (getter: FeatureSet)
-    identifier (getter: String)
-    importedLibraries (getter: List<LibraryElement>)
-    isDartAsync (getter: bool)
-    isDartCore (getter: bool)
-    isInSdk (getter: bool)
-    languageVersion (getter: LibraryLanguageVersion)
-    library (getter: LibraryElement)
-    name (getter: String)
-    publicNamespace (getter: Namespace)
-    session (getter: AnalysisSession)
-    topLevelElements (getter: Iterable<Element>)
-    typeProvider (getter: TypeProvider)
-    typeSystem (getter: TypeSystem)
   LibraryLanguageVersion (class extends Object):
     new (constructor: LibraryLanguageVersion Function({required Version? override, required Version package}))
     effective (getter: Version)
@@ -3163,7 +3142,6 @@ package:analyzer/dart/element/element.dart:
   _ExistingElement (class extends Object implements Element, deprecated):
     new (constructor: _ExistingElement Function())
     declaration (getter: Element, deprecated)
-    library (getter: LibraryElement, deprecated)
     librarySource (getter: Source)
     source (getter: Source)
 package:analyzer/dart/element/element2.dart:
@@ -4724,7 +4702,6 @@ package:analyzer/src/dart/constant/evaluation.dart:
     new (constructor: ConstantEvaluationTarget Function())
     context (getter: AnalysisContext@2)
     isConstantEvaluated (getter: bool)
-    library (getter: LibraryElement?, deprecated)
     library2 (getter: LibraryElement2?)
 package:analyzer/src/dart/resolver/scope.dart:
   Namespace (class extends Object):

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

@@ -37,19 +37,15 @@
 library;
 
 import 'package:_fe_analyzer_shared/src/base/analyzer_public_api.dart';
-import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
-import 'package:analyzer/dart/element/type_provider.dart';
-import 'package:analyzer/dart/element/type_system.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/source/source.dart';
 import 'package:analyzer/src/dart/constant/evaluation.dart';
 import 'package:analyzer/src/dart/element/element.dart'
     show elementModelDeprecationMsg;
-import 'package:analyzer/src/dart/resolver/scope.dart' show Namespace;
 import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
 // ignore: deprecated_member_use_from_same_package
 import 'package:analyzer/src/task/api/model.dart' show AnalysisTarget;
@@ -65,10 +61,6 @@ abstract class DirectiveUri {}
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class DirectiveUriWithLibrary extends DirectiveUriWithSource {
-  /// The library referenced by the [source].
-  @Deprecated(elementModelDeprecationMsg)
-  LibraryElement get library;
-
   /// The library referenced by the [source].
   LibraryElement2 get library2;
 }
@@ -277,14 +269,6 @@ abstract class Element implements AnalysisTarget {
   /// The kind of element that this is.
   ElementKind get kind;
 
-  /// Library that contains this element.
-  ///
-  /// This will be the element itself if it is a library element. This will be
-  /// `null` if this element is [MultiplyDefinedElement2] that is not contained
-  /// in a library.
-  @Deprecated(elementModelDeprecationMsg)
-  LibraryElement? get library;
-
   /// The location of this element in the element model.
   ///
   /// The object can be used to locate this element at a later time.
@@ -371,17 +355,6 @@ abstract class Element implements AnalysisTarget {
   // TODO(brianwilkerson): Make the parameter optional.
   String getExtendedDisplayName(String? shortName);
 
-  /// Whether the element, assuming that it is within scope, is accessible to
-  /// code in the given [library].
-  ///
-  /// This is defined by the Dart Language Specification in section 6.2:
-  /// <blockquote>
-  /// A declaration <i>m</i> is accessible to a library <i>L</i> if <i>m</i> is
-  /// declared in <i>L</i> or if <i>m</i> is public.
-  /// </blockquote>
-  @Deprecated(elementModelDeprecationMsg)
-  bool isAccessibleIn(LibraryElement library);
-
   /// Returns either this element or the most immediate ancestor of this element
   /// for which the [predicate] returns `true`, or `null` if there is no such
   /// element.
@@ -726,73 +699,6 @@ abstract class HideElementCombinator implements NamespaceCombinator {
   List<String> get hiddenNames;
 }
 
-/// A library.
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Use LibraryElement2 instead')
-abstract class LibraryElement implements _ExistingElement {
-  /// Returns `null`, because libraries are the top-level elements in the model.
-  @override
-  Null get enclosingElement3;
-
-  /// The export [Namespace] of this library.
-  Namespace get exportNamespace;
-
-  /// The set of features available to this library.
-  ///
-  /// Determined by the combination of the language version for the enclosing
-  /// package, enabled experiments, and the presence of a `// @dart` language
-  /// version override comment at the top of the file.
-  FeatureSet get featureSet;
-
-  /// The identifier that uniquely identifies this element among the children
-  /// 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<LibraryElement> get importedLibraries;
-
-  /// Whether the library is the `dart:async` library.
-  bool get isDartAsync;
-
-  /// Whether the library is the `dart:core` library.
-  bool get isDartCore;
-
-  /// Whether the library is part of the SDK.
-  bool get isInSdk;
-
-  /// The language version for this library.
-  LibraryLanguageVersion get languageVersion;
-
-  @override
-  LibraryElement get library;
-
-  /// The name of this library, possibly the empty string if this library does
-  /// not have an explicit name.
-  @override
-  String get name;
-
-  /// The public [Namespace] of this library.
-  Namespace get publicNamespace;
-
-  @override
-  AnalysisSession get session;
-
-  /// The top-level elements defined in each of the compilation units that are
-  /// included in this library. This includes both public and private elements,
-  /// but does not include imports, exports, or synthetic elements.
-  Iterable<Element> get topLevelElements;
-
-  /// The [TypeProvider] that is used in this library.
-  TypeProvider get typeProvider;
-
-  /// The [TypeSystem] that is used in this library.
-  TypeSystem get typeSystem;
-}
-
 class LibraryLanguageVersion {
   /// The version for the whole package that contains this library.
   final Version package;
@@ -869,10 +775,6 @@ abstract class _ExistingElement implements Element {
   @override
   Element get declaration;
 
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  LibraryElement get library;
-
   @override
   Source get librarySource;
 

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -10,7 +10,6 @@ import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
@@ -456,7 +455,7 @@ class ConstantEvaluationEngine {
     if (!constructor.isFactory) {
       return null;
     }
-    var typeProvider = constructor.library.typeProvider;
+    var typeProvider = constructor.library2.typeProvider;
     if (constructor.asElement2.enclosingElement2 ==
         typeProvider.symbolElement2) {
       // The dart:core.Symbol has a const factory constructor that redirects
@@ -532,10 +531,6 @@ abstract class ConstantEvaluationTarget extends AnalysisTarget {
   /// Return whether this constant is evaluated.
   bool get isConstantEvaluated;
 
-  /// The library with this constant.
-  @Deprecated('Use library2 instead')
-  LibraryElement? get library;
-
   /// The library with this constant.
   LibraryElement2? get library2;
 }
@@ -2618,7 +2613,7 @@ class _InstanceCreationEvaluator {
 
   late final ConstantVisitor _initializerVisitor = ConstantVisitor(
     _evaluationEngine,
-    _constructor.library,
+    _constructor.library2,
     _externalErrorReporter,
     lexicalEnvironment: _parameterMap,
     lexicalTypeEnvironment: _typeParameterMap,
@@ -3181,7 +3176,7 @@ class _InstanceCreationEvaluator {
     var superclass = definingType.superclass;
     if (superclass != null && !superclass.isDartCoreObject) {
       var superConstructor = superclass
-          .lookUpConstructor2(superName, _constructor.library)
+          .lookUpConstructor2(superName, _constructor.library2)
           ?.asElement;
       if (superConstructor == null) {
         return null;