From 92e7ed0425847e5734a1f86f34634e4c0d17ba10 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Tue, 7 Jul 2015 21:26:56 +0300
Subject: [PATCH] Rename: getNestedTypeArguments -> getNestedArguments

---
 .../kotlin/resolve/calls/inference/ConstraintSystemImpl.kt    | 4 ++--
 .../kotlin/resolve/calls/inference/constraintIncorporation.kt | 4 ++--
 core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt
index 5d8ea25b72c..b768d4917dc 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.types.TypeUtils.DONT_CARE
 import org.jetbrains.kotlin.types.checker.JetTypeChecker
 import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure
 import org.jetbrains.kotlin.types.checker.TypeCheckingProcedureCallbacks
-import org.jetbrains.kotlin.types.typeUtil.getNestedTypeArguments
+import org.jetbrains.kotlin.types.typeUtil.getNestedArguments
 import java.util.ArrayList
 import java.util.HashMap
 import java.util.HashSet
@@ -168,7 +168,7 @@ public class ConstraintSystemImpl : ConstraintSystem {
     }
 
     fun JetType.getNestedTypeVariables(original: Boolean = false): List<TypeParameterDescriptor> {
-        return getNestedTypeArguments().map { typeProjection ->
+        return getNestedArguments().map { typeProjection ->
             typeProjection.getType().getConstructor().getDeclarationDescriptor() as? TypeParameterDescriptor
         }.filterNotNull().filter { if (original) it in originalToVariables.keySet() else it in getAllTypeVariables() }
     }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/constraintIncorporation.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/constraintIncorporation.kt
index 8066ab7ea18..a8ee4f0d69f 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/constraintIncorporation.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/constraintIncorporation.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.BoundKind.UPPER_B
 import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.CompoundConstraintPosition
 import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.types.Variance.INVARIANT
-import org.jetbrains.kotlin.types.typeUtil.getNestedTypeArguments
+import org.jetbrains.kotlin.types.typeUtil.getNestedArguments
 import org.jetbrains.kotlin.types.typesApproximation.approximateCapturedTypes
 import java.util.*
 
@@ -111,7 +111,7 @@ private fun ConstraintSystemImpl.generateNewBound(bound: Bound, substitution: Bo
     // todo
     // if we allow non-trivial type projections, we bump into errors like
     // "Empty intersection for types [MutableCollection<in ('Int'..'Int?')>, MutableCollection<out Any?>, MutableCollection<in Int>]"
-    fun JetType.containsConstrainingTypeWithoutProjection() = this.getNestedTypeArguments().any {
+    fun JetType.containsConstrainingTypeWithoutProjection() = this.getNestedArguments().any {
         it.getType().getConstructor() == substitution.constrainingType.getConstructor() && it.getProjectionKind() == Variance.INVARIANT
     }
     if (approximationBounds.upper.containsConstrainingTypeWithoutProjection() && bound.kind != LOWER_BOUND) {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt
index 056ad37ee88..e521af97830 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt
@@ -87,7 +87,7 @@ public fun JetTypeChecker.equalTypesOrNulls(type1: JetType?, type2: JetType?): B
     return equalTypes(type1, type2)
 }
 
-fun JetType.getNestedTypeArguments(): List<TypeProjection> {
+fun JetType.getNestedArguments(): List<TypeProjection> {
     val result = ArrayList<TypeProjection>()
 
     val stack = ArrayDeque<TypeProjection>()