Merge remote branch 'origin/master'

2011-10-27 15:02:35 +04:00
parent 4fb29d0022 3c8d87279e
commit 9bd5e78536
1 changed files with 1 additions and 1 deletions
@@ -168,7 +168,7 @@ public class JavaDescriptorResolver {
    private DeclarationDescriptor resolveParentDescriptor(PsiClass psiClass) {
        PsiClass containingClass = psiClass.getContainingClass();
        if (containingClass != null) {
-            return resolveClass(psiClass);
+            return resolveClass(containingClass);
        }
        
        PsiJavaFile containingFile = (PsiJavaFile) psiClass.getContainingFile();