Elements. Remove V1 Element.thisOrAncestorMatchingX() methods.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -3031,10 +3031,6 @@ package:analyzer/dart/element/element.dart:
     source (getter: Source?)
     getDisplayString (method: String Function({bool multiline, bool withNullability}))
     getExtendedDisplayName (method: String Function(String?))
-    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)
-    thisOrAncestorOfType3 (method: E? Function<E extends Element>(), deprecated)
   ElementAnnotation (class extends Object implements ConstantEvaluationTarget):
     new (constructor: ElementAnnotation Function())
     constantEvaluationErrors (getter: List<AnalysisError>?)

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

@@ -353,32 +353,6 @@ abstract class Element implements AnalysisTarget {
   /// the provided name will be used.
   // TODO(brianwilkerson): Make the parameter optional.
   String getExtendedDisplayName(String? shortName);
-
-  /// 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.
-  @Deprecated('Use Element2.thisOrAncestorMatching2() instead')
-  E? thisOrAncestorMatching<E extends Element>(
-    bool Function(Element) predicate,
-  );
-
-  /// 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.
-  @Deprecated('Use Element2.thisOrAncestorMatching2() instead')
-  E? thisOrAncestorMatching3<E extends Element>(
-    bool Function(Element) predicate,
-  );
-
-  /// Returns either this element or the most immediate ancestor of this element
-  /// that has the given type, or `null` if there is no such element.
-  @Deprecated('Use Element2.thisOrAncestorMatching2() instead')
-  E? thisOrAncestorOfType<E extends Element>();
-
-  /// Returns either this element or the most immediate ancestor of this element
-  /// that has the given type, or `null` if there is no such element.
-  @Deprecated('Use Element2.thisOrAncestorMatching2() instead')
-  E? thisOrAncestorOfType3<E extends Element>();
 }
 
 /// A single annotation associated with an element.

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

@@ -1909,6 +1909,9 @@ class DynamicElementImpl extends ElementImpl implements TypeDefiningFragment {
   @override
   ElementKind get kind => ElementKind.DYNAMIC;
 
+  @override
+  Null get library => null;
+
   @override
   Null get libraryFragment => null;
 
@@ -2834,10 +2837,7 @@ abstract class ElementImpl
     setModifier(Modifier.SYNTHETIC, isSynthetic);
   }
 
-  LibraryElementImpl? get library {
-    // ignore:deprecated_member_use_from_same_package
-    return thisOrAncestorOfType();
-  }
+  LibraryElementImpl? get library;
 
   @override
   Source? get librarySource => library?.source;
@@ -2965,61 +2965,6 @@ abstract class ElementImpl
     _modifiers = _modifiers.updated(modifier, value);
   }
 
-  @Deprecated('Use Element2.thisOrAncestorMatching2() instead')
-  @override
-  E? thisOrAncestorMatching<E extends Element>(
-    bool Function(Element) predicate,
-  ) {
-    Element? element = this;
-    while (element != null && !predicate(element)) {
-      element = element.enclosingElement3;
-    }
-    return element as E?;
-  }
-
-  @Deprecated('Use Element2.thisOrAncestorMatching2() instead')
-  @override
-  E? thisOrAncestorMatching3<E extends Element>(
-    bool Function(Element) predicate,
-  ) {
-    Element? element = this;
-    while (element != null && !predicate(element)) {
-      element = (element as ElementImpl).enclosingElement3;
-    }
-    return element as E?;
-  }
-
-  @Deprecated('Use Element2.thisOrAncestorOfType2() instead')
-  @override
-  E? thisOrAncestorOfType<E extends Element>() {
-    if (E == LibraryElementImpl) {
-      if (enclosingElement3 case LibraryElementImpl library) {
-        return library as E;
-      }
-      return thisOrAncestorOfType<CompilationUnitElementImpl>()?.library as E?;
-    }
-
-    Element element = this;
-    while (element is! E) {
-      var ancestor = element.enclosingElement3;
-      if (ancestor == null) return null;
-      element = ancestor;
-    }
-    return element;
-  }
-
-  @Deprecated('Use Element2.thisOrAncestorOfType2() instead')
-  @override
-  E? thisOrAncestorOfType3<E extends Element>() {
-    Element element = this;
-    while (element is! E) {
-      var ancestor = element.enclosingElement3;
-      if (ancestor == null) return null;
-      element = ancestor;
-    }
-    return element;
-  }
-
   @override
   String toString() {
     return getDisplayString();
@@ -6420,7 +6365,7 @@ class LabelElementImpl extends ElementImpl implements LabelFragment {
 
   @override
   LibraryElementImpl get library {
-    return super.library!;
+    return libraryFragment.element;
   }
 
   @override
@@ -8331,6 +8276,9 @@ class NeverElementImpl extends ElementImpl implements TypeDefiningFragment {
   @override
   ElementKind get kind => ElementKind.NEVER;
 
+  @override
+  Null get library => null;
+
   @override
   Null get libraryFragment => null;
 
@@ -8570,6 +8518,12 @@ class ParameterElementImpl extends VariableElementImpl
   @override
   ElementKind get kind => ElementKind.PARAMETER;
 
+  @override
+  LibraryElementImpl? get library {
+    var library = libraryFragment?.element;
+    return library as LibraryElementImpl?;
+  }
+
   @override
   LibraryElementImpl? get library2 => library;
 
@@ -8937,6 +8891,9 @@ class PrefixElementImpl extends ElementImpl {
 
   @override
   ElementKind get kind => ElementKind.PREFIX;
+
+  @override
+  Null get library => null;
 }
 
 class PrefixElementImpl2 extends ElementImpl2 implements PrefixElement2 {
@@ -10561,6 +10518,12 @@ class TypeParameterElementImpl extends ElementImpl
   @override
   ElementKind get kind => ElementKind.TYPE_PARAMETER;
 
+  @override
+  LibraryElementImpl? get library {
+    var library = libraryFragment?.element;
+    return library as LibraryElementImpl?;
+  }
+
   @override
   LibraryFragment? get libraryFragment {
     return enclosingFragment?.libraryFragment;

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

@@ -922,32 +922,6 @@ abstract class Member
     );
   }
 
-  @Deprecated('Use Element2.thisOrAncestorMatching2() instead')
-  @override
-  E? thisOrAncestorMatching<E extends Element>(
-    bool Function(Element) predicate,
-  ) {
-    return declaration.thisOrAncestorMatching(predicate);
-  }
-
-  @Deprecated('Use Element2.thisOrAncestorMatching2() instead')
-  @override
-  E? thisOrAncestorMatching3<E extends Element>(
-    bool Function(Element) predicate,
-  ) {
-    return declaration.thisOrAncestorMatching3(predicate);
-  }
-
-  @Deprecated('Use Element2.thisOrAncestorOfType2() instead')
-  @override
-  E? thisOrAncestorOfType<E extends Element>() =>
-      declaration.thisOrAncestorOfType<E>();
-
-  @Deprecated('Use Element2.thisOrAncestorOfType2() instead')
-  @override
-  E? thisOrAncestorOfType3<E extends Element>() =>
-      declaration.thisOrAncestorOfType3<E>();
-
   @override
   String toString() {
     return getDisplayString();