azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use TypeSystemCommonBackendContext in KotlinTypeMapper.writeGenericArguments

Browse Source
This commit is contained in:
Alexander Udalov
2019-06-21 13:41:43 +02:00
parent 2585ce0aa7
commit c27d9c4546
5 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ErrorTypeCorrector.kt
+2 -1
View File
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.source.getPsi
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext
private typealias SubstitutionMap = Map<String, Pair<KtTypeParameter, KtTypeProjection>>
@@ -145,7 +146,7 @@ class ErrorTypeCorrector(
RETURN_TYPE -> TypeMappingMode.getOptimalModeForReturnType(kotlinType, false)
METHOD_PARAMETER_TYPE -> TypeMappingMode.getOptimalModeForValueParameter(kotlinType)
SUPER_TYPE -> TypeMappingMode.SUPER_TYPE
}.updateArgumentModeFromAnnotations(kotlinType)
}.updateArgumentModeFromAnnotations(kotlinType, SimpleClassicTypeSystemContext)
val typeParameters = (target as? ClassifierDescriptor)?.typeConstructor?.parameters
return treeMaker.TypeApply(baseExpression, mapJListIndexed(arguments) { index, projection ->