Fine. Use shard ManifestItem.match()

As discussed in https://dart-review.googlesource.com/c/sdk/+/420461,
this allows having single code to match metadata.

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

Author: scheglov

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

@@ -64,6 +64,11 @@ This is part of the old analyzer element model. Please see
 https://github.com/dart-lang/sdk/blob/main/pkg/analyzer/doc/element_model_migration_guide.md
 for information about how to migrate to the new element model.''';
 
+abstract class AnnotatableElement implements Element2, Annotatable {
+  @override
+  MetadataImpl get metadata2;
+}
+
 @Deprecated('This is an internal class, do not use it')
 // TODO(scheglov): remove it when DartDoc stops using it
 // https://github.com/dart-lang/dartdoc/issues/4015
@@ -3605,16 +3610,14 @@ class EnumElementImpl2 extends InterfaceElementImpl2 implements EnumElement2 {
 
 /// Common base class for all analyzer-internal classes that implement
 /// `ExecutableElement2`.
-abstract class ExecutableElement2OrMember implements ExecutableElement2 {
+abstract class ExecutableElement2OrMember
+    implements ExecutableElement2, AnnotatableElement {
   @override
   ExecutableElementImpl2 get baseElement;
 
   @override
   List<FormalParameterElementMixin> get formalParameters;
 
-  @override
-  MetadataImpl get metadata2;
-
   @override
   TypeImpl get returnType;
 
@@ -5724,7 +5727,7 @@ abstract class InstanceElementImpl extends _ExistingElementImpl
 }
 
 abstract class InstanceElementImpl2 extends ElementImpl2
-    implements InstanceElement2, TypeParameterizedElement2 {
+    implements InstanceElement2, TypeParameterizedElement2, AnnotatableElement {
   @override
   InstanceElement2 get baseElement => this;
 

pkg/analyzer/lib/src/fine/library_manifest.dart

@@ -642,8 +642,8 @@ class _LibraryMatch {
       return false;
     }
 
-    var matchContext = item.match(element);
-    if (matchContext == null) {
+    var matchContext = MatchContext(parent: null);
+    if (!item.match(matchContext, element)) {
       return false;
     }
 
@@ -685,8 +685,8 @@ class _LibraryMatch {
           return false;
         }
 
-        var matchContext = item.match(interfaceMatchContext, executable);
-        if (matchContext == null) {
+        var matchContext = MatchContext(parent: interfaceMatchContext);
+        if (!item.match(matchContext, executable)) {
           return false;
         }
 
@@ -699,8 +699,8 @@ class _LibraryMatch {
           return false;
         }
 
-        var matchContext = item.match(interfaceMatchContext, executable);
-        if (matchContext == null) {
+        var matchContext = MatchContext(parent: interfaceMatchContext);
+        if (!item.match(matchContext, executable)) {
           return false;
         }
 
@@ -752,8 +752,8 @@ class _LibraryMatch {
       return false;
     }
 
-    var matchContext = item.match(interfaceMatchContext, element);
-    if (matchContext == null) {
+    var matchContext = MatchContext(parent: interfaceMatchContext);
+    if (!item.match(matchContext, element)) {
       return false;
     }
 
@@ -828,8 +828,8 @@ class _LibraryMatch {
       return false;
     }
 
-    var matchContext = item.match(element);
-    if (matchContext == null) {
+    var matchContext = MatchContext(parent: null);
+    if (!item.match(matchContext, element)) {
       return false;
     }
 
@@ -849,8 +849,8 @@ class _LibraryMatch {
       return false;
     }
 
-    var matchContext = item.match(element);
-    if (matchContext == null) {
+    var matchContext = MatchContext(parent: null);
+    if (!item.match(matchContext, element)) {
       return false;
     }
 
@@ -869,8 +869,8 @@ class _LibraryMatch {
       return false;
     }
 
-    var matchContext = item.match(element);
-    if (matchContext == null) {
+    var matchContext = MatchContext(parent: null);
+    if (!item.match(matchContext, element)) {
       return false;
     }