Add Kotlin 2.1.20 support

CHANGELOG.md

@@ -14,6 +14,7 @@
 
 ### Updated
 
+- `Kotlin -> 2.1.20-Beta2`
 - `com.javiersc.hubdle:hubdle-version-catalog -> 0.4.4`
 - `com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin -> 0.8.3`
 

gradle.properties

@@ -29,7 +29,6 @@ pom.scm.developerConnection=scm:git:git@github.com:JavierSegoviaCordoba/kopy.git
 ###                                          Gradle                                              ###
 ####################################################################################################
 kotlin.code.style=official
-kotlin.js.compiler=ir
 org.gradle.caching=true
 #org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2048m

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 hubdle = "0.8.3"
 hubdleCatalog = "0.4.4"
-javiersc-kotlin-compiler-extensions = "0.5.2+2.1.10"
-jetbrains-kotlin = "2.1.10"
+javiersc-kotlin-compiler-extensions = "0.6.0+2.1.20-Beta2"
+jetbrains-kotlin = "2.1.20-Beta2"
 
 [libraries]
 hubdle-catalog = { module = "com.javiersc.hubdle:hubdle-version-catalog", version.ref = "hubdleCatalog" }

kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/checker/checkers/expression/BreakingCallsChecker.kt

@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
 import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirCallChecker
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter
 import org.jetbrains.kotlin.fir.declarations.hasAnnotation
 import org.jetbrains.kotlin.fir.declarations.utils.isData
 import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression
@@ -31,8 +32,8 @@ import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression
 import org.jetbrains.kotlin.fir.references.toResolvedFunctionSymbol
 import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.resolve.toRegularClassSymbol
-import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
+import org.jetbrains.kotlin.fir.symbols.impl.FirThisOwnerSymbol
 import org.jetbrains.kotlin.fir.types.resolvedType
 
 internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) {
@@ -95,7 +96,7 @@ internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) {
         val extensionReceiver: FirPropertyAccessExpression =
             setOrUpdateCall.extensionReceiver?.asFirOrNull<FirPropertyAccessExpression>()
                 ?: return Failure.BrokenChain(setOrUpdateCall)
-        val updateOrSetThisBoundSymbol: FirBasedSymbol<*> =
+        val updateOrSetThisBoundSymbol: FirThisOwnerSymbol<*> =
             setOrUpdateCall.dispatchReceiver
                 ?.asFirOrNull<FirThisReceiverExpression>()
                 ?.calleeReference
@@ -120,7 +121,11 @@ internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) {
                 ?.asFirOrNull<FirThisReceiverExpression>()
                 ?.calleeReference
                 ?.boundSymbol
-                ?.fir ?: return Failure.NoCopyScope(setOrUpdateCall)
+                ?.fir
+                ?.asFirOrNull<FirReceiverParameter>()
+                ?.containingDeclarationSymbol
+                ?.fir
+                ?: return Failure.NoCopyScope(setOrUpdateCall)
         val isCopyScope: Boolean =
             context.callsOrAssignments
                 .asSequence()
@@ -147,9 +152,9 @@ internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) {
 
     private fun FirExpression.isBreakingChainCall(
         session: FirSession,
-        updateOrSetThisBoundSymbol: FirBasedSymbol<*>
+        updateOrSetThisBoundSymbol: FirThisOwnerSymbol<*>,
     ): CheckerResult {
-        val thisBoundSymbol: FirBasedSymbol<*>? =
+        val thisBoundSymbol: FirThisOwnerSymbol<*>? =
             this.asFirOrNull<FirThisReceiverExpression>()?.calleeReference?.boundSymbol
         if (updateOrSetThisBoundSymbol == thisBoundSymbol) return Success
 
@@ -159,7 +164,7 @@ internal object BreakingCallsChecker : FirCallChecker(MppCheckerKind.Common) {
 
         val receiver: FirExpression? = this.dispatchReceiver
 
-        val dispatcherBoundSymbol: FirBasedSymbol<*>? =
+        val dispatcherBoundSymbol: FirThisOwnerSymbol<*>? =
             receiver?.asFirOrNull<FirThisReceiverExpression>()?.calleeReference?.boundSymbol
 
         val hasSameBoundSymbol: Boolean = dispatcherBoundSymbol == updateOrSetThisBoundSymbol

kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyAssignExpressionAltererExtension.kt

@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.expressions.buildUnaryArgumentList
 import org.jetbrains.kotlin.fir.expressions.builder.buildFunctionCall
 import org.jetbrains.kotlin.fir.expressions.builder.buildPropertyAccessExpression
 import org.jetbrains.kotlin.fir.expressions.calleeReference
-import org.jetbrains.kotlin.fir.expressions.contextReceiverArguments
+import org.jetbrains.kotlin.fir.expressions.contextArguments
 import org.jetbrains.kotlin.fir.expressions.dispatchReceiver
 import org.jetbrains.kotlin.fir.expressions.explicitReceiver
 import org.jetbrains.kotlin.fir.expressions.extensionReceiver
@@ -71,7 +71,7 @@ internal class FirKopyAssignExpressionAltererExtension(
                 explicitReceiver = variableAssignment.explicitReceiver
                 dispatchReceiver = variableAssignment.dispatchReceiver
                 extensionReceiver = variableAssignment.extensionReceiver
-                contextReceiverArguments += variableAssignment.contextReceiverArguments
+                contextArguments += variableAssignment.contextArguments
             }
             argumentList = buildUnaryArgumentList(rightArgument)
             calleeReference = buildSimpleNamedReference {

kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/ir/transformers/IrSetOrUpdateCallTransformer.kt

@@ -53,7 +53,7 @@ import org.jetbrains.kotlin.ir.types.classOrFail
 import org.jetbrains.kotlin.ir.types.typeWith
 import org.jetbrains.kotlin.ir.util.deepCopyWithSymbols
 import org.jetbrains.kotlin.ir.util.functions
-import org.jetbrains.kotlin.ir.util.getArguments
+import org.jetbrains.kotlin.ir.util.getArgumentsWithIr
 import org.jetbrains.kotlin.ir.util.getPropertyGetter
 import org.jetbrains.kotlin.ir.util.getSimpleFunction
 import org.jetbrains.kotlin.ir.util.indexOrMinusOne
@@ -90,9 +90,8 @@ internal class IrSetOrUpdateCallTransformer(
         return originalCallCallWithAlsoCall
     }
 
-    private inner class SetValueTransformer(
-        private val expressionCall: IrCall,
-    ) : IrElementTransformerVoid() {
+    private inner class SetValueTransformer(private val expressionCall: IrCall) :
+        IrElementTransformerVoid() {
         override fun visitExpression(expression: IrExpression): IrExpression {
             fun original(): IrExpression = super.visitExpression(expression)
             if (expression !in expressionCall.valueArguments) return original()
@@ -106,9 +105,8 @@ internal class IrSetOrUpdateCallTransformer(
         }
     }
 
-    private inner class UpdateReturnTransformer(
-        private val expressionCall: IrCall,
-    ) : IrElementTransformerVoid() {
+    private inner class UpdateReturnTransformer(private val expressionCall: IrCall) :
+        IrElementTransformerVoid() {
         override fun visitReturn(expression: IrReturn): IrExpression {
             fun original(): IrExpression = super.visitReturn(expression)
             val parent: IrDeclarationParent =
@@ -132,7 +130,7 @@ internal class IrSetOrUpdateCallTransformer(
 
     private fun IrPluginContext.createAlsoCall(
         expression: IrCall,
-        expressionParent: IrDeclarationParent
+        expressionParent: IrDeclarationParent,
     ): IrCall? {
         val setOrUpdateType: IrType = expression.extensionReceiver?.type ?: return null
 
@@ -171,7 +169,7 @@ internal class IrSetOrUpdateCallTransformer(
     private fun createAlsoBlockFunction(
         expressionParent: IrDeclarationParent,
         setOrUpdateType: IrType,
-        expression: IrCall
+        expression: IrCall,
     ): IrSimpleFunction? {
         val alsoBlockFunction: IrSimpleFunction =
             pluginContext.irFactory
@@ -197,7 +195,7 @@ internal class IrSetOrUpdateCallTransformer(
                                     ?: return null
                             val atomicGetterLazySetFunctionCall: IrCall? =
                                 expression.createAtomicGetterLazySetFunctionCall(
-                                    copyChainCall = copyChainCall,
+                                    copyChainCall = copyChainCall
                                 )
                             if (atomicGetterLazySetFunctionCall != null) {
                                 +atomicGetterLazySetFunctionCall
@@ -230,7 +228,7 @@ internal class IrSetOrUpdateCallTransformer(
                     val isLast: Boolean = next == dispatchers.last()
                     val argumentValue: IrDeclarationReference =
                         if (isLast) alsoItValueParameterGetValue
-                        else next.apply { this.dispatchReceiver = current }
+                        else next.apply { insertDispatchReceiver(current) }
 
                     val copyCall: IrCall? =
                         current.symbol.createCopyCall(
@@ -246,8 +244,8 @@ internal class IrSetOrUpdateCallTransformer(
         val copyChainCall: IrCall =
             calls.reduce { acc, irCall ->
                 val argumentIndex: Int =
-                    irCall.getArguments().firstNotNullOfOrNull {
-                        val index = it.first.indexOrMinusOne
+                    irCall.getArgumentsWithIr().firstNotNullOfOrNull { (valueParameter, _) ->
+                        val index: Int = valueParameter.descriptor.indexOrMinusOne
                         if (index != -1) index else null
                     } ?: return null
                 irCall.putValueArgument(argumentIndex, acc)
@@ -271,10 +269,10 @@ internal class IrSetOrUpdateCallTransformer(
         buildList {
             val extensionReceiver: IrMemberAccessExpression<*> =
                 runCatching {
-                    extensionReceiver
-                        ?.asIrOrNull<IrMemberAccessExpression<*>>()
-                        ?.deepCopyWithSymbols()
-                }
+                        extensionReceiver
+                            ?.asIrOrNull<IrMemberAccessExpression<*>>()
+                            ?.deepCopyWithSymbols()
+                    }
                     .getOrNull() ?: return@buildList
 
             add(extensionReceiver)
@@ -303,8 +301,7 @@ internal class IrSetOrUpdateCallTransformer(
                 val kotlinCopyFunctionSymbol: IrSimpleFunctionSymbol =
                     dataClass.owner.functions
                         .firstOrNull {
-                            it.name == copyName &&
-                                !it.hasAnnotation(kopyFunctionCopyFqName)
+                            it.name == copyName && !it.hasAnnotation(kopyFunctionCopyFqName)
                         }
                         ?.symbol ?: return null
                 irCall(kotlinCopyFunctionSymbol).apply {