Fine. Separate requestedXyz in test expectations.

This was initially in https://dart-review.googlesource.com/c/sdk/+/428562,
but partially reverted to ease review of test expectations.

Change-Id: Ib13936042b7a24a33aec22846b1d01999016481a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429120
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>

Author: scheglov

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

@@ -135,13 +135,7 @@ class LibraryManifestBuilder {
     encodingContext.withTypeParameters(element.typeParameters2, (
       typeParameters,
     ) {
-      classItem.declaredConflicts.clear();
-      // classItem.declaredFields.clear(); // TODO(scheglov): restore
-      classItem.declaredGetters.clear();
-      classItem.declaredSetters.clear();
-      classItem.declaredMethods.clear();
-      classItem.declaredConstructors.clear();
-      classItem.inheritedConstructors.clear();
+      classItem.beforeUpdatingMembers();
       _addInterfaceElementMembers(
         encodingContext: encodingContext,
         instanceElement: element,
@@ -396,13 +390,7 @@ class LibraryManifestBuilder {
     encodingContext.withTypeParameters(element.typeParameters2, (
       typeParameters,
     ) {
-      mixinItem.declaredConflicts.clear();
-      // mixinItem.declaredFields.clear(); // TODO(scheglov): restore
-      mixinItem.declaredGetters.clear();
-      mixinItem.declaredSetters.clear();
-      mixinItem.declaredMethods.clear();
-      mixinItem.declaredConstructors.clear();
-      mixinItem.inheritedConstructors.clear();
+      mixinItem.beforeUpdatingMembers();
       _addInterfaceElementMembers(
         encodingContext: encodingContext,
         instanceElement: element,

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

@@ -241,6 +241,16 @@ sealed class InstanceItem<E extends InstanceElementImpl2>
     inheritedConstructors[lookupName] = id;
   }
 
+  void beforeUpdatingMembers() {
+    declaredConflicts.clear();
+    declaredFields.clear();
+    declaredGetters.clear();
+    declaredSetters.clear();
+    declaredMethods.clear();
+    declaredConstructors.clear();
+    inheritedConstructors.clear();
+  }
+
   ManifestItemId? getConstructorId(LookupName name) {
     return declaredConstructors[name]?.id ??
         inheritedConstructors[name] ??