Moved resolve of type arguments into other place
This commit is contained in:
@@ -110,6 +110,12 @@ public class TypeResolver(
|
|||||||
val type = resolveTypeElement(c, annotations, typeElement)
|
val type = resolveTypeElement(c, annotations, typeElement)
|
||||||
c.trace.record(BindingContext.TYPE_RESOLUTION_SCOPE, typeReference, c.scope)
|
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
|
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"))
|
return result ?: type(ErrorUtils.createErrorType(typeElement?.getDebugText() ?: "No type element"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user