Fine. Rename recording methods in RequirementsManifest.

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

Author: scheglov

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

@@ -5083,7 +5083,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
 
   @override
   ConstructorElementImpl2? getNamedConstructor2(String name) {
-    globalResultRequirements?.notify_interfaceElement_getNamedConstructor(
+    globalResultRequirements?.record_interfaceElement_getNamedConstructor(
       element: this,
       name: name,
     );

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

@@ -353,7 +353,7 @@ class InheritanceManager3 {
     }
 
     var result = interface.map[name];
-    globalResultRequirements?.notifyInterfaceRequest(
+    globalResultRequirements?.record_interface_getMember(
       element: element.asElement2,
       nameObj: name,
       methodElement: result?.asElement2,

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

@@ -563,12 +563,10 @@ class PrefixScope implements Scope {
     }
 
     if (globalResultRequirements case var resultRequirements?) {
-      for (var importedLibrary in _importedLibraries) {
-        resultRequirements.notifyRequest(
-          importedLibrary: importedLibrary,
-          nameStr: id,
-        );
-      }
+      resultRequirements.record_importPrefixScope_lookup(
+        importedLibraries: _importedLibraries,
+        id: id,
+      );
     }
 
     var getter = _getters[id];

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

@@ -4,7 +4,6 @@
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/element.dart';
-import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/dart/resolver/scope.dart';
 import 'package:analyzer/src/fine/library_manifest.dart';
 import 'package:analyzer/src/fine/lookup_name.dart';
@@ -564,77 +563,6 @@ class RequirementsManifest {
     return null;
   }
 
-  void notify_interfaceElement_getNamedConstructor({
-    required InterfaceElementImpl2 element,
-    required String name,
-  }) {
-    var itemRequirements = _getInterfaceItem(element);
-    if (itemRequirements == null) {
-      return;
-    }
-
-    var item = itemRequirements.item;
-    var requirements = itemRequirements.requirements;
-
-    var constructorName = name.asLookupName;
-    var constructorId = item.getConstructorId(constructorName);
-    requirements.constructors[constructorName] = constructorId;
-  }
-
-  /// This method is invoked by [InheritanceManager3] to notify the collector
-  /// that a member with [nameObj] was requested from the [element].
-  void notifyInterfaceRequest({
-    required InterfaceElementImpl2 element,
-    required Name nameObj,
-    required ExecutableElement? methodElement,
-  }) {
-    // Skip private names, cannot be used outside this library.
-    if (!nameObj.isPublic) {
-      return;
-    }
-
-    var itemRequirements = _getInterfaceItem(element);
-    if (itemRequirements == null) {
-      return;
-    }
-
-    var item = itemRequirements.item;
-    var requirements = itemRequirements.requirements;
-
-    var methodName = nameObj.name.asLookupName;
-    var methodId = item.getInterfaceMethodId(methodName);
-    requirements.methods[methodName] = methodId;
-
-    // Check for consistency between the actual interface and manifest.
-    if (methodElement != null) {
-      if (methodId == null) {
-        var qName = _qualifiedMethodName(element, methodName);
-        throw StateError('Expected ID for $qName');
-      }
-    } else {
-      if (methodId != null) {
-        var qName = _qualifiedMethodName(element, methodName);
-        throw StateError('Expected no ID for $qName');
-      }
-    }
-
-    requirements.methods[methodName] = methodId;
-  }
-
-  /// This method is invoked by an import scope to notify the collector that
-  /// the name [nameStr] was requested from [importedLibrary].
-  void notifyRequest({
-    required LibraryElementImpl importedLibrary,
-    required String nameStr,
-  }) {
-    if (importedLibrary.manifest case var manifest?) {
-      var uri = importedLibrary.uri;
-      var nameToId = topLevels[uri] ??= {};
-      var name = nameStr.asLookupName;
-      nameToId[name] = manifest.getExportedId(name);
-    }
-  }
-
   void record_classElement_allSubtypes({required ClassElementImpl2 element}) {
     // TODO(scheglov): implement.
   }
@@ -653,6 +581,22 @@ class RequirementsManifest {
     // TODO(scheglov): implement.
   }
 
+  /// Record that [id] was looked up in the import prefix scope that
+  /// imports [importedLibraries].
+  void record_importPrefixScope_lookup({
+    required List<LibraryElementImpl> importedLibraries,
+    required String id,
+  }) {
+    var lookupName = id.asLookupName;
+    for (var importedLibrary in importedLibraries) {
+      if (importedLibrary.manifest case var manifest?) {
+        var uri = importedLibrary.uri;
+        var nameToId = topLevels[uri] ??= {};
+        nameToId[lookupName] = manifest.getExportedId(lookupName);
+      }
+    }
+  }
+
   void record_instanceElement_getField({
     required InstanceElementImpl2 element,
     required String name,
@@ -722,6 +666,61 @@ class RequirementsManifest {
     requirements.requestedSetters[methodName] = methodId;
   }
 
+  /// Record that a member with [nameObj] was requested from the interface
+  /// of [element]. The [methodElement] is used for consistency checking.
+  void record_interface_getMember({
+    required InterfaceElementImpl2 element,
+    required Name nameObj,
+    required ExecutableElement? methodElement,
+  }) {
+    // Skip private names, cannot be used outside this library.
+    if (!nameObj.isPublic) {
+      return;
+    }
+
+    var itemRequirements = _getInterfaceItem(element);
+    if (itemRequirements == null) {
+      return;
+    }
+
+    var item = itemRequirements.item;
+    var requirements = itemRequirements.requirements;
+
+    var methodName = nameObj.name.asLookupName;
+    var methodId = item.getInterfaceMethodId(methodName);
+    requirements.methods[methodName] = methodId;
+
+    // Check for consistency between the actual interface and manifest.
+    if (methodElement != null) {
+      if (methodId == null) {
+        var qName = _qualifiedMethodName(element, methodName);
+        throw StateError('Expected ID for $qName');
+      }
+    } else {
+      if (methodId != null) {
+        var qName = _qualifiedMethodName(element, methodName);
+        throw StateError('Expected no ID for $qName');
+      }
+    }
+  }
+
+  void record_interfaceElement_getNamedConstructor({
+    required InterfaceElementImpl2 element,
+    required String name,
+  }) {
+    var itemRequirements = _getInterfaceItem(element);
+    if (itemRequirements == null) {
+      return;
+    }
+
+    var item = itemRequirements.item;
+    var requirements = itemRequirements.requirements;
+
+    var constructorName = name.asLookupName;
+    var constructorId = item.getConstructorId(constructorName);
+    requirements.constructors[constructorName] = constructorId;
+  }
+
   void record_propertyAccessorElement_variable({
     required PropertyAccessorElementImpl2 element,
     required String? name,