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

[FIR-IDE] Fix generating conversions for pair with non-trivial converters

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-06-03 12:40:11 +03:00
committed by teamcityserver
parent b363d95160
commit faadb08174
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLParameterConversion.kt
+8 -1
View File
@@ -90,7 +90,14 @@ class HLPairParameterConversion(
private val mappingConversionFirst: HLParameterConversion, private val mappingConversionFirst: HLParameterConversion,
private val mappingConversionSecond: HLParameterConversion, private val mappingConversionSecond: HLParameterConversion,
) : HLParameterConversion() { ) : HLParameterConversion() {
override fun convertExpression(expression: String, context: ConversionContext): String = expression override fun convertExpression(expression: String, context: ConversionContext): String {
if (mappingConversionFirst.isTrivial && mappingConversionSecond.isTrivial) {
return expression
}
val first = mappingConversionFirst.convertExpression("$expression.first", context)
val second = mappingConversionSecond.convertExpression("$expression.second", context)
return "$first to $second"
}
override fun convertType(type: KType): KType { override fun convertType(type: KType): KType {
val first = type.arguments.getOrNull(0)?.type ?: return type val first = type.arguments.getOrNull(0)?.type ?: return type