Perform instance member inference for mixins.

The set of sets is not comprehensive, no tests for fields and accessors.

[email protected]

Change-Id: I105ed6b1d4b5836f61af9f8abe7fed7e7a6b8c59
Reviewed-on: https://dart-review.googlesource.com/74941
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/summary/link.dart

@@ -1555,6 +1555,9 @@ class CompilationUnitElementInBuildUnit extends CompilationUnitElementForLink {
     for (ClassElementForLink classElement in types) {
       classElement.link(this);
     }
+    for (ClassElementForLink classElement in mixins) {
+      classElement.link(this);
+    }
   }
 
   /// Throw away any information stored in the summary by a previous call to

pkg/analyzer/lib/src/task/strong_mode.dart

@@ -78,14 +78,8 @@ class InstanceMemberInferrer {
    * compilation [unit].
    */
   void inferCompilationUnit(CompilationUnitElement unit) {
-    for (ClassElement classElement in unit.types) {
-      try {
-        _inferClass(classElement);
-      } on _CycleException {
-        // This is a short circuit return to prevent types that inherit from
-        // types containing a circular reference from being inferred.
-      }
-    }
+    _inferClasses(unit.mixins);
+    _inferClasses(unit.types);
   }
 
   /**
@@ -306,6 +300,7 @@ class InstanceMemberInferrer {
         _inferType(classElement.supertype);
         classElement.mixins.forEach(_inferType);
         classElement.interfaces.forEach(_inferType);
+        classElement.superclassConstraints.forEach(_inferType);
         //
         // Then infer the types for the members.
         //
@@ -330,6 +325,17 @@ class InstanceMemberInferrer {
     }
   }
 
+  void _inferClasses(List<ClassElement> elements) {
+    for (ClassElement element in elements) {
+      try {
+        _inferClass(element);
+      } on _CycleException {
+        // This is a short circuit return to prevent types that inherit from
+        // types containing a circular reference from being inferred.
+      }
+    }
+  }
+
   void _inferConstructorFieldFormals(ConstructorElement constructor) {
     for (ParameterElement parameter in constructor.parameters) {
       if (parameter.hasImplicitType &&

pkg/analyzer/test/src/dart/resolution/class_test.dart

@@ -70,7 +70,10 @@ abstract class B extends A {
 ''');
     await resolveTestFile();
     assertTestErrors([CompileTimeErrorCode.ABSTRACT_SUPER_MEMBER_REFERENCE]);
-    assertElement(findNode.simple('foo(); // ref'), findElement.method('foo'));
+    assertElement(
+      findNode.simple('foo(); // ref'),
+      findElement.method('foo', of: 'A'),
+    );
   }
 
   test_abstractSuperMemberReference_method_reference() async {
@@ -110,7 +113,7 @@ class C extends B {
     assertNoTestErrors();
     assertElement(
       findNode.simple('foo(); // ref'),
-      findElement.method('foo', className: 'M'),
+      findElement.method('foo', of: 'M'),
     );
   }
 
@@ -137,7 +140,7 @@ class C extends A with B {
     assertNoTestErrors();
     assertElement(
       findNode.simple('foo(); // ref'),
-      findElement.method('foo', className: 'B'),
+      findElement.method('foo', of: 'B'),
     );
   }
 
@@ -161,7 +164,7 @@ class C extends A with B {
     assertNoTestErrors();
     assertElement(
       findNode.simple('foo(); // ref'),
-      findElement.method('foo', className: 'A'),
+      findElement.method('foo', of: 'A'),
     );
   }
 
@@ -207,7 +210,7 @@ class C extends B {
     assertNoTestErrors();
     assertElement(
       findNode.simple('foo(); // ref'),
-      findElement.method('foo', className: 'A'),
+      findElement.method('foo', of: 'A'),
     );
   }
 

pkg/analyzer/test/src/dart/resolution/find_element.dart

@@ -149,16 +149,36 @@ class FindElement {
     return result;
   }
 
-  MethodElement method(String name, {String className}) {
+  MethodElement method(String name, {String of}) {
+    MethodElement result;
+
+    void findIn(List<MethodElement> methods) {
+      for (var method in methods) {
+        if (method.name == name) {
+          if (result != null) {
+            throw new StateError('Method name $name is not unique.');
+          }
+          result = method;
+        }
+      }
+    }
+
     for (var class_ in unitElement.types) {
-      if (className != null && class_.name != className) {
+      if (of != null && class_.name != of) {
         continue;
       }
-      for (var method in class_.methods) {
-        if (method.name == name) {
-          return method;
-        }
+      findIn(class_.methods);
+    }
+
+    for (var mixin in unitElement.mixins) {
+      if (of != null && mixin.name != of) {
+        continue;
       }
+      findIn(mixin.methods);
+    }
+
+    if (result != null) {
+      return result;
     }
     fail('Not found class method: $name');
   }