Issue 4238. Infer Element subclass from query() parameter

compiler/java/com/google/dart/compiler/type/TypeAnalyzer.java

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 package com.google.dart.compiler.type;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
 import com.google.common.collect.ArrayListMultimap;
@@ skipping 1230 matching lines @@
       if (element != null && (element.getModifiers().isStatic()
                               || Elements.isTopLevel(element))) {
         node.setElement(element);
         checkDeprecated(nameNode, element);
         return checkInvocation(node, nameNode, name, element.getType());
       }
       DartNode target = node.getTarget();
       Type receiver = nonVoidTypeOf(target);
       Member member = lookupMember(receiver, name, nameNode);
       if (member != null) {
-        Element methodElement = member.getElement();
-        checkIllegalPrivateAccess(node.getFunctionName(), methodElement, name);
-        node.setElement(methodElement);
+        element = member.getElement();
+        checkIllegalPrivateAccess(node.getFunctionName(), element, name);
+        node.setElement(element);
         if (nameNode != null) {
-          nameNode.setElement(methodElement);
+          nameNode.setElement(element);
         }
       }
       checkDeprecated(nameNode, nameNode.getElement());
       FunctionType methodType = getMethodType(receiver, member, name, nameNode);
-      return checkInvocation(node, nameNode, name, methodType);
+      Type returnType = checkInvocation(node, nameNode, name, methodType);
+      returnType = ExternalTypeAnalyzers.resolve(types, node, element, returnType);
+      return returnType;
     }
 
     private void checkIllegalPrivateAccess(DartNode diagnosticNode, Element element, String name) {
       if (DartIdentifier.isPrivateName(name)) {
         if (element != null) {
           Element enclosingLibrary = Elements.getLibraryElement(currentMethod);
           Element identifierEnclosingLibrary = Elements.getLibraryElement(element);
           if (!enclosingLibrary.equals(identifierEnclosingLibrary)) {
             onError(diagnosticNode, TypeErrorCode.ILLEGAL_ACCESS_TO_PRIVATE, name);
           }
@@ skipping 1024 matching lines @@
             InterfaceType interfaceType = (InterfaceType) type;
             Element callElement = interfaceType.getElement().lookupLocalElement("call");
             if (ElementKind.of(callElement) == ElementKind.METHOD) {
               node.setElement(callElement);
               type = typeAsMemberOf(callElement, interfaceType);
             }
           }
           break;
       }
       checkDeprecated(target, element);
-      return checkInvocation(node, target, name, type);
+      Type returnType = checkInvocation(node, target, name, type);
+      returnType = ExternalTypeAnalyzers.resolve(types, node, element, returnType);
+      return returnType;
     }
 
     /**
      * Report warning if given {@link Element} is deprecated.
      */
     private void checkDeprecated(HasSourceInfo nameNode, Element element) {
       if (element != null && element.getMetadata().isDeprecated()) {
         onError(nameNode, TypeErrorCode.DEPRECATED_ELEMENT, element);
       }
     }
@@ skipping 621 matching lines @@
         for (VariableElement v : parameters) {
           if (v.isNamed()) {
             named.add(v);
           }
         }
         return named;
       }
     }
   }
 }