Fine. Rename of methods in LibraryManifestBuilder.

So,  that we better reflect what container, and what executable kind
we handle.

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

Author: scheglov

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

@@ -124,71 +124,75 @@ class LibraryManifestBuilder {
       element.typeParameters2,
       (typeParameters) {
         classItem.members.clear();
-        _addStaticExecutables(
+        _addInterfaceElementStaticExecutables(
           encodingContext: encodingContext,
           instanceElement: element,
           interfaceItem: classItem,
         );
-        _addInstanceExecutables(
+        _addInterfaceElementInstanceExecutables(
           encodingContext: encodingContext,
-          element: element,
-          classItem: classItem,
+          interfaceElement: element,
+          interfaceItem: classItem,
         );
       },
     );
   }
 
-  void _addInstanceExecutable({
+  void _addInstanceElementGetter({
     required EncodeContext encodingContext,
-    required ClassItem instanceItem,
-    required Name nameObj,
-    required ExecutableElement2OrMember element,
+    required InstanceItem instanceItem,
+    required GetterElement2OrMember element,
   }) {
-    var lookupName = nameObj.name.asLookupName;
+    var lookupName = element.lookupName?.asLookupName;
+    if (lookupName == null) {
+      return;
+    }
+
+    var item = _getOrBuildElementItem(element, () {
+      return InstanceItemGetterItem.fromElement(
+        name: lookupName,
+        id: ManifestItemId.generate(),
+        context: encodingContext,
+        element: element,
+      );
+    });
+    instanceItem.members[lookupName] = item;
+  }
 
+  void _addInstanceElementInstanceExecutable({
+    required EncodeContext encodingContext,
+    required InstanceItem instanceItem,
+    required ExecutableElement2OrMember element,
+  }) {
     switch (element) {
       case GetterElement2OrMember():
-        _addInstanceGetter(
+        _addInstanceElementGetter(
           encodingContext: encodingContext,
           instanceItem: instanceItem,
           element: element,
-          lookupName: lookupName,
         );
       case MethodElement2OrMember():
-        _addInstanceMethod(
+        _addInstanceElementMethod(
           encodingContext: encodingContext,
           instanceItem: instanceItem,
           element: element,
-          lookupName: lookupName,
         );
       // TODO(scheglov): add setters support
     }
   }
 
-  void _addInstanceExecutables({
+  void _addInstanceElementMethod({
     required EncodeContext encodingContext,
-    required ClassElementImpl2 element,
-    required ClassItem classItem,
+    required InstanceItem instanceItem,
+    required MethodElement2OrMember element,
   }) {
-    var map = element.inheritanceManager.getInterface2(element).map2;
-    for (var entry in map.entries) {
-      _addInstanceExecutable(
-        encodingContext: encodingContext,
-        instanceItem: classItem,
-        nameObj: entry.key,
-        element: entry.value,
-      );
+    var lookupName = element.lookupName?.asLookupName;
+    if (lookupName == null) {
+      return;
     }
-  }
 
-  void _addInstanceGetter({
-    required EncodeContext encodingContext,
-    required ClassItem instanceItem,
-    required GetterElement2OrMember element,
-    required LookupName lookupName,
-  }) {
     var item = _getOrBuildElementItem(element, () {
-      return InstanceItemGetterItem.fromElement(
+      return InstanceItemMethodItem.fromElement(
         name: lookupName,
         id: ManifestItemId.generate(),
         context: encodingContext,
@@ -198,29 +202,42 @@ class LibraryManifestBuilder {
     instanceItem.members[lookupName] = item;
   }
 
-  void _addInstanceMethod({
+  void _addInstanceElementStaticExecutables({
     required EncodeContext encodingContext,
-    required ClassItem instanceItem,
-    required MethodElement2OrMember element,
-    required LookupName lookupName,
+    required InstanceElementImpl2 instanceElement,
+    required InstanceItem instanceItem,
   }) {
-    var item = _getOrBuildElementItem(element, () {
-      return InstanceItemMethodItem.fromElement(
-        name: lookupName,
-        id: ManifestItemId.generate(),
-        context: encodingContext,
-        element: element,
-      );
-    });
-    instanceItem.members[lookupName] = item;
+    for (var getter in instanceElement.getters2) {
+      if (getter.isStatic) {
+        _addInstanceElementGetter(
+          encodingContext: encodingContext,
+          instanceItem: instanceItem,
+          element: getter,
+        );
+      }
+    }
+
+    for (var method in instanceElement.methods2) {
+      if (method.isStatic) {
+        _addInstanceElementMethod(
+          encodingContext: encodingContext,
+          instanceItem: instanceItem,
+          element: method,
+        );
+      }
+    }
   }
 
-  void _addInterfaceConstructor({
+  void _addInterfaceElementConstructor({
     required EncodeContext encodingContext,
-    required ClassItem interfaceItem,
+    required InterfaceItem interfaceItem,
     required ConstructorElementImpl2 element,
-    required LookupName lookupName,
   }) {
+    var lookupName = element.lookupName?.asLookupName;
+    if (lookupName == null) {
+      return;
+    }
+
     var item = _getOrBuildElementItem(element, () {
       return InterfaceItemConstructorItem.fromElement(
         name: lookupName,
@@ -232,6 +249,42 @@ class LibraryManifestBuilder {
     interfaceItem.members[lookupName] = item;
   }
 
+  void _addInterfaceElementInstanceExecutables({
+    required EncodeContext encodingContext,
+    required InterfaceElementImpl2 interfaceElement,
+    required InterfaceItem interfaceItem,
+  }) {
+    var inheritance = interfaceElement.inheritanceManager;
+    var map = inheritance.getInterface2(interfaceElement).map2;
+    for (var entry in map.entries) {
+      _addInstanceElementInstanceExecutable(
+        encodingContext: encodingContext,
+        instanceItem: interfaceItem,
+        element: entry.value,
+      );
+    }
+  }
+
+  void _addInterfaceElementStaticExecutables({
+    required EncodeContext encodingContext,
+    required InterfaceElementImpl2 instanceElement,
+    required InterfaceItem interfaceItem,
+  }) {
+    for (var constructor in instanceElement.constructors2) {
+      _addInterfaceElementConstructor(
+        encodingContext: encodingContext,
+        interfaceItem: interfaceItem,
+        element: constructor,
+      );
+    }
+
+    _addInstanceElementStaticExecutables(
+      encodingContext: encodingContext,
+      instanceElement: instanceElement,
+      instanceItem: interfaceItem,
+    );
+  }
+
   void _addReExports() {
     for (var libraryElement in libraryElements) {
       var libraryUri = libraryElement.uri;
@@ -267,54 +320,6 @@ class LibraryManifestBuilder {
     }
   }
 
-  void _addStaticExecutables({
-    required EncodeContext encodingContext,
-    required InstanceElementImpl2 instanceElement,
-    required ClassItem interfaceItem,
-  }) {
-    if (instanceElement is InterfaceElementImpl2) {
-      for (var constructor in instanceElement.constructors2) {
-        var lookupName = constructor.name3?.asLookupName;
-        if (lookupName != null) {
-          _addInterfaceConstructor(
-            encodingContext: encodingContext,
-            interfaceItem: interfaceItem,
-            element: constructor,
-            lookupName: lookupName,
-          );
-        }
-      }
-    }
-
-    for (var getter in instanceElement.getters2) {
-      if (getter.isStatic) {
-        var lookupName = getter.name3?.asLookupName;
-        if (lookupName != null) {
-          _addInstanceGetter(
-            encodingContext: encodingContext,
-            instanceItem: interfaceItem,
-            element: getter,
-            lookupName: lookupName,
-          );
-        }
-      }
-    }
-
-    for (var method in instanceElement.methods2) {
-      if (method.isStatic) {
-        var lookupName = method.name3?.asLookupName;
-        if (lookupName != null) {
-          _addInstanceMethod(
-            encodingContext: encodingContext,
-            instanceItem: interfaceItem,
-            element: method,
-            lookupName: lookupName,
-          );
-        }
-      }
-    }
-  }
-
   void _addTopLevelFunction({
     required EncodeContext encodingContext,
     required Map<LookupName, TopLevelItem> newItems,