Chromium Code Reviews| Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ElementResolver.java |
| diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ElementResolver.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ElementResolver.java |
| index aab4cd9ffce1de13f732221a4268c5f1a594ba20..60396b3335df6d55cf0e087e50c75411a04d8754 100644 |
| --- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ElementResolver.java |
| +++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ElementResolver.java |
| @@ -857,8 +857,8 @@ public class ElementResolver extends SimpleAstVisitor<Void> { |
| if (target == null) { |
| staticElement = resolveInvokedElement(methodName); |
| propagatedElement = null; |
| - } else if (isDeferredPrefix(target) |
| - && methodName.getName().equals(FunctionElement.LOAD_LIBRARY_NAME)) { |
| + } else if (methodName.getName().equals(FunctionElement.LOAD_LIBRARY_NAME) |
| + && isDeferredPrefix(target)) { |
| LibraryElement importedLibrary = getImportedLibrary(target); |
| methodName.setStaticElement(importedLibrary.getLoadLibraryFunction()); |
| return null; |
| @@ -1057,7 +1057,15 @@ public class ElementResolver extends SimpleAstVisitor<Void> { |
| SimpleIdentifier prefix = node.getPrefix(); |
| SimpleIdentifier identifier = node.getIdentifier(); |
| // |
| - // First, check to see whether the prefix is really a prefix. |
| + // First, check the "lib.loadLibrary" case |
| + // |
| + if (identifier.getName().equals(FunctionElement.LOAD_LIBRARY_NAME) && isDeferredPrefix(prefix)) { |
|
Brian Wilkerson
2014/04/29 23:01:52
Given that loadLibrary is a method, under what con
jwren
2014/04/29 23:07:59
var x = lib.loadLibrary;
...
x().then....
Brian Wilkerson
2014/04/29 23:18:13
Is that legal? Can the loadLibrary function be tor
|
| + LibraryElement importedLibrary = getImportedLibrary(prefix); |
| + identifier.setStaticElement(importedLibrary.getLoadLibraryFunction()); |
| + return null; |
| + } |
| + // |
| + // Check to see whether the prefix is really a prefix. |
| // |
| Element prefixElement = prefix.getStaticElement(); |
| if (prefixElement instanceof PrefixElement) { |