From 1817b3daa75f55f7ff6e20254c1df9c0ac41e649 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 9 Oct 2012 16:31:36 +0400 Subject: [PATCH] EA-39710 - assert: JavaDescriptorPropertiesResolver.resolveNamedGroupProperties --- .../jet/lang/resolve/java/JavaDescriptorResolverHelper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java index 70414a2f982..65eb3d4c992 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java @@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.java; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData; +import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation; import org.jetbrains.jet.lang.resolve.java.prop.PropertyNameUtils; import org.jetbrains.jet.lang.resolve.java.prop.PropertyParseResult; import org.jetbrains.jet.lang.resolve.java.wrapper.*; @@ -214,6 +215,9 @@ class JavaDescriptorResolverHelper { if (!neighborPsiClass.isPhysical()) { // to filter out JetLightClasses continue; } + if (JetClassAnnotation.get(neighborPsiClass).kind() != JvmStdlibNames.FLAG_CLASS_KIND_OBJECT) { + continue; + } PsiField instanceField = neighborPsiClass.findFieldByName(JvmAbi.INSTANCE_FIELD, false); if (instanceField != null) { NamedMembers namedMembers = getNamedMembers(Name.identifier(neighborPsiClass.getName()));