Fine. Simplify reporting dependency failures.

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

Author: scheglov

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

@@ -46,14 +46,12 @@ final class ExportLibraryMissing extends ExportFailure {
   });
 }
 
-sealed class InstanceMemberFailure extends RequirementFailure {}
-
-class InstanceMemberIdMismatch extends InstanceMemberFailure {
+class InstanceMemberIdMismatch extends RequirementFailure {
   final Uri libraryUri;
   final LookupName interfaceName;
   final LookupName memberName;
   final ManifestItemId? expectedId;
-  final ManifestItemId actualId;
+  final ManifestItemId? actualId;
 
   InstanceMemberIdMismatch({
     required this.libraryUri,
@@ -64,10 +62,6 @@ class InstanceMemberIdMismatch extends InstanceMemberFailure {
   });
 }
 
-class InstanceMemberMissing extends InstanceMemberFailure {}
-
-class InstanceMemberPresent extends InstanceMemberFailure {}
-
 class LibraryMissing extends RequirementFailure {
   final Uri uri;
 
@@ -80,45 +74,29 @@ sealed class RequirementFailure {}
 
 sealed class TopLevelFailure extends RequirementFailure {
   final Uri libraryUri;
+  final LookupName name;
 
   TopLevelFailure({
     required this.libraryUri,
+    required this.name,
   });
 }
 
 class TopLevelIdMismatch extends TopLevelFailure {
-  final LookupName name;
   final ManifestItemId? expectedId;
-  final ManifestItemId actualId;
+  final ManifestItemId? actualId;
 
   TopLevelIdMismatch({
     required super.libraryUri,
-    required this.name,
+    required super.name,
     required this.expectedId,
     required this.actualId,
   });
 }
 
-class TopLevelMissing extends TopLevelFailure {
-  final LookupName name;
-
-  TopLevelMissing({
-    required super.libraryUri,
-    required this.name,
-  });
-}
-
 class TopLevelNotClass extends TopLevelFailure {
   TopLevelNotClass({
     required super.libraryUri,
-  });
-}
-
-class TopLevelPresent extends TopLevelFailure {
-  final LookupName name;
-
-  TopLevelPresent({
-    required super.libraryUri,
-    required this.name,
+    required super.name,
   });
 }

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

@@ -106,28 +106,13 @@ class BundleRequirementsManifest {
       for (var topLevelEntry in libraryEntry.value.entries) {
         var name = topLevelEntry.key;
         var item = libraryManifest.items[name];
-        if (topLevelEntry.value == null) {
-          if (item != null) {
-            return TopLevelPresent(
-              libraryUri: libraryUri,
-              name: name,
-            );
-          }
-        } else {
-          if (item == null) {
-            return TopLevelMissing(
-              libraryUri: libraryUri,
-              name: name,
-            );
-          }
-          if (item.id != topLevelEntry.value) {
-            return TopLevelIdMismatch(
-              libraryUri: libraryUri,
-              name: name,
-              expectedId: topLevelEntry.value,
-              actualId: item.id,
-            );
-          }
+        if (topLevelEntry.value != item?.id) {
+          return TopLevelIdMismatch(
+            libraryUri: libraryUri,
+            name: name,
+            expectedId: topLevelEntry.value,
+            actualId: item?.id,
+          );
         }
       }
     }
@@ -147,31 +132,22 @@ class BundleRequirementsManifest {
         if (interfaceItem is! ClassItem) {
           return TopLevelNotClass(
             libraryUri: libraryUri,
+            name: interfaceName,
           );
         }
 
         for (var memberEntry in interfaceEntry.value.entries) {
           var memberName = memberEntry.key;
           var memberItem = interfaceItem.members[memberName];
           var expectedId = memberEntry.value;
-          if (expectedId == null) {
-            if (memberItem != null) {
-              return InstanceMemberPresent();
-            }
-          } else {
-            if (memberItem == null) {
-              return InstanceMemberMissing();
-            }
-            var actualId = memberItem.id;
-            if (actualId != expectedId) {
-              return InstanceMemberIdMismatch(
-                libraryUri: libraryUri,
-                interfaceName: interfaceName,
-                memberName: memberName,
-                expectedId: expectedId,
-                actualId: actualId,
-              );
-            }
+          if (expectedId != memberItem?.id) {
+            return InstanceMemberIdMismatch(
+              libraryUri: libraryUri,
+              interfaceName: interfaceName,
+              memberName: memberName,
+              expectedId: expectedId,
+              actualId: memberItem?.id,
+            );
           }
         }
       }
@@ -203,7 +179,8 @@ class BundleRequirementsManifest {
     var libraryElement = element.library2 as LibraryElementImpl;
     var manifest = libraryElement.manifest;
 
-    // TODO(scheglov): can this happen?
+    // If we are linking the library, its manifest is not set yet.
+    // But then we also don't care about this dependency.
     if (manifest == null) {
       return;
     }
@@ -303,7 +280,8 @@ class BundleRequirementsManifest {
     for (var fragment in libraryElement.fragments) {
       for (var export in fragment.libraryExports) {
         var exportedLibrary = export.exportedLibrary;
-        // TODO(scheglov): record this
+
+        // If no library, then there is nothing to re-export.
         if (exportedLibrary == null) {
           continue;
         }