Merge branch 'kt-22-20' into dev

# Conflicts:
#	buildSrc/src/main/kotlin/IProject.kt
#	gradle/libs.versions.toml
#	kotlin-js-store/wasm/yarn.lock
#	kotlin-js-store/yarn.lock

Author: ForteScarlet

.changelog/v2.2.20-Beta1-0.13.1.md

@@ -0,0 +1 @@
+Kotlin version: `v2.2.20-Beta1`

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.2.10"
+    val ktVersion = "2.2.20-Beta1"
     val pluginVersion = "0.13.1"
 
     override val version: String = "$ktVersion-$pluginVersion"

compiler/suspend-transform-plugin/build.gradle.kts

@@ -56,8 +56,7 @@ kotlin {
         )
         freeCompilerArgs.addAll(
             "-Xjvm-default=all",
-//            "-opt-in=kotlin.RequiresOptIn",
-//            "-opt-in=org.jetbrains.kotlin.ir.symbols.UnsafeDuringIrConstructionAPI",
+            "-Xcontext-parameters"
         )
     }
 }

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

@@ -348,11 +348,11 @@ class SuspendTransformFirTransformer(
         newFunTarget: FirFunctionTarget,
         transformer: Transformer
     ): FirBlock = buildBlock {
-        this.source = originFunc.body?.source
-
+        this.source = originFunSymbol.bodySource ?: originFunSymbol.source
         // lambda: suspend () -> T
         val lambdaTarget = FirFunctionTarget(null, isLambda = true)
         val lambda = buildAnonymousFunction {
+            this.source = originFunSymbol.bodySource ?: originFunSymbol.source
             this.resolvePhase = FirResolvePhase.BODY_RESOLVE
             // this.resolvePhase = FirResolvePhase.RAW_FIR
             this.isLambda = true
@@ -837,51 +837,50 @@ class SuspendTransformFirTransformer(
         val markAnnotation = syntheticFunData.transformer.markAnnotation
 
         if (func.isOverride && !isOverride) {
-            // func.processOverriddenFunctionsSafe()
-            func.processOverriddenFunctionsSafe(
-                checkContext
-            ) processOverridden@{ overriddenFunction ->
-                if (!isOverride) {
-                    // check parameters and receivers
-                    val resolvedReceiverTypeRef = overriddenFunction.resolvedReceiverTypeRef
-                    val originReceiverTypeRef = func.resolvedReceiverTypeRef
-
-                    // origin receiver should be the same as symbol receiver
-                    if (originReceiverTypeRef != resolvedReceiverTypeRef) {
-                        return@processOverridden
-                    }
+            with(checkContext) {
+                func.processOverriddenFunctionsSafe processOverridden@{ overriddenFunction ->
+                    if (!isOverride) {
+                        // check parameters and receivers
+                        val resolvedReceiverTypeRef = overriddenFunction.resolvedReceiverTypeRef
+                        val originReceiverTypeRef = func.resolvedReceiverTypeRef
+
+                        // origin receiver should be the same as symbol receiver
+                        if (originReceiverTypeRef != resolvedReceiverTypeRef) {
+                            return@processOverridden
+                        }
 
-                    // all value parameters should be a subtype of symbol's value parameters
-                    val symbolParameterSymbols = overriddenFunction.valueParameterSymbols
-                    val originParameterSymbols = func.valueParameterSymbols
+                        // all value parameters should be a subtype of symbol's value parameters
+                        val symbolParameterSymbols = overriddenFunction.valueParameterSymbols
+                        val originParameterSymbols = func.valueParameterSymbols
 
-                    if (symbolParameterSymbols.size != originParameterSymbols.size) {
-                        return@processOverridden
-                    }
-
-                    for ((index, symbolParameter) in symbolParameterSymbols.withIndex()) {
-                        val originParameter = originParameterSymbols[index]
-                        if (
-                            originParameter.resolvedReturnType != symbolParameter.resolvedReturnType
-                        ) {
+                        if (symbolParameterSymbols.size != originParameterSymbols.size) {
                             return@processOverridden
                         }
-                    }
 
-                    val overriddenAnnotation = firAnnotation(
-                        overriddenFunction, markAnnotation, overriddenFunction.getContainingClassSymbol()
-                    ) ?: return@processOverridden
+                        for ((index, symbolParameter) in symbolParameterSymbols.withIndex()) {
+                            val originParameter = originParameterSymbols[index]
+                            if (
+                                originParameter.resolvedReturnType != symbolParameter.resolvedReturnType
+                            ) {
+                                return@processOverridden
+                            }
+                        }
 
-                    val overriddenAnnoData = overriddenAnnotation.toTransformAnnotationData(
-                        markAnnotation, overriddenFunction.name.asString()
-                    )
+                        val overriddenAnnotation = firAnnotation(
+                            overriddenFunction, markAnnotation, overriddenFunction.getContainingClassSymbol()
+                        ) ?: return@processOverridden
+
+                        val overriddenAnnoData = overriddenAnnotation.toTransformAnnotationData(
+                            markAnnotation, overriddenFunction.name.asString()
+                        )
 
-                    // Same functionName, same asProperty, the generated synthetic function will be same too.
-                    if (
-                        overriddenAnnoData.functionName == annoData.functionName
-                        && overriddenAnnoData.asProperty == annoData.asProperty
-                    ) {
-                        isOverride = true
+                        // Same functionName, same asProperty, the generated synthetic function will be same too.
+                        if (
+                            overriddenAnnoData.functionName == annoData.functionName
+                            && overriddenAnnoData.asProperty == annoData.asProperty
+                        ) {
+                            isOverride = true
+                        }
                     }
                 }
             }

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.2.10"
+kotlin = "2.2.20-Beta1"
 
 # https://www.jetbrains.com/help/kotlin-multiplatform-dev/multiplatform-publish-libraries.html#configure-the-project
 # https://github.com/vanniktech/gradle-maven-publish-plugin