Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Unified Diff: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/ElementResolver.java

Issue 258393003: Further work on 17522 (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Review Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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)) {
+ 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) {

Powered by Google App Engine
This is Rietveld 408576698