From 8ac63a53ad9ec0fd9aed25c1fc23d33d6b1d6695 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 8 Nov 2012 20:10:42 +0400 Subject: [PATCH] Minor change to make code green --- .../resolve/java/scope/JavaClassNonStaticMembersScope.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassNonStaticMembersScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassNonStaticMembersScope.java index a7a542f8569..63c64534464 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassNonStaticMembersScope.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassNonStaticMembersScope.java @@ -59,8 +59,10 @@ public final class JavaClassNonStaticMembersScope extends JavaClassMembersScope for (PsiClass innerClass : declarationProvider.getPsiClass().getAllInnerClasses()) { if (name.getName().equals(innerClass.getName())) { if (innerClass.hasModifierProperty(PsiModifier.STATIC) != declarationProvider.isStaticMembers()) return null; + String qualifiedName = innerClass.getQualifiedName(); + assert qualifiedName != null; ClassDescriptor classDescriptor = getResolver() - .resolveClass(new FqName(innerClass.getQualifiedName()), DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN); + .resolveClass(new FqName(qualifiedName), DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN); if (classDescriptor != null) { return classDescriptor; }