From c6c87ec3c8ff0276e0a1354186c9bc65dedf99cb Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@abreslav-mac.labs.intellij.net>
Date: Mon, 26 Sep 2011 21:14:26 +0400
Subject: [PATCH] Static java fields not visible in non-static scopes any more

---
 .../jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
index 8aed6d1ea3f..c5485602ba5 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
@@ -85,6 +85,9 @@ public class JavaClassMembersScope implements JetScope {
             }
 
             for (PsiField field : psiClass.getAllFields()) {
+                if (field.hasModifierProperty(PsiModifier.STATIC) != staticMembers) {
+                    continue;
+                }
                 VariableDescriptor variableDescriptor = semanticServices.getDescriptorResolver().resolveFieldToVariableDescriptor(containingDeclaration, field);
                 allDescriptors.add(variableDescriptor);
             }