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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Andrey Breslav
2011-10-27 15:02:35 +04:00
parent 4fb29d0022 3c8d87279e
commit 9bd5e78536
1 changed files with 1 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/JavaDescriptorResolver.java
+1 -1
View File
@@ -168,7 +168,7 @@ public class JavaDescriptorResolver {
private DeclarationDescriptor resolveParentDescriptor(PsiClass psiClass) { private DeclarationDescriptor resolveParentDescriptor(PsiClass psiClass) {
PsiClass containingClass = psiClass.getContainingClass(); PsiClass containingClass = psiClass.getContainingClass();
if (containingClass != null) { if (containingClass != null) {
return resolveClass(psiClass); return resolveClass(containingClass);
} }
PsiJavaFile containingFile = (PsiJavaFile) psiClass.getContainingFile(); PsiJavaFile containingFile = (PsiJavaFile) psiClass.getContainingFile();