Outer classes are properly computed

2013-05-22 20:44:09 +04:00
parent b536b3961e
commit b38c5b9d08
2 changed files with 13 additions and 1 deletions
@@ -324,7 +324,10 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
                @Nullable
                @Override
                protected ClassDescriptor doCompute(@NotNull ClassId classId) {
-                    return resolveClass(ClassResolverImpl.this.parentForClasses, classId);
+                    DeclarationDescriptor containingDeclaration =
+                            classId.isTopLevelClass() ? ClassResolverImpl.this.parentForClasses : findClass(classId.getOuterClassId());
+                    assert containingDeclaration != null : "Containing declaration not found: " + classId.getOuterClassId();
+                    return resolveClass(containingDeclaration, classId);
                }
            };
        }