Code refactoring

JetBrains · Apr 17, 2020 · 5040d37 · 5040d37
1 parent 6928700
commit 5040d37
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/CallSliceProducer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/CallSliceProducer.kt
@@ -16,6 +16,11 @@ import org.jetbrains.kotlin.psi.psiUtil.isAncestor
 
 object CallSliceProducer : SliceProducer {
     override fun produce(usage: UsageInfo, behaviour: KotlinSliceUsage.SpecialBehaviour?, parent: SliceUsage): Collection<SliceUsage>? {
+        if ((parent as? KotlinSliceUsage)?.behaviour is LambdaCallsBehaviour) {
+            // UsageInfo produced by LambdaCallsBehaviour has full call-element and does not require any processing
+            return null
+        }
+
         when (val refElement = usage.element) {
             null -> {
                 val element = (usage.reference as? LightMemberReference)?.element ?: return emptyList()

diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
@@ -190,8 +190,8 @@ class InflowSlicer(
                             val anonymousFunction = accessedDescriptor.containingDeclaration as? AnonymousFunctionDescriptor
                             if (anonymousFunction != null && accessedDescriptor.name.asString() == "it") {
                                 val functionLiteral = anonymousFunction.source.getPsi() as KtFunctionLiteral
-                                val sliceTransformer = ArgumentSliceProducer(anonymousFunction.valueParameters.first())
-                                processCalls(functionLiteral, false, sliceTransformer)
+                                val parameterDescriptor = anonymousFunction.valueParameters.first()
+                                processCalls(functionLiteral, false, ArgumentSliceProducer(parameterDescriptor))
                             }
                         } else {
                             accessedDeclaration.passDeclarationToProcessorWithOverriders()

diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
@@ -148,12 +148,7 @@ class OutflowSlicer(
     }
 
     private fun processFunction(function: KtFunction) {
-        //TODO: CallSliceProducer in all cases
-        if (function is KtConstructor<*> || function is KtNamedFunction && function.name != null) {
-            processCalls(function, includeOverriders = false, sliceProducer = CallSliceProducer)
-        } else {
-            processCalls(function, false, SliceProducer.Trivial)
-        }
+        processCalls(function, includeOverriders = false, CallSliceProducer)
     }
 
     private fun processExtensionReceiver(declaration: KtCallableDeclaration, declarationWithBody: KtDeclarationWithBody) {