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

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

Issue 10544022: Issue 3180. Report shadowing top-level elements by local variable. (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/javatests/com/google/dart/compiler/resolver/NegativeResolverTest.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/Elements.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/Elements.java b/compiler/java/com/google/dart/compiler/resolver/Elements.java
index 4e370c2154c24e2c0dab11c369de8347741e2358..dffac2a2667680c4af3baf321aae9a1b27e93cea 100644
--- a/compiler/java/com/google/dart/compiler/resolver/Elements.java
+++ b/compiler/java/com/google/dart/compiler/resolver/Elements.java
@@ -331,18 +331,18 @@ static FieldElementImplementation fieldFromNode(DartField node,
* {@link DartClassMember} or part of top level declaration.
*/
public static boolean isStaticContext(Element element) {
+ if (element instanceof ClassElement) {
+ return true;
+ }
while (element != null) {
if (element instanceof MethodElement) {
MethodElement methodElement = (MethodElement) element;
- if (methodElement.isStatic()) {
- return true;
- }
+ return methodElement.isStatic();
}
if (element instanceof FieldElement) {
FieldElement fieldElement = (FieldElement) element;
- if (fieldElement.isStatic()) {
- return true;
- }
+ return fieldElement.isStatic()
+ || fieldElement.getEnclosingElement() instanceof LibraryElement;
}
if (element instanceof ClassElement) {
return false;
« no previous file with comments | « no previous file | compiler/javatests/com/google/dart/compiler/resolver/NegativeResolverTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698