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

Unified Diff: compiler/java/com/google/dart/compiler/resolver/MethodElementImplementation.java

Issue 10693023: Issue 3897. Don't use method _invocation_ as enclosing Element (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 6 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
« no previous file with comments | « no previous file | compiler/java/com/google/dart/compiler/resolver/Resolver.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/java/com/google/dart/compiler/resolver/MethodElementImplementation.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/MethodElementImplementation.java b/compiler/java/com/google/dart/compiler/resolver/MethodElementImplementation.java
index b93043dab9b1de09d42e0ade4ef00e2e8202f83a..8f24eeaf4dce8f0df9cc967c628eec8e0cb351d2 100644
--- a/compiler/java/com/google/dart/compiler/resolver/MethodElementImplementation.java
+++ b/compiler/java/com/google/dart/compiler/resolver/MethodElementImplementation.java
@@ -7,6 +7,7 @@ package com.google.dart.compiler.resolver;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableSet;
import com.google.dart.compiler.ast.DartBlock;
+import com.google.dart.compiler.ast.DartClass;
import com.google.dart.compiler.ast.DartFunctionExpression;
import com.google.dart.compiler.ast.DartIdentifier;
import com.google.dart.compiler.ast.DartMethodDefinition;
@@ -162,7 +163,9 @@ class MethodElementImplementation extends AbstractNodeElement implements MethodN
private static EnclosingElement findParentEnclosingElement(DartNode node) {
while (node != null && node.getParent() != null) {
node = node.getParent();
- if (node.getElement() instanceof EnclosingElement) {
+ boolean isEnclosingNode = node instanceof DartClass || node instanceof DartMethodDefinition
+ || node instanceof DartFunctionExpression;
+ if (isEnclosingNode && node.getElement() instanceof EnclosingElement) {
return (EnclosingElement) node.getElement();
}
}
« no previous file with comments | « no previous file | compiler/java/com/google/dart/compiler/resolver/Resolver.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698