From 6b33e3fb67a78cfd41f5e85ae9750a3dace5630e Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 26 Jan 2016 18:57:26 +0300 Subject: [PATCH] Minor. Rename variables and add assertion --- .../load/java/lazy/types/LazyJavaTypeResolver.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt index ea16346cdf2..3a6661018b6 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt @@ -196,12 +196,15 @@ class LazyJavaTypeResolver( } var howTheProjectionIsUsed = if (attr.howThisTypeIsUsed == SUPERTYPE) SUPERTYPE_ARGUMENT else TYPE_ARGUMENT return javaType.typeArguments.withIndex().map { - javaTypeParameter -> - val (i, t) = javaTypeParameter - val parameter = if (i >= typeParameters.size) - ErrorUtils.createErrorTypeParameter(i, "#$i for ${typeConstructor}") - else typeParameters[i] - transformToTypeProjection(t, howTheProjectionIsUsed.toAttributes(), parameter) + indexedArgument -> + val (i, javaTypeArgument) = indexedArgument + + assert(i < typeParameters.size) { + "Argument index should be less then type parameters count, but $i > ${typeParameters.size}" + } + + val parameter = typeParameters[i] + transformToTypeProjection(javaTypeArgument, howTheProjectionIsUsed.toAttributes(), parameter) }.toList() }