From 35d64f85f84784291687226688893172bd7bc16a Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Mon, 26 Aug 2019 13:53:40 +0700
Subject: [PATCH] TypeAccessibilityCheckerImpl: `explicitParameters` change
 return type to `Sequence`

---
 .../quickfix/TypeAccessibilityCheckerImpl.kt  | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/TypeAccessibilityCheckerImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/TypeAccessibilityCheckerImpl.kt
index c077aa3634b..6f020c768f9 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/TypeAccessibilityCheckerImpl.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/TypeAccessibilityCheckerImpl.kt
@@ -105,7 +105,7 @@ private fun DeclarationDescriptor.collectAllTypes(): Sequence<FqName?> {
         is CallableDescriptor -> {
             val returnType = returnType ?: return sequenceOf(null)
             returnType.collectAllTypes() +
-                    explicitParameters.asSequence().map(ParameterDescriptor::getType).flatMap(KotlinType::collectAllTypes) +
+                    explicitParameters.map(ParameterDescriptor::getType).flatMap(KotlinType::collectAllTypes) +
                     typeParameters.asSequence().flatMap(DeclarationDescriptor::collectAllTypes)
         }
         is TypeParameterDescriptor -> {
@@ -130,19 +130,9 @@ private fun KotlinType.collectAllTypes(): Sequence<FqName?> = sequenceOf(fqName)
     .map(TypeProjection::getType)
     .flatMap(KotlinType::collectAllTypes)
 
-private val CallableDescriptor.explicitParameters: List<ParameterDescriptor>
-    get() {
-        val result = ArrayList<ParameterDescriptor>(valueParameters.size + 2)
-
-        this.dispatchReceiverParameter?.let {
-            result.add(it)
-        }
-
-        this.extensionReceiverParameter?.let {
-            result.add(it)
-        }
-
-        result.addAll(valueParameters)
-
-        return result
-    }
+private val CallableDescriptor.explicitParameters: Sequence<ParameterDescriptor>
+    get() = valueParameters.asSequence() + dispatchReceiverParameter?.let {
+        sequenceOf(it)
+    }.orEmpty() + extensionReceiverParameter?.let {
+        sequenceOf(it)
+    }.orEmpty()