From 31a1b2ddd3f238ce8382618f5c9ab34e50bc6e5c Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 17 Apr 2020 15:50:32 +0300
Subject: [PATCH] No BodyResolveMode.FULL in slicer

---
 idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt  | 2 +-
 idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt | 4 ++--
 idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt        | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
index 4aa9d0145d474..487736852525b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
@@ -117,7 +117,7 @@ class InflowSlicer(
                 .forEach { it.processPropertyAssignments() }
         }
 
-        val parameterDescriptor = parameter.resolveToParameterDescriptorIfAny(BodyResolveMode.FULL) ?: return
+        val parameterDescriptor = parameter.resolveToParameterDescriptorIfAny() ?: return
 
         if (function is KtFunction) {
             processCalls(function, includeOverriders, ArgumentSliceProducer(parameterDescriptor))
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
index 15a9e1b769c6f..5fb8c6fe76a74 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
@@ -65,7 +65,7 @@ class OutflowSlicer(
                 require(element == declaration.receiverTypeReference)
 
                 if (declaration.isExpectDeclaration()) {
-                    declaration.resolveToDescriptorIfAny(BodyResolveMode.FULL)
+                    declaration.resolveToDescriptorIfAny()
                         ?.actualsForExpected()
                         ?.forEach {
                             val actualDeclaration = (it as? DeclarationDescriptorWithSource)?.toPsi()
@@ -121,7 +121,7 @@ class OutflowSlicer(
 
             if (callable != null) {
                 if (callable.isExpectDeclaration()) {
-                    variable.resolveToDescriptorIfAny(BodyResolveMode.FULL)
+                    variable.resolveToDescriptorIfAny()
                         ?.actualsForExpected()
                         ?.forEach {
                             (it as? DeclarationDescriptorWithSource)?.toPsi()?.passToProcessor()
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
index d8e6b8b5f7a78..0571a996cf965 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
@@ -46,7 +46,6 @@ import org.jetbrains.kotlin.psi.psiUtil.parents
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull
-import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.kotlin.resolve.source.getPsi
@@ -121,7 +120,7 @@ abstract class Slicer(
             .forEach { it.namedUnwrappedElement?.passToProcessor(mode) }
 
         if (this is KtCallableDeclaration && isExpectDeclaration()) {
-            resolveToDescriptorIfAny(BodyResolveMode.FULL)
+            resolveToDescriptorIfAny()
                 ?.actualsForExpected()
                 ?.forEach {
                     (it as? DeclarationDescriptorWithSource)?.toPsi()?.passToProcessor(mode)
@@ -159,7 +158,7 @@ abstract class Slicer(
             else -> return
         }
 
-        val descriptor = callable.resolveToDescriptorIfAny(BodyResolveMode.FULL) as? CallableMemberDescriptor ?: return
+        val descriptor = callable.resolveToDescriptorIfAny() as? CallableMemberDescriptor ?: return
         val superDescriptors = if (includeOverriders) {
             descriptor.getDeepestSuperDeclarations()
         } else {