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

ChangeLog.md

@@ -470,6 +470,7 @@ These artifacts include extensions for the types available in the latter JDKs, s
 
 - Project View: Fix presentation of Kotlin files and their members when @JvmName having the same name as the file itself
 - [`KT-15611`](https://youtrack.jetbrains.com/issue/KT-15611) Extract Interface/Superclass: Disable const-properties
+- Pull Up: Fix pull-up from object to superclass
 
 #### Intention actions, inspections and quickfixes
 

idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt

@@ -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
     }