Fine. Separate InstanceMethodIdMismatch and InterfaceConstructorIdMismatch.

scheglov · Commit Queue · commit dfa1ea52b3c1 · 2025-04-22T13:42:50.000-07:00
Change-Id: Ie2015c764edbf17f0f9d154893357e7d69ec9e24 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423763 Reviewed-by: Paul Berry <paulberry@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/fine/requirement_failure.dart b/pkg/analyzer/lib/src/fine/requirement_failure.dart
@@ -44,17 +44,33 @@ final class ExportLibraryMissing extends ExportFailure {
   ExportLibraryMissing({required this.uri});
 }
 
-class InstanceMemberIdMismatch extends RequirementFailure {
+class InstanceMethodIdMismatch extends RequirementFailure {
   final Uri libraryUri;
   final LookupName interfaceName;
-  final LookupName memberName;
+  final LookupName methodName;
   final ManifestItemId? expectedId;
   final ManifestItemId? actualId;
 
-  InstanceMemberIdMismatch({
+  InstanceMethodIdMismatch({
     required this.libraryUri,
     required this.interfaceName,
-    required this.memberName,
+    required this.methodName,
+    required this.expectedId,
+    required this.actualId,
+  });
+}
+
+class InterfaceConstructorIdMismatch extends RequirementFailure {
+  final Uri libraryUri;
+  final LookupName interfaceName;
+  final LookupName constructorName;
+  final ManifestItemId? expectedId;
+  final ManifestItemId? actualId;
+
+  InterfaceConstructorIdMismatch({
+    required this.libraryUri,
+    required this.interfaceName,
+    required this.constructorName,
     required this.expectedId,
     required this.actualId,
   });
diff --git a/pkg/analyzer/lib/src/fine/requirements.dart b/pkg/analyzer/lib/src/fine/requirements.dart
@@ -315,32 +315,34 @@ class RequirementsManifest {
           );
         }
 
-        for (var methodEntry in interfaceEntry.value.constructors.entries) {
-          var memberName = methodEntry.key;
-          var memberId = interfaceItem.getMemberId(memberName);
-          var expectedId = methodEntry.value;
-          if (expectedId != memberId) {
-            return InstanceMemberIdMismatch(
+        var constructors = interfaceEntry.value.constructors;
+        for (var constructorEntry in constructors.entries) {
+          var constructorName = constructorEntry.key;
+          var constructorId = interfaceItem.getMemberId(constructorName);
+          var expectedId = constructorEntry.value;
+          if (expectedId != constructorId) {
+            return InterfaceConstructorIdMismatch(
               libraryUri: libraryUri,
               interfaceName: interfaceName,
-              memberName: memberName,
+              constructorName: constructorName,
               expectedId: expectedId,
-              actualId: memberId,
+              actualId: constructorId,
             );
           }
         }
 
-        for (var methodEntry in interfaceEntry.value.methods.entries) {
-          var memberName = methodEntry.key;
-          var memberId = interfaceItem.getMemberId(memberName);
+        var methods = interfaceEntry.value.methods;
+        for (var methodEntry in methods.entries) {
+          var methodName = methodEntry.key;
+          var methodId = interfaceItem.getMemberId(methodName);
           var expectedId = methodEntry.value;
-          if (expectedId != memberId) {
-            return InstanceMemberIdMismatch(
+          if (expectedId != methodId) {
+            return InstanceMethodIdMismatch(
               libraryUri: libraryUri,
               interfaceName: interfaceName,
-              memberName: memberName,
+              methodName: methodName,
               expectedId: expectedId,
-              actualId: memberId,
+              actualId: methodId,
             );
           }
         }
diff --git a/pkg/analyzer/test/src/dart/analysis/driver_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_test.dart
@@ -5535,10 +5535,10 @@ class A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  interfaceConstructorIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: named
+    constructorName: named
     expectedId: #M1
     actualId: #M4
 [operation] analyzeFile
@@ -5641,10 +5641,10 @@ class A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  interfaceConstructorIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: c2
+    constructorName: c2
     expectedId: <null>
     actualId: #M3
 [operation] analyzeFile
@@ -5839,10 +5839,10 @@ class A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  interfaceConstructorIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: c2
+    constructorName: c2
     expectedId: #M2
     actualId: <null>
 [operation] analyzeFile
@@ -5961,10 +5961,10 @@ class A {
     uri: package:test/test.dart
     flags: isLibrary
 [operation] cannotReuseLinkedBundle
-  instanceMemberIdMismatch
+  interfaceConstructorIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: named
+    constructorName: named
     expectedId: #M1
     actualId: #M5
 [operation] linkLibraryCycle
@@ -5987,10 +5987,10 @@ class A {
           constructors
             named: #M5
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  interfaceConstructorIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: named
+    constructorName: named
     expectedId: #M1
     actualId: #M5
 [operation] analyzeFile
@@ -6099,10 +6099,10 @@ class A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  interfaceConstructorIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: new
+    constructorName: new
     expectedId: #M1
     actualId: #M4
 [operation] analyzeFile
@@ -6631,10 +6631,10 @@ class A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo
+    methodName: foo
     expectedId: #M1
     actualId: #M4
 [operation] analyzeFile
@@ -7446,10 +7446,10 @@ class A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo
+    methodName: foo
     expectedId: <null>
     actualId: #M2
 [operation] analyzeFile
@@ -8115,10 +8115,10 @@ class A {}
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo
+    methodName: foo
     expectedId: #M1
     actualId: <null>
 [operation] analyzeFile
@@ -8239,10 +8239,10 @@ class A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo
+    methodName: foo
     expectedId: #M1
     actualId: #M4
 [operation] analyzeFile
@@ -8468,10 +8468,10 @@ class A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo=
+    methodName: foo=
     expectedId: <null>
     actualId: #M2
 [operation] analyzeFile
@@ -9001,10 +9001,10 @@ class A {}
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo=
+    methodName: foo=
     expectedId: #M1
     actualId: <null>
 [operation] analyzeFile
@@ -9132,10 +9132,10 @@ class A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo=
+    methodName: foo=
     expectedId: #M1
     actualId: #M4
 [operation] analyzeFile
@@ -9258,10 +9258,10 @@ class B = A with M;
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  interfaceConstructorIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: B
-    memberName: named
+    constructorName: named
     expectedId: #M1
     actualId: #M6
 [operation] analyzeFile
@@ -10459,10 +10459,10 @@ mixin A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo
+    methodName: foo
     expectedId: #M1
     actualId: #M4
 [operation] analyzeFile
@@ -11274,10 +11274,10 @@ mixin A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo
+    methodName: foo
     expectedId: <null>
     actualId: #M2
 [operation] analyzeFile
@@ -11657,10 +11657,10 @@ mixin A {}
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo
+    methodName: foo
     expectedId: #M1
     actualId: <null>
 [operation] analyzeFile
@@ -11781,10 +11781,10 @@ mixin A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo
+    methodName: foo
     expectedId: #M1
     actualId: #M4
 [operation] analyzeFile
@@ -12010,10 +12010,10 @@ mixin A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo=
+    methodName: foo=
     expectedId: <null>
     actualId: #M2
 [operation] analyzeFile
@@ -12267,10 +12267,10 @@ mixin A {}
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo=
+    methodName: foo=
     expectedId: #M1
     actualId: <null>
 [operation] analyzeFile
@@ -12398,10 +12398,10 @@ mixin A {
 [operation] readLibraryCycleBundle
   package:test/test.dart
 [operation] getErrorsCannotReuse
-  instanceMemberIdMismatch
+  instanceMethodIdMismatch
     libraryUri: package:test/a.dart
     interfaceName: A
-    memberName: foo=
+    methodName: foo=
     expectedId: #M1
     actualId: #M4
 [operation] analyzeFile
diff --git a/pkg/analyzer/test/src/dart/analysis/result_printer.dart b/pkg/analyzer/test/src/dart/analysis/result_printer.dart
@@ -382,12 +382,21 @@ class DriverEventsPrinter {
       case ExportLibraryMissing():
         // TODO(scheglov): Handle this case.
         throw UnimplementedError();
-      case InstanceMemberIdMismatch():
-        sink.writelnWithIndent('instanceMemberIdMismatch');
+      case InstanceMethodIdMismatch():
+        sink.writelnWithIndent('instanceMethodIdMismatch');
         sink.writeProperties({
           'libraryUri': failure.libraryUri,
           'interfaceName': failure.interfaceName.asString,
-          'memberName': failure.memberName.asString,
+          'methodName': failure.methodName.asString,
+          'expectedId': idProvider.manifestId(failure.expectedId),
+          'actualId': idProvider.manifestId(failure.actualId),
+        });
+      case InterfaceConstructorIdMismatch():
+        sink.writelnWithIndent('interfaceConstructorIdMismatch');
+        sink.writeProperties({
+          'libraryUri': failure.libraryUri,
+          'interfaceName': failure.interfaceName.asString,
+          'constructorName': failure.constructorName.asString,
           'expectedId': idProvider.manifestId(failure.expectedId),
           'actualId': idProvider.manifestId(failure.actualId),
         });
