Kapt3: Write qualified name of classes on error type conversion, handle declaration-site variance properly.

This commit is contained in:
Yan Zhulanow
2017-01-22 00:07:06 +09:00
parent 72bbf9697b
commit 3b4a8e0f33
6 changed files with 80 additions and 35 deletions
@@ -634,7 +634,7 @@ public class KotlinTypeMapper {
}
@NotNull
private static Variance getVarianceForWildcard(
public static Variance getVarianceForWildcard(
@NotNull TypeParameterDescriptor parameter,
@NotNull TypeProjection projection,
@NotNull TypeMappingMode mode
@@ -75,7 +75,7 @@ private val METHODS_WITH_DECLARATION_SITE_WILDCARDS = setOf(
BUILTIN_NAMES.mutableMap.child("putAll")
)
internal fun TypeMappingMode.updateArgumentModeFromAnnotations(type: KotlinType): TypeMappingMode {
fun TypeMappingMode.updateArgumentModeFromAnnotations(type: KotlinType): TypeMappingMode {
type.suppressWildcardsMode()?.let {
return TypeMappingMode.createWithConstantDeclarationSiteWildcardsMode(
skipDeclarationSiteWildcards = it, isForAnnotationParameter = isForAnnotationParameter)