Update Kotlin to 2.2.0-Beta1

Author: ForteScarlet

buildSrc/src/main/kotlin/IProject.kt

@@ -10,7 +10,7 @@ object IProject : ProjectDetail() {
     const val HOMEPAGE = "https://github.com/ForteScarlet/kotlin-suspend-transform-compiler-plugin"
 
     // Remember the libs.versions.toml!
-    val ktVersion = "2.1.20"
+    val ktVersion = "2.2.0-Beta1"
     val pluginVersion = "0.12.0"
 
     override val version: String = "$ktVersion-$pluginVersion"

compiler/suspend-transform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/SuspendTransformUserData.kt

@@ -331,6 +331,6 @@ private infix fun IrTypeParameter.isSameAs(typeParameter: TypeParameter): Boolea
 }
 
 private infix fun IrValueParameter.isSameAs(valueParameter: ValueParameter): Boolean {
-    if (index != valueParameter.index) return false
+    if (indexInParameters != valueParameter.index) return false
     return type.classFqName == valueParameter.type?.asSingleFqName()
 }

compiler/suspend-transform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/fir/SuspendTransformFirTransformer.kt

@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.fir.caches.firCachesFactory
 import org.jetbrains.kotlin.fir.caches.getValue
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.builder.*
-import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl
 import org.jetbrains.kotlin.fir.declarations.utils.isFinal
 import org.jetbrains.kotlin.fir.declarations.utils.isOverride
 import org.jetbrains.kotlin.fir.declarations.utils.isSuspend
@@ -57,7 +56,6 @@ import org.jetbrains.kotlin.platform.isJs
 import org.jetbrains.kotlin.platform.isWasm
 import org.jetbrains.kotlin.platform.jvm.isJvm
 import org.jetbrains.kotlin.platform.konan.isNative
-import org.jetbrains.kotlin.realElement
 import org.jetbrains.kotlin.utils.keysToMap
 import java.util.concurrent.ConcurrentHashMap
 
@@ -361,7 +359,8 @@ class SuspendTransformFirTransformer(
             this.origin = FirDeclarationOrigin.Plugin(SuspendTransformK2V3Key)
             this.returnTypeRef = originFunSymbol.resolvedReturnTypeRef
             this.hasExplicitParameterList = false
-            this.status = FirResolvedDeclarationStatusImpl.DEFAULT_STATUS_FOR_SUSPEND_FUNCTION_EXPRESSION
+            // this.status = FirResolvedDeclarationStatusImpl.DEFAULT_STATUS_FOR_SUSPEND_FUNCTION_EXPRESSION
+            this.status = this.status.copy(isSuspend = true)
             this.symbol = FirAnonymousFunctionSymbol()
             this.body = buildSingleExpressionBlock(
                 buildReturnExpression {
@@ -845,11 +844,11 @@ class SuspendTransformFirTransformer(
             ) processOverridden@{ overriddenFunction ->
                 if (!isOverride) {
                     // check parameters and receivers
-                    val symbolReceiver = overriddenFunction.receiverParameter
-                    val originReceiver = func.receiverParameter
+                    val resolvedReceiverTypeRef = overriddenFunction.resolvedReceiverTypeRef
+                    val originReceiverTypeRef = func.resolvedReceiverTypeRef
 
                     // origin receiver should be the same as symbol receiver
-                    if (originReceiver?.typeRef != symbolReceiver?.typeRef) {
+                    if (originReceiverTypeRef != resolvedReceiverTypeRef) {
                         return@processOverridden
                     }
 
@@ -1196,7 +1195,7 @@ class SuspendTransformFirTransformer(
                 .filter { it.callableId.callableName == functionName }
                 // overridable receiver parameter.
                 .filter {
-                    thisReceiverTypeRef sameAs it.receiverParameter?.typeRef
+                    thisReceiverTypeRef sameAs it.resolvedReceiverTypeRef
                 }
                 .any()
         } else {
@@ -1214,7 +1213,7 @@ class SuspendTransformFirTransformer(
                 .filter { it.callableId.callableName == functionName }
                 // overridable receiver parameter.
                 .filter {
-                    thisReceiverTypeRef sameAs it.receiverParameter?.typeRef
+                    thisReceiverTypeRef sameAs it.resolvedReceiverTypeRef
                 }
                 // overridable value parameters
                 .filter {

compiler/suspend-transform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/utils/IrFunctionUtils.kt

@@ -78,7 +78,8 @@ fun IrPluginContext.createSuspendLambdaWithCoroutineScope(
             addField(it.name.identifierOrMappedSpecialName.synthesizedName, it.type)
         }
 
-        createImplicitParameterDeclarationWithWrappedDescriptor()
+        // createImplicitParameterDeclarationWithWrappedDescriptor()
+        createThisReceiverParameter()
 
         addConstructor {
             isPrimary = true

compiler/suspend-transform-plugin/src/test/love/forte/plugin/suspendtrans/runners/AbstractTestRunner.kt

@@ -4,10 +4,11 @@ import love.forte.plugin.suspendtrans.services.SuspendTransformerEnvironmentConf
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.test.FirParser
 import org.jetbrains.kotlin.test.TargetBackend
+import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.builders.configureFirHandlersStep
 import org.jetbrains.kotlin.test.builders.configureJvmArtifactsHandlersStep
-import org.jetbrains.kotlin.test.configuration.commonConfigurationForTest
+import org.jetbrains.kotlin.test.configuration.commonConfigurationForJvmTest
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_PARSER
 import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter
 import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
@@ -59,19 +60,20 @@ abstract class AbstractTestRunner : AbstractKotlinCompilerTest() {
 
         when (targetFrontend) {
             FrontendKinds.ClassicFrontend -> {
-                builder.commonConfigurationForTest(
+                builder.commonConfigurationForJvmTest(
                     FrontendKinds.ClassicFrontend,
                     ::ClassicFrontendFacade,
                     ::ClassicFrontend2IrConverter,
-                    // ::JvmIrBackendFacade
+                    ::JvmIrBackendFacade
                 ) // { }
             }
+
             FrontendKinds.FIR -> {
-                builder.commonConfigurationForTest(
+                builder.commonConfigurationForJvmTest(
                     FrontendKinds.FIR,
                     ::FirFrontendFacade,
                     ::Fir2IrResultsConverter,
-                    // ::JvmIrBackendFacade
+                    ::JvmIrBackendFacade
                 ) // { }
             }
         }

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ kotlinx-coroutines = "1.8.0"
 kotlinx-serialization = "1.7.1"
 google-auto-service = "1.0.1"
 # Remember the `IProject.ktVersion`!
-kotlin = "2.1.20"
+kotlin = "2.2.0-Beta1"
 
 [libraries]