Moved resolve of type arguments into other place

This commit is contained in:
Valentin Kipyatkov
2015-08-10 19:16:37 +03:00
parent e3bca3010c
commit bce691bf8c
@@ -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"))
}