Fine. Improve ClassItem / MixinItem printing, asserts.

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

Author: scheglov

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

@@ -20,8 +20,8 @@ class ClassItem extends InterfaceItem {
     required super.metadata,
     required super.typeParameters,
     required super.supertype,
-    required super.interfaces,
     required super.mixins,
+    required super.interfaces,
     required super.declaredMembers,
     required super.inheritedMembers,
   });
@@ -323,8 +323,8 @@ sealed class InterfaceItem extends InstanceItem {
     required super.typeParameters,
     required super.declaredMembers,
     required this.supertype,
-    required this.interfaces,
     required this.mixins,
+    required this.interfaces,
     required this.inheritedMembers,
   });
 
@@ -539,7 +539,9 @@ class MixinItem extends InterfaceItem {
     required super.declaredMembers,
     required super.inheritedMembers,
     required this.superclassConstraints,
-  });
+  })  : assert(supertype == null),
+        assert(mixins.isEmpty),
+        assert(superclassConstraints.isNotEmpty);
 
   factory MixinItem.fromElement({
     required ManifestItemId id,

pkg/analyzer/test/src/dart/analysis/driver_test.dart

@@ -13727,6 +13727,8 @@ mixin A {
   package:test/test.dart
     manifest
       A: #M0
+        superclassConstraints
+          Object @ dart:core
         declaredMembers
           foo: #M1
             returnType: int @ dart:core
@@ -13741,6 +13743,8 @@ mixin A {
   package:test/test.dart
     manifest
       A: #M0
+        superclassConstraints
+          Object @ dart:core
         declaredMembers
           foo: #M2
             returnType: double @ dart:core
@@ -14368,6 +14372,8 @@ mixin A {
   package:test/test.dart
     manifest
       A: #M0
+        superclassConstraints
+          Object @ dart:core
         declaredMembers
           foo: #M1
             functionType: FunctionType
@@ -14383,6 +14389,8 @@ mixin A {
   package:test/test.dart
     manifest
       A: #M0
+        superclassConstraints
+          Object @ dart:core
         declaredMembers
           foo: #M2
             functionType: FunctionType
@@ -14503,6 +14511,8 @@ mixin A<T> {
       A: #M0
         typeParameters
           bound: <null>
+        superclassConstraints
+          Object @ dart:core
         declaredMembers
           foo: #M1
             functionType: FunctionType
@@ -14525,6 +14535,8 @@ mixin A<T> {
       A: #M0
         typeParameters
           bound: <null>
+        superclassConstraints
+          Object @ dart:core
         declaredMembers
           bar: #M2
             functionType: FunctionType
@@ -15180,6 +15192,8 @@ mixin A {
   package:test/test.dart
     manifest
       A: #M0
+        superclassConstraints
+          Object @ dart:core
         declaredMembers
           foo=: #M1
             valueType: int @ dart:core
@@ -15194,6 +15208,8 @@ mixin A {
   package:test/test.dart
     manifest
       A: #M0
+        superclassConstraints
+          Object @ dart:core
         declaredMembers
           foo=: #M2
             valueType: double @ dart:core

pkg/analyzer/test/src/dart/analysis/result_printer.dart

@@ -775,38 +775,27 @@ class LibraryManifestPrinter {
         _writeMetadata(item);
         _writeTypeParameters(item.typeParameters);
         _writeNamedType('supertype', item.supertype);
-        // TODO(scheglov): other types
+        _writeTypeList('mixins', item.mixins);
+        _writeTypeList('interfaces', item.interfaces);
       });
     }
 
-    {
-      var declared = item.declaredMembers.sorted;
-      declared = _withoutIgnoredMembers(declared);
-      if (declared.isNotEmpty) {
-        sink.withIndent(() {
-          sink.writelnWithIndent('declaredMembers');
-          sink.withIndent(() {
-            for (var entry in declared) {
-              _writeInstanceItemDeclaredMember(entry.key, entry.value);
-            }
-          });
-        });
-      }
-    }
+    _writeInstanceItemDeclaredItems(item);
+    _writeInterfaceItemInheritedItems(item);
+  }
 
-    {
-      var inherited = item.inheritedMembers.sorted;
-      inherited = _withoutIgnoredMembers(inherited);
-      if (inherited.isNotEmpty) {
+  void _writeInstanceItemDeclaredItems(InstanceItem item) {
+    var declared = item.declaredMembers.sorted;
+    declared = _withoutIgnoredMembers(declared);
+    if (declared.isNotEmpty) {
+      sink.withIndent(() {
+        sink.writelnWithIndent('declaredMembers');
         sink.withIndent(() {
-          sink.writelnWithIndent('inheritedMembers');
-          sink.withIndent(() {
-            for (var entry in inherited) {
-              _writeNamedId(entry.key, entry.value);
-            }
-          });
+          for (var entry in declared) {
+            _writeInstanceItemDeclaredMember(entry.key, entry.value);
+          }
         });
-      }
+      });
     }
   }
 
@@ -836,6 +825,21 @@ class LibraryManifestPrinter {
     }
   }
 
+  void _writeInterfaceItemInheritedItems(InterfaceItem item) {
+    var inherited = item.inheritedMembers.sorted;
+    inherited = _withoutIgnoredMembers(inherited);
+    if (inherited.isNotEmpty) {
+      sink.withIndent(() {
+        sink.writelnWithIndent('inheritedMembers');
+        sink.withIndent(() {
+          for (var entry in inherited) {
+            _writeNamedId(entry.key, entry.value);
+          }
+        });
+      });
+    }
+  }
+
   void _writelnElement(ManifestElement element) {
     var parts = [
       element.libraryUri,
@@ -863,39 +867,13 @@ class LibraryManifestPrinter {
       sink.withIndent(() {
         _writeMetadata(item);
         _writeTypeParameters(item.typeParameters);
-        // TODO(scheglov): other types
+        _writeTypeList('superclassConstraints', item.superclassConstraints);
+        _writeTypeList('interfaces', item.interfaces);
       });
     }
 
-    {
-      var declared = item.declaredMembers.sorted;
-      declared = _withoutIgnoredMembers(declared);
-      if (declared.isNotEmpty) {
-        sink.withIndent(() {
-          sink.writelnWithIndent('declaredMembers');
-          sink.withIndent(() {
-            for (var entry in declared) {
-              _writeInstanceItemDeclaredMember(entry.key, entry.value);
-            }
-          });
-        });
-      }
-    }
-
-    {
-      var inherited = item.inheritedMembers.sorted;
-      inherited = _withoutIgnoredMembers(inherited);
-      if (inherited.isNotEmpty) {
-        sink.withIndent(() {
-          sink.writelnWithIndent('inheritedMembers');
-          sink.withIndent(() {
-            for (var entry in inherited) {
-              _writeNamedId(entry.key, entry.value);
-            }
-          });
-        });
-      }
-    }
+    _writeInstanceItemDeclaredItems(item);
+    _writeInterfaceItemInheritedItems(item);
   }
 
   void _writeNamedId(LookupName name, ManifestItemId id) {
@@ -1036,6 +1014,13 @@ class LibraryManifestPrinter {
     }
   }
 
+  void _writeTypeList(String name, List<ManifestType> types) {
+    sink.writeElements(name, types, (type) {
+      sink.writeIndent();
+      _writeType(type);
+    });
+  }
+
   void _writeTypeParameters(
     List<ManifestTypeParameter> typeParameters,
   ) {