azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor change to make code green

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-11-08 20:10:42 +04:00
parent 05cf6a407a
commit 8ac63a53ad
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassNonStaticMembersScope.java
+3 -1
View File
@@ -59,8 +59,10 @@ public final class JavaClassNonStaticMembersScope extends JavaClassMembersScope
for (PsiClass innerClass : declarationProvider.getPsiClass().getAllInnerClasses()) { for (PsiClass innerClass : declarationProvider.getPsiClass().getAllInnerClasses()) {
if (name.getName().equals(innerClass.getName())) { if (name.getName().equals(innerClass.getName())) {
if (innerClass.hasModifierProperty(PsiModifier.STATIC) != declarationProvider.isStaticMembers()) return null; if (innerClass.hasModifierProperty(PsiModifier.STATIC) != declarationProvider.isStaticMembers()) return null;
String qualifiedName = innerClass.getQualifiedName();
assert qualifiedName != null;
ClassDescriptor classDescriptor = getResolver() 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) { if (classDescriptor != null) {
return classDescriptor; return classDescriptor;
} }