Merge branch 'master' of ssh://git.labs.intellij.net/jet

2011-09-27 16:25:26 +04:00
parent fdac4c7ef4 c8c740c52f
commit a06aa17a5f
29 changed files with 356 additions and 78 deletions
@@ -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);
            }