Pull Up: Fix subclass map initialization which prevents pull-up from object to superclass

2017-01-10 17:53:14 +03:00
parent 6fb943765d
commit edf5d7da10
2 changed files with 2 additions and 1 deletions
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext

 fun PsiNamedElement.getClassDescriptorIfAny(resolutionFacade: ResolutionFacade? = null): ClassDescriptor? {
    return when (this) {
-        is KtClass -> (resolutionFacade ?: getResolutionFacade()).resolveToDescriptor(this) as ClassDescriptor
+        is KtClassOrObject -> (resolutionFacade ?: getResolutionFacade()).resolveToDescriptor(this) as ClassDescriptor
        is PsiClass -> getJavaClassDescriptor()
        else -> null
    }