Merge pull request #76 from ForteScarlet/logical-downgrade

If the TargetMarker match is unsuccessful, then continue with the original logic.
ForteScarlet · Jan 19, 2025 · e8a054e · e8a054e
2 parents 2a672b4 + 4857c20
commit e8a054e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/buildSrc/src/main/kotlin/IProject.kt b/buildSrc/src/main/kotlin/IProject.kt
@@ -11,7 +11,7 @@ object IProject : ProjectDetail() {
 
     // Remember the libs.versions.toml!
     val ktVersion = "2.1.0"
-    val pluginVersion = "0.10.0"
+    val pluginVersion = "0.10.1"
 
     override val version: String = "$ktVersion-$pluginVersion"
 

diff --git a/...ansform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/SuspendTransformUserData.kt b/...ansform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/SuspendTransformUserData.kt
@@ -277,10 +277,13 @@ private fun FirValueParameter.toValueParameter(session: FirSession, index: Int):
 fun OriginSymbol.checkSame(markerId: String, declaration: IrFunction): Boolean {
     if (targetMarker != null) {
         val anno = declaration.annotations.firstOrNull { it.symbol.owner.parentAsClass.classId == targetMarker }
-        if (anno == null) return false
-
-        val valueArgument = anno.getValueArgument(Name.identifier("value")) as? IrConst ?: return false
-        return markerId == valueArgument.value
+        if (anno != null) {
+            val valueArgument = anno.getValueArgument(Name.identifier("value")) as? IrConst
+            if (markerId == valueArgument?.value) {
+                return true
+            }
+        }
+        // 如果匹配不成功，继续原本的逻辑
     }
 
     // callableId