Fix calling object methods and properties on function types

pkg/analyzer/lib/src/generated/resolver.dart

 // Copyright (c) 2014, 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.
 
 library analyzer.src.generated.resolver;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 9595 matching lines @@
 
   /**
    * Return the type representing the built-in type 'Type'.
    */
   InterfaceType get typeType;
 
   /**
    * Return the type representing typenames that can't be resolved.
    */
   DartType get undefinedType;
+
+  /**
+   * Return 'true' if [id] is the name of a getter on
+   * the Object type.
+   */
+  bool isObjectGetter(SimpleIdentifier id);

[Jennifer Messerly, 2016/08/17 21:26:24]

maybe pass in the String name here? it seems like "id.name" is all we use

[Leaf, 2016/08/17 22:07:05]

Done.

+
+  /**
+   * Return 'true' if [id] is the name of a method on
+   * the Object type.
+   */
+  bool isObjectMethod(SimpleIdentifier id);
+
+  /**
+   * Return 'true' if [id] is the name of a method or getter on
+   * the Object type.
+   */
+  bool isObjectProperty(SimpleIdentifier id);

[Brian Wilkerson, 2016/08/17 21:24:15]

I think the analyzer code is generally fairly consistent about using 'property'
to mean 'getter' or 'setter' and 'member' to mean 'property' or 'method'.

[Leaf, 2016/08/17 22:07:05]

Done.

+}
+
+/**
+ * Provide common functionality shared by the various TypeProvider
+ * implementations

[Jennifer Messerly, 2016/08/17 21:26:24]

nit: should end with period

[Leaf, 2016/08/17 22:07:05]

Done.

+ */
+abstract class TypeProviderBaseMixin {
+  InterfaceType get boolType;

[Brian Wilkerson, 2016/08/17 21:24:15]

Should this just implement TypeProvider (rather than duplicate these
declarations)?

[Leaf, 2016/08/17 22:07:05]

Nice.  Didn't realize you could do this, much better.

+  InterfaceType get doubleType;
+  InterfaceType get intType;
+  List<InterfaceType> get nonSubtypableTypes => <InterfaceType>[
+        nullType,
+        numType,
+        intType,
+        doubleType,
+        boolType,
+        stringType
+      ];
+  InterfaceType get nullType;
+  InterfaceType get numType;
+  InterfaceType get objectType;
+  InterfaceType get stringType;
+
+  bool isObjectGetter(SimpleIdentifier id) {
+    PropertyAccessorElement element = objectType.element.getGetter(id.name);
+    return (element != null && !element.isStatic);
+  }
+
+  bool isObjectMethod(SimpleIdentifier id) {
+    MethodElement element = objectType.element.getMethod(id.name);
+    return (element != null && !element.isStatic);
+  }
+
+  bool isObjectProperty(SimpleIdentifier id) {
+    return isObjectGetter(id) || isObjectMethod(id);
+  }
 }
 
 /**
  * Instances of the class `TypeProviderImpl` provide access to types defined by the language
  * by looking for those types in the element model for the core library.
  */
-class TypeProviderImpl implements TypeProvider {
+class TypeProviderImpl extends Object
+    with TypeProviderBaseMixin

[Jennifer Messerly, 2016/08/17 21:26:24]

in current Dart, this is equivalent to "extends TypeProviderBaseMixin"

... that said whether y'all on the language team will change it, I'm not sure :)

[Leaf, 2016/08/17 22:07:05]

Done.

+    implements TypeProvider {
   /**
    * The type representing the built-in type 'bool'.
    */
   InterfaceType _boolType;
 
   /**
    * The type representing the type 'bottom'.
    */
   DartType _bottomType;
 
@@ skipping 169 matching lines @@
   @override
   InterfaceType get iterableType => _iterableType;
 
   @override
   InterfaceType get listType => _listType;
 
   @override
   InterfaceType get mapType => _mapType;
 
   @override
-  List<InterfaceType> get nonSubtypableTypes => <InterfaceType>[
-        nullType,
-        numType,
-        intType,
-        doubleType,
-        boolType,
-        stringType
-      ];
-
-  @override
   DartObjectImpl get nullObject {
     if (_nullObject == null) {
       _nullObject = new DartObjectImpl(nullType, NullState.NULL_STATE);
     }
     return _nullObject;
   }
 
   @override
   InterfaceType get nullType => _nullType;
 
@@ skipping 1272 matching lines @@
       return null;
     }
     if (identical(node.staticElement, variable)) {
       if (node.inSetterContext()) {
         result = true;
       }
     }
     return null;
   }
 }