Elements. Remove the type parameter from thisOrAncestorMatching2().

It was only used for unconditional cast.

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

Author: scheglov

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

@@ -447,7 +447,7 @@ abstract class Element2 {
   /// for which the [predicate] returns `true`.
   ///
   /// Returns `null` if there is no such element.
-  E? thisOrAncestorMatching2<E extends Element2>(
+  Element2? thisOrAncestorMatching2(
     bool Function(Element2) predicate,
   );
 

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

@@ -3038,14 +3038,14 @@ abstract class ElementImpl implements Element, Element2 {
   }
 
   @override
-  E? thisOrAncestorMatching2<E extends Element2>(
+  Element2? thisOrAncestorMatching2(
     bool Function(Element2) predicate,
   ) {
     Element2? element = this;
     while (element != null && !predicate(element)) {
       element = element.enclosingElement2;
     }
-    return element as E?;
+    return element;
   }
 
   @override
@@ -3224,13 +3224,12 @@ abstract class ElementImpl2 implements Element2 {
   }
 
   @override
-  E? thisOrAncestorMatching2<E extends Element2>(
-      bool Function(Element2 p1) predicate) {
+  Element2? thisOrAncestorMatching2(bool Function(Element2 p1) predicate) {
     Element2? element = this;
     while (element != null && !predicate(element)) {
       element = element.enclosingElement2;
     }
-    return element as E?;
+    return element;
   }
 
   @override
@@ -7138,11 +7137,11 @@ mixin MaybeAugmentedInstanceElementMixin
   }
 
   @override
-  E? thisOrAncestorMatching2<E extends Element2>(
+  Element2? thisOrAncestorMatching2(
     bool Function(Element2) predicate,
   ) {
     if (predicate(this)) {
-      return this as E;
+      return this;
     }
     return library2.thisOrAncestorMatching2(predicate);
   }
@@ -8347,7 +8346,7 @@ class MultiplyDefinedElementImpl implements MultiplyDefinedElement, Element2 {
   }
 
   @override
-  E? thisOrAncestorMatching2<E extends Element2>(
+  Element2? thisOrAncestorMatching2(
     bool Function(Element2 p1) predicate,
   ) {
     return null;

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

@@ -333,8 +333,7 @@ abstract class ExecutableMember extends Member
       _element2.isAccessibleIn2(library);
 
   @override
-  E? thisOrAncestorMatching2<E extends Element2>(
-          bool Function(Element2 p1) predicate) =>
+  Element2? thisOrAncestorMatching2(bool Function(Element2 p1) predicate) =>
       _element2.thisOrAncestorMatching2(predicate);
 
   @override
@@ -610,8 +609,7 @@ class FieldMember extends VariableMember
   }
 
   @override
-  E? thisOrAncestorMatching2<E extends Element2>(
-      bool Function(Element2 e) predicate) {
+  Element2? thisOrAncestorMatching2(bool Function(Element2 e) predicate) {
     return _element2.thisOrAncestorMatching2(predicate);
   }