Add markName support for JVM and JS annotations in synthetic function generation and testing

Author: ForteScarlet

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

@@ -405,6 +405,17 @@ object SuspendTransformConfigurations {
  //endregion
 
  //region JVM Defaults
+
+ /**
+ * The `kotlin.jvm.JvmName`.
+ * @since 0.13.0
+ */
+ @JvmStatic
+ val jvmNameAnnotationClassInfo = ClassInfo(
+ packageName = KOTLIN_JVM,
+ className = "JvmName"
+ )
+
  @JvmStatic
  val jvmSyntheticClassInfo = ClassInfo(
  packageName = KOTLIN_JVM,
@@ -426,7 +437,12 @@ object SuspendTransformConfigurations {
  @JvmStatic
  val jvmBlockingAnnotationInfo = MarkAnnotation(
  classInfo = jvmBlockingMarkAnnotationClassInfo,
- defaultSuffix = "Blocking"
+ defaultSuffix = "Blocking",
+ markNameProperty = MarkNameProperty(
+ propertyName = "markName",
+ annotation = jvmNameAnnotationClassInfo,
+ annotationMarkNamePropertyName = "name"
+ )
  )
 
  @JvmStatic
@@ -444,17 +460,12 @@ object SuspendTransformConfigurations {
  @JvmStatic
  val jvmAsyncAnnotationInfo = MarkAnnotation(
  classInfo = jvmAsyncMarkAnnotationClassInfo,
- defaultSuffix = "Async"
- )
-
- /**
- * The `kotlin.jvm.JvmName`.
- * @since 0.13.0
- */
- @JvmStatic
- val jvmNameAnnotationClassInfo = ClassInfo(
- packageName = KOTLIN_JVM,
- className = "JvmName"
+ defaultSuffix = "Async",
+ markNameProperty = MarkNameProperty(
+ propertyName = "markName",
+ annotation = jvmNameAnnotationClassInfo,
+ annotationMarkNamePropertyName = "name"
+ )
  )
 
  @JvmStatic
@@ -508,6 +519,17 @@ object SuspendTransformConfigurations {
  //endregion
 
  //region JS Defaults
+
+ /**
+ * The `kotlin.js.JsName`.
+ * @since 0.13.0
+ */
+ @JvmStatic
+ val jsNameAnnotationClassInfo = ClassInfo(
+ packageName = KOTLIN_JS,
+ className = "JsName"
+ )
+
  @JvmStatic
  val kotlinJsExportClassInfo = ClassInfo(
  packageName = KOTLIN_JS,
@@ -535,17 +557,12 @@ object SuspendTransformConfigurations {
  @JvmStatic
  val jsAsyncAnnotationInfo = MarkAnnotation(
  classInfo = jsAsyncMarkAnnotationClassInfo,
- defaultSuffix = "Async"
- )
-
- /**
- * The `kotlin.js.JsName`.
- * @since 0.13.0
- */
- @JvmStatic
- val jsNameAnnotationClassInfo = ClassInfo(
- packageName = KOTLIN_JS,
- className = "JsName"
+ defaultSuffix = "Async",
+ markNameProperty = MarkNameProperty(
+ propertyName = "markName",
+ annotation = jsNameAnnotationClassInfo,
+ annotationMarkNamePropertyName = "name"
+ )
  )
 
  @JvmStatic

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

@@ -4,11 +4,14 @@ 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.handlers.AsmLikeInstructionListingHandler
+import org.jetbrains.kotlin.test.backend.handlers.BytecodeListingHandler
 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.commonConfigurationForJvmTest
+import org.jetbrains.kotlin.test.directives.AsmLikeInstructionListingDirectives.CHECK_ASM_LIKE_INSTRUCTIONS
 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
@@ -56,6 +59,7 @@ abstract class AbstractTestRunner : AbstractKotlinCompilerTest() {
 
  builder.defaultDirectives {
  FIR_PARSER with FirParser.LightTree
+ +CHECK_ASM_LIKE_INSTRUCTIONS
  }
 
  when (targetFrontend) {
@@ -90,7 +94,12 @@ abstract class AbstractTestRunner : AbstractKotlinCompilerTest() {
 
  }
 
+ // We need to explicitly configure JVM artifacts handlers to generate .asm files
  builder.configureJvmArtifactsHandlersStep {
+ useHandlers(
+ ::BytecodeListingHandler,
+ ::AsmLikeInstructionListingHandler
+ )
  }
 
  builder.useConfigurators(

compiler/suspend-transform-plugin/src/testData/codegen/markName.fir.txt

@@ -8,14 +8,14 @@ FILE: Main.kt
  ^foo String(foo)
  }
 
- @R|love/forte/plugin/suspendtrans/annotation/Api4J|() public final fun fooBlocking(): R|kotlin/String| {
+ @R|love/forte/plugin/suspendtrans/annotation/Api4J|() @R|kotlin/jvm/JvmName|(name = String(foo)) public final fun fooBlocking(): R|kotlin/String| {
  ^fooBlocking R|love/forte/plugin/suspendtrans/runtime/$runInBlocking$|(suspend fun <anonymous>(): R|kotlin/String| <inline=Unknown> {
  ^ this@R|/Foo|.R|/Foo.foo|()
  }
  )
  }
 
- @R|love/forte/plugin/suspendtrans/annotation/Api4J|() public final fun fooAsync(): R|java/util/concurrent/CompletableFuture<out kotlin/String>| {
+ @R|love/forte/plugin/suspendtrans/annotation/Api4J|() @R|kotlin/jvm/JvmName|(name = String(foo)) public final fun fooAsync(): R|java/util/concurrent/CompletableFuture<out kotlin/String>| {
  ^fooAsync R|love/forte/plugin/suspendtrans/runtime/$runInAsync$|(suspend fun <anonymous>(): R|kotlin/String| <inline=Unknown> {
  ^ this@R|/Foo|.R|/Foo.foo|()
  }

runtime/suspend-transform-annotation/src/jsMain/kotlin/love.forte.plugin.suspendtrans/annotation/SuspendTransformAnnotationJs.kt

@@ -14,4 +14,26 @@ public actual annotation class JsPromise(
  actual val baseName: String,
  actual val suffix: String,
  actual val asProperty: Boolean,
+
+ /**
+ * The name of [@JsName][kotlin.js.JsName].
+ * Valid when not empty.
+ *
+ * If [markName] is valid, [@JsName][kotlin.js.JsName] will be annotated on the generated function.
+ *
+ * For example:
+ *
+ * ```Kotlin
+ * @JsPromise(markName = "markName_foo")
+ * suspend fun foo(): String = "..."
+ *
+ * // The generated fun:
+ * @JsName(name = "markName_foo")
+ * fun fooAsync(): Promise<out String> = runAsync { foo() }
+ * ```
+ *
+ *
+ * @since 0.13.0
+ */
+ actual val markName: String = "",
 )