Allow super invocations find members in supertypes of old style mixins.

We should delete this code once Flutter switches to the new mixins. R=brianwilkerson@google.com Change-Id: Ib57d9093dade0d926386647f47f91918e92a51f2 Reviewed-on: https://dart-review.googlesource.com/76700 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
flutter · Sep 26, 2018 · 4dcd839 · 4dcd839
1 parent a0ff5f8
commit 4dcd839
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/pkg/analyzer/lib/src/dart/element/type.dart b/pkg/analyzer/lib/src/dart/element/type.dart
@@ -1822,6 +1822,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
 
   ExecutableElement lookUpInheritedMember(String name, LibraryElement library,
       {bool concrete: false,
+      bool forSuperInvocation: false,
       int startMixinIndex,
       bool setter: false,
       bool thisType: false}) {
@@ -1832,7 +1833,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     ExecutableElement lookUpImpl(InterfaceTypeImpl type,
         {bool acceptAbstract: false,
         bool includeType: true,
-        bool includeSupers: true,
+        bool inMixin: false,
         int startMixinIndex}) {
       if (type == null || !visitedClasses.add(type.element)) {
         return null;
@@ -1853,14 +1854,24 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
         }
       }
 
-      if (includeSupers) {
+      if (forSuperInvocation) {
+        bool inOldStyleSuperMixin = inMixin &&
+            type.superclass != null &&
+            !type.superclass.isObject &&
+            element.context.analysisOptions.enableSuperMixins;
+        if (inOldStyleSuperMixin) {
+          acceptAbstract = true;
+        }
+      }
+
+      if (!inMixin || acceptAbstract) {
         var mixins = type.mixins;
         startMixinIndex ??= mixins.length;
         for (var i = startMixinIndex - 1; i >= 0; i--) {
           var result = lookUpImpl(
             mixins[i],
             acceptAbstract: acceptAbstract,
-            includeSupers: false,
+            inMixin: true,
           );
           if (result != null) {
             return result;
@@ -1879,8 +1890,9 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
         }
       }
 
-      if (includeSupers) {
-        return lookUpImpl(type.superclass, acceptAbstract: acceptAbstract);
+      if (!inMixin || acceptAbstract) {
+        return lookUpImpl(type.superclass,
+            acceptAbstract: acceptAbstract, inMixin: inMixin);
       }
 
       return null;

diff --git a/pkg/analyzer/lib/src/generated/element_resolver.dart b/pkg/analyzer/lib/src/generated/element_resolver.dart
@@ -598,7 +598,7 @@ class ElementResolver extends SimpleAstVisitor<Object> {
           if (staticType is InterfaceTypeImpl) {
             staticElement = staticType.lookUpInheritedMember(
                 methodName.name, _definingLibrary,
-                concrete: true);
+                concrete: true, forSuperInvocation: true);
             // We were not able to find the concrete dispatch target.
             // But we would like to give the user at least some resolution.
             // So, we retry without the "concrete" requirement.
@@ -2096,7 +2096,9 @@ class ElementResolver extends SimpleAstVisitor<Object> {
         if (staticType is InterfaceTypeImpl) {
           staticElement = staticType.lookUpInheritedMember(
               propertyName.name, _definingLibrary,
-              setter: propertyName.inSetterContext(), concrete: true);
+              setter: propertyName.inSetterContext(),
+              concrete: true,
+              forSuperInvocation: true);
           // We were not able to find the concrete dispatch target.
           // But we would like to give the user at least some resolution.
           // So, we retry without the "concrete" requirement.