MoveMemberOutOfCompanionObject: analyzeFully --> analyze

This commit is contained in:
Mikhail Glukhikh
2018-02-14 11:08:34 +03:00
parent 8986b8a1a2
commit d4dbd4cd6a
@@ -23,7 +23,7 @@ import com.intellij.refactoring.util.RefactoringUIUtil
import com.intellij.util.containers.MultiMap import com.intellij.util.containers.MultiMap
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
@@ -51,7 +51,7 @@ class MoveMemberOutOfCompanionObjectIntention : MoveMemberOutOfObjectIntention("
.mapNotNull { it.element } .mapNotNull { it.element }
.filter { .filter {
if (it !is KtElement) return@filter true if (it !is KtElement) return@filter true
val resolvedCall = it.getResolvedCall(it.analyzeFully()) ?: return@filter false val resolvedCall = it.getResolvedCall(it.analyze()) ?: return@filter false
val dispatchReceiver = resolvedCall.dispatchReceiver ?: return@filter false val dispatchReceiver = resolvedCall.dispatchReceiver ?: return@filter false
if (dispatchReceiver !is ImplicitClassReceiver) return@filter true if (dispatchReceiver !is ImplicitClassReceiver) return@filter true
it.parents it.parents