Fine. Use ExecutableElementImpl2 for items.

Now that we store inherited members as IDs, not as items, we create
items only for Impl(s).

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

Author: scheglov

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

@@ -193,7 +193,7 @@ class LibraryManifestBuilder {
   void _addInstanceElementGetter({
     required EncodeContext encodingContext,
     required InstanceItem instanceItem,
-    required GetterElement2OrMember element,
+    required GetterElementImpl element,
   }) {
     var lookupName = element.lookupName?.asLookupName;
     if (lookupName == null) {
@@ -213,22 +213,22 @@ class LibraryManifestBuilder {
   void _addInstanceElementInstanceExecutable({
     required EncodeContext encodingContext,
     required InstanceItem instanceItem,
-    required ExecutableElement2OrMember element,
+    required ExecutableElementImpl2 element,
   }) {
     switch (element) {
-      case GetterElement2OrMember():
+      case GetterElementImpl():
         _addInstanceElementGetter(
           encodingContext: encodingContext,
           instanceItem: instanceItem,
           element: element,
         );
-      case MethodElement2OrMember():
+      case MethodElementImpl2():
         _addInstanceElementMethod(
           encodingContext: encodingContext,
           instanceItem: instanceItem,
           element: element,
         );
-      case SetterElement2OrMember():
+      case SetterElementImpl():
         _addInstanceElementSetter(
           encodingContext: encodingContext,
           instanceItem: instanceItem,
@@ -240,7 +240,7 @@ class LibraryManifestBuilder {
   void _addInstanceElementMethod({
     required EncodeContext encodingContext,
     required InstanceItem instanceItem,
-    required MethodElement2OrMember element,
+    required MethodElementImpl2 element,
   }) {
     var lookupName = element.lookupName?.asLookupName;
     if (lookupName == null) {
@@ -260,7 +260,7 @@ class LibraryManifestBuilder {
   void _addInstanceElementSetter({
     required EncodeContext encodingContext,
     required InstanceItem instanceItem,
-    required SetterElement2OrMember element,
+    required SetterElementImpl element,
   }) {
     var lookupName = element.lookupName?.asLookupName;
     if (lookupName == null) {
@@ -763,12 +763,12 @@ class _LibraryMatch {
     required MatchContext interfaceMatchContext,
     required Map<LookupName, InstanceItemMemberItem> members,
     required LookupName lookupName,
-    required ExecutableElement2 executable,
+    required ExecutableElementImpl2 executable,
   }) {
     var item = members[lookupName];
 
     switch (executable) {
-      case GetterElement2OrMember():
+      case GetterElementImpl():
         if (item is! InstanceItemGetterItem) {
           return false;
         }
@@ -782,7 +782,7 @@ class _LibraryMatch {
         refElementsMap[executable] = matchContext.elementList;
         refExternalIds.addAll(matchContext.externalIds);
         return true;
-      case MethodElement2OrMember():
+      case MethodElementImpl2():
         if (item is! InstanceItemMethodItem) {
           return false;
         }
@@ -796,7 +796,7 @@ class _LibraryMatch {
         refElementsMap[executable] = matchContext.elementList;
         refExternalIds.addAll(matchContext.externalIds);
         return true;
-      case SetterElement2OrMember():
+      case SetterElementImpl():
         if (item is! InstanceItemSetterItem) {
           return false;
         }
@@ -810,10 +810,10 @@ class _LibraryMatch {
         refElementsMap[executable] = matchContext.elementList;
         refExternalIds.addAll(matchContext.externalIds);
         return true;
+      default:
+        // SAFETY: the cases above handle all expected executables.
+        throw StateError('(${executable.runtimeType}) $executable');
     }
-
-    // TODO(scheglov): fix it
-    throw UnimplementedError('(${executable.runtimeType}) $executable');
   }
 
   void _matchInstanceExecutables({

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

@@ -120,9 +120,8 @@ class InstanceItemGetterItem extends InstanceItemMemberItem {
   factory InstanceItemGetterItem.fromElement({
     required ManifestItemId id,
     required EncodeContext context,
-    required GetterElement2OrMember element,
+    required GetterElementImpl element,
   }) {
-    element as GetterElementImpl; // TODO(scheglov): remove it
     return InstanceItemGetterItem(
       id: id,
       metadata: ManifestMetadata.encode(
@@ -148,9 +147,8 @@ class InstanceItemGetterItem extends InstanceItemMemberItem {
   @override
   bool match(
     MatchContext context,
-    covariant GetterElement2OrMember element,
+    covariant GetterElementImpl element,
   ) {
-    element as GetterElementImpl; // TODO(scheglov): remove it
     return super.match(context, element) &&
         returnType.match(context, element.returnType) &&
         constInitializer.match(context, element.constInitializer);
@@ -191,7 +189,7 @@ sealed class InstanceItemMemberItem extends ManifestItem {
   @override
   bool match(
     MatchContext context,
-    covariant ExecutableElement2OrMember element,
+    covariant ExecutableElementImpl2 element,
   ) {
     return super.match(context, element) && element.isStatic == isStatic;
   }
@@ -216,7 +214,7 @@ class InstanceItemMethodItem extends InstanceItemMemberItem {
   factory InstanceItemMethodItem.fromElement({
     required ManifestItemId id,
     required EncodeContext context,
-    required MethodElement2OrMember element,
+    required MethodElementImpl2 element,
   }) {
     return InstanceItemMethodItem(
       id: id,
@@ -238,7 +236,7 @@ class InstanceItemMethodItem extends InstanceItemMemberItem {
   @override
   bool match(
     MatchContext context,
-    covariant MethodElement2OrMember element,
+    covariant MethodElementImpl2 element,
   ) {
     return super.match(context, element) &&
         functionType.match(context, element.type);
@@ -265,7 +263,7 @@ class InstanceItemSetterItem extends InstanceItemMemberItem {
   factory InstanceItemSetterItem.fromElement({
     required ManifestItemId id,
     required EncodeContext context,
-    required SetterElement2OrMember element,
+    required SetterElementImpl element,
   }) {
     return InstanceItemSetterItem(
       id: id,
@@ -290,7 +288,7 @@ class InstanceItemSetterItem extends InstanceItemMemberItem {
   @override
   bool match(
     MatchContext context,
-    covariant SetterElement2OrMember element,
+    covariant SetterElementImpl element,
   ) {
     return super.match(context, element) &&
         valueType.match(context, element.formalParameters[0].type);