Update tests for class augmentations.

Change-Id: I886da67c840aa931716bf2be00533650fdcaa82b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/446702
Reviewed-by: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: fshcheglov

pkg/analyzer/lib/src/summary2/element_builder.dart

@@ -275,6 +275,11 @@ class ElementBuilder {
     var interfaceFragment = fragment.enclosingFragment;
     interfaceFragment.addConstructor(fragment);
 
+    if (fragment.isAugmentation && lastFragment is ConstructorFragmentImpl) {
+      lastFragment.addFragment(fragment);
+      return;
+    }
+
     var element = ConstructorElementImpl(
       name: fragment.name,
       reference: _addInstanceReference(
@@ -284,6 +289,7 @@ class ElementBuilder {
       ),
       firstFragment: fragment,
     );
+
     interfaceElement.addConstructor(element);
   }
 
@@ -435,19 +441,20 @@ class ElementBuilder {
 
     if (lastFragment is MethodFragmentImpl && fragment.isAugmentation) {
       lastFragment.addFragment(fragment);
-    } else {
-      instanceElement.addMethod(
-        MethodElementImpl(
-          name: fragment.name,
-          reference: _addInstanceReference(
-            instanceElement,
-            '@method',
-            fragment.lookupName,
-          ),
-          firstFragment: fragment,
-        ),
-      );
+      return;
     }
+
+    instanceElement.addMethod(
+      MethodElementImpl(
+        name: fragment.name,
+        reference: _addInstanceReference(
+          instanceElement,
+          '@method',
+          fragment.lookupName,
+        ),
+        firstFragment: fragment,
+      ),
+    );
   }
 
   void _handleInstanceSetterFragment(

pkg/analyzer/lib/src/summary2/types_builder.dart

@@ -131,19 +131,22 @@ class TypesBuilder {
     var fragment = node.declaredFragment!;
     var element = fragment.element;
 
-    var extendsClause = node.extendsClause;
-    if (extendsClause != null) {
-      var type = extendsClause.superclass.type;
-      if (type is InterfaceTypeImpl && _isInterfaceTypeClass(type)) {
-        element.supertype = type;
+    if (element.supertype == null) {
+      var extendsClause = node.extendsClause;
+      if (extendsClause != null) {
+        var type = extendsClause.superclass.type;
+        if (type is InterfaceTypeImpl && _isInterfaceTypeClass(type)) {
+          element.supertype = type;
+        }
+      } else if (element.isDartCoreObject) {
+        fragment.setModifier(Modifier.DART_CORE_OBJECT, true);
       }
-    } else if (element.isDartCoreObject) {
-      fragment.setModifier(Modifier.DART_CORE_OBJECT, true);
     }
 
-    element.interfaces = _toInterfaceTypeList(
-      node.implementsClause?.interfaces,
-    );
+    element.interfaces = [
+      ...element.interfaces,
+      ..._toInterfaceTypeList(node.implementsClause?.interfaces),
+    ];
 
     _addFragmentWithClause(fragment, node.withClause);
   }
@@ -345,7 +348,6 @@ class TypesBuilder {
       node.onClause?.superclassConstraints,
     );
     element.superclassConstraints = constraints;
-
     element.interfaces = _toInterfaceTypeList(
       node.implementsClause?.interfaces,
     );
@@ -651,10 +653,10 @@ class _MixinsInference {
         library.featureSet,
         typeSystemOperations: typeSystemOperations,
       );
-      for (var fragment in declaration.fragments) {
-        var inferred = inference.perform(fragment.withClause);
-        element.mixins = inferred;
-      }
+      element.mixins = [
+        for (var fragment in declaration.fragments)
+          ...inference.perform(fragment.withClause),
+      ];
     } finally {
       element.mixinInferenceCallback = null;
     }