build: try release 0.0.6

Author: ForteScarlet

.idea/.name

@@ -15,10 +15,13 @@ allprojects {
         mavenLocal()
         mavenCentral()
         gradlePluginPortal()
+        //maven {
+        //    url = URI("")
+        //}
     }
     this.tasks.withType<JavaCompile> {
-        sourceCompatibility = "11"
-        targetCompatibility = "11"
+        sourceCompatibility = "1.8"
+        targetCompatibility = "1.8"
     }
     this.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions.jvmTarget = "1.8"

.idea/artifacts/suspend_transform_annotation_js_0_0_4.xml

@@ -22,7 +22,7 @@ dependencies {
     api("gradle.plugin.com.bnorm.power:kotlin-power-assert-gradle:0.12.0")
     api("io.github.gradle-nexus:publish-plugin:1.1.0")
 
-    // api("com.github.jengelman.gradle.plugins:shadow:6.1.0")
+     api("com.github.jengelman.gradle.plugins:shadow:6.1.0")
 }
 
 

.idea/artifacts/suspend_transform_annotation_js_0_0_5.xml

@@ -1,5 +1,5 @@
 object IProject {
-    const val VERSION = "0.0.5"
+    const val VERSION = "0.0.6"
     const val GROUP = "love.forte.plugin.suspend-transform"
     const val DESCRIPTION = "Generate platform-compatible functions for Kotlin suspend functions"
 

.idea/artifacts/suspend_transform_annotation_js_0_0_6.xml

@@ -25,8 +25,6 @@ fun KotlinMultiplatformExtension.configAllNativeTargets(
 ) {
     presets.all {
         if (this !is KotlinNativeTargetPreset || !filter(this)) return@all
-        println(this)
-        println(this.name)
         configureOrCreate(name, this, configureEach)
     }
 }

.idea/artifacts/suspend_transform_annotation_jvm_0_0_4.xml

@@ -15,15 +15,15 @@ description = "Generate platform-compatible functions for Kotlin suspend functio
 val isPublishConfigurable = isPublishConfigurable()
 
 if (!isPublishConfigurable) {
-    println("[WARN] - sonatype.username or sonatype.password is null, cannot config nexus publishing.")
+    logger.warn("sonatype.username or sonatype.password is null, cannot config nexus publishing.")
 }
 
 
 if (isPublishConfigurable) {
     val (sonatypeUsername, sonatypePassword) = sonatypeUserInfo
     nexusPublishing {
-        println("[NEXUS] - project.group:   ${project.group}")
-        println("[NEXUS] - project.version: ${project.version}")
+        logger.info("[NEXUS] - project.group:   ${project.group}")
+        logger.info("[NEXUS] - project.version: ${project.version}")
         packageGroup by project.group.toString()
         repositoryDescription by (project.description ?: "")
 
@@ -50,7 +50,7 @@ if (isPublishConfigurable) {
     }
 
 
-    println("[nexus-publishing-configure] - [$name] configured.")
+    logger.info("[nexus-publishing-configure] - [{}] configured.", name)
 }
 
 

.idea/artifacts/suspend_transform_annotation_jvm_0_0_5.xml

@@ -9,10 +9,7 @@ plugins {
     id("suspend-transform.jvm-maven-publish")
     id("com.bennyhuo.kotlin.plugin.embeddable.test") version "1.7.10.0"
 }
-buildscript {
-    plugins {
-    }
-}
+
 dependencies {
     compileOnly(kotlin("stdlib"))
     compileOnly(kotlin("compiler"))
@@ -22,19 +19,30 @@ dependencies {
 
     testImplementation(kotlin("stdlib"))
     testImplementation(kotlin("test-junit"))
-    testImplementation(kotlin("compiler-embeddable"))
+//    testImplementation(kotlin("compiler-embeddable"))
+    testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable")
 
     testImplementation(project(":runtime:suspend-transform-annotation"))
     testImplementation(project(":runtime:suspend-transform-runtime"))
 
 //    testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.4.9")
-    testImplementation("org.bitbucket.mstrobel:procyon-compilertools:0.6.0")
-    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.7.10.1")
+//    testImplementation("org.bitbucket.mstrobel:procyon-compilertools:0.6.0")
+    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.7.10.2-SNAPSHOT")
 
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
     // testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4")
 }
 val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions.freeCompilerArgs += listOf("-Xjvm-default=enable", "-opt-in=kotlin.RequiresOptIn")
+
+repositories {
+    maven {
+        url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        mavenContent {
+            snapshotsOnly()
+        }
+    }
+}
 
 buildConfig {
     useKotlinOutput {

.idea/artifacts/suspend_transform_annotation_jvm_0_0_6.xml

@@ -12,15 +12,15 @@ import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension
 @AutoService(ComponentRegistrar::class)
 class SuspendTransformComponentRegistrar : ComponentRegistrar {
 
-    internal var defaultConfiguration: SuspendTransformConfiguration? = null
+    //internal var defaultConfiguration: SuspendTransformConfiguration? = null
 
 
     override fun registerProjectComponents(
         project: MockProject,
         configuration: CompilerConfiguration,
     ) {
 
-        val suspendTransformConfiguration = defaultConfiguration ?: configuration.resolveToSuspendTransformConfiguration()
+        val suspendTransformConfiguration =/* defaultConfiguration ?: */configuration.resolveToSuspendTransformConfiguration()
 
         if (suspendTransformConfiguration.enabled) {
             SyntheticResolveExtension.registerExtension(project, SuspendTransformSyntheticResolveExtension(suspendTransformConfiguration))

.idea/artifacts/suspend_transform_runtime_js_0_0_4.xml

@@ -1,12 +1,10 @@
 package love.forte.plugin.suspendtrans.ir
 
 import love.forte.plugin.suspendtrans.*
-import love.forte.plugin.suspendtrans.utils.createIrBuilder
-import love.forte.plugin.suspendtrans.utils.createSuspendLambdaWithCoroutineScope
-import love.forte.plugin.suspendtrans.utils.irAnnotationConstructor
-import love.forte.plugin.suspendtrans.utils.paramsAndReceiversAsParamsList
+import love.forte.plugin.suspendtrans.utils.*
 import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
+import org.jetbrains.kotlin.builtins.StandardNames.COROUTINES_PACKAGE_FQ_NAME
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.IrStatement
@@ -15,18 +13,16 @@ import org.jetbrains.kotlin.ir.builders.irBlockBody
 import org.jetbrains.kotlin.ir.builders.irCall
 import org.jetbrains.kotlin.ir.builders.irGet
 import org.jetbrains.kotlin.ir.builders.irReturn
-import org.jetbrains.kotlin.ir.declarations.IrDeclaration
-import org.jetbrains.kotlin.ir.declarations.IrDeclarationContainer
-import org.jetbrains.kotlin.ir.declarations.IrFunction
-import org.jetbrains.kotlin.ir.declarations.IrProperty
+import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrBody
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.types.typeWith
-import org.jetbrains.kotlin.ir.util.isAnnotationWithEqualFqName
-import org.jetbrains.kotlin.ir.util.primaryConstructor
+import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.platform.js.isJs
 import org.jetbrains.kotlin.platform.jvm.isJvm
+import org.jetbrains.kotlin.serialization.deserialization.KOTLIN_SUSPEND_BUILT_IN_FUNCTION_FQ_NAME
 
 /**
  *
@@ -145,7 +141,7 @@ class SuspendTransformTransformer(
         if (parent is IrDeclarationContainer) {
             val originFunctions = parent.declarations.filterIsInstance<IrFunction>()
                 .filter { f -> f.descriptor == originFunctionDescriptor }
-            function.descriptor
+
             if (originFunctions.size != 1) {
                 // maybe override function
                 /*
@@ -209,6 +205,27 @@ private fun generateTransformBodyForFunction(
                     putValueArgument(index, irGet(parameter))
                 }
             })
+            // argument: 1, if is CoroutineScope, and this is CoroutineScope.
+            //println("transformTargetFunctionCall.owner: ${transformTargetFunctionCall.owner}")
+            //println(transformTargetFunctionCall.owner.valueParameters)
+            val owner = transformTargetFunctionCall.owner
+
+            if (owner.valueParameters.size > 1) {
+                val secondType = owner.valueParameters[1].type
+                KOTLIN_SUSPEND_BUILT_IN_FUNCTION_FQ_NAME
+                val coroutineScopeTypeName = COROUTINES_PACKAGE_FQ_NAME.child(Name.identifier("CoroutineScope"))
+                val coroutineScopeTypeNameUnsafe = coroutineScopeTypeName.toUnsafe()
+                if (secondType.isClassType(coroutineScopeTypeNameUnsafe)) {
+                    originFunction.dispatchReceiverParameter?.also { dispatchReceiverParameter ->
+                        if (dispatchReceiverParameter.type.isClassType(coroutineScopeTypeNameUnsafe)) {
+                            // put 'this' to second arg
+                            putValueArgument(1, irGet(dispatchReceiverParameter))
+                        }
+                    }
+                }
+
+            }
+
         })
     }
 }