From bce691bf8c05bf884796b2ac70d2cd6aa1a416ac Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 10 Aug 2015 19:16:37 +0300 Subject: [PATCH] Moved resolve of type arguments into other place --- .../src/org/jetbrains/kotlin/resolve/TypeResolver.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index 66b9b5049c8..a3bc7288c6d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -110,6 +110,12 @@ public class TypeResolver( val type = resolveTypeElement(c, annotations, typeElement) c.trace.record(BindingContext.TYPE_RESOLUTION_SCOPE, typeReference, c.scope) + if (!type.isBare) { + for (argument in type.actualType.arguments) { + ForceResolveUtil.forceResolveAllContents(argument.type) + } + } + return type } @@ -252,12 +258,6 @@ public class TypeResolver( } }) - if (result != null && !result!!.isBare) { - for (argument in result!!.actualType.arguments) { - ForceResolveUtil.forceResolveAllContents(argument.type) - } - } - return result ?: type(ErrorUtils.createErrorType(typeElement?.getDebugText() ?: "No type element")) }