release: v0.2.1

Author: ForteScarlet

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

@@ -117,6 +117,11 @@ data class MarkAnnotation @JvmOverloads constructor(
      * 当 [suffixProperty] 不存在时使用的默认后缀
      */
     val defaultSuffix: String = "",
+
+    /**
+     * 当 [asPropertyProperty] 不存在时使用的默认值
+     */
+    val defaultAsProperty: Boolean = false,
 )
 
 

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

@@ -102,7 +102,7 @@ open class SuspendTransformSyntheticResolveExtension(open val configuration: Sus
         ) {
             if (annotationData == null) return
 
-            if (annotationData.asProperty == true && descriptors.valueParameters.isEmpty()) {
+            if (annotationData.asProperty && descriptors.valueParameters.isEmpty()) {
                 syntheticProperties.addSyntheticDescriptors(
                     thisDescriptor,
                     descriptors.transformToProperty(annotationData)
@@ -147,13 +147,14 @@ open class SuspendTransformSyntheticResolveExtension(open val configuration: Sus
                                 ?: transformer.resolveAnnotationData(
                                     originFunction, originFunction.containingDeclaration, originFunction.name.identifier
                                 )
-                                ?: originFunction.findSuspendOverridden()?.let { superFunction ->
-                                    transformer.resolveAnnotationData(
-                                        superFunction,
-                                        superFunction.containingDeclaration,
-                                        superFunction.name.identifier
-                                    )
-                                }
+                                // 不检测'继承'的注解
+                                // ?: originFunction.findSuspendOverridden()?.let { superFunction ->
+                                //     transformer.resolveAnnotationData(
+                                //         superFunction,
+                                //         superFunction.containingDeclaration,
+                                //         superFunction.name.identifier
+                                //     )
+                                // }
                         }
                 }
 
@@ -215,7 +216,7 @@ open class SuspendTransformSyntheticResolveExtension(open val configuration: Sus
                 originFunction,
                 annotationData.functionName,
                 copyAnnotations(originFunction, transformer),
-                SuspendTransformUserData(originFunction, asProperty = annotationData.asProperty ?: false, transformer),
+                SuspendTransformUserData(originFunction, asProperty = annotationData.asProperty, transformer),
                 transformer
             ).also { it.init() }
         }

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

@@ -38,7 +38,8 @@ data class TransformAnnotationData(
     val annotationDescriptor: AnnotationDescriptor,
     val baseName: String?,
     val suffix: String?,
-    val asProperty: Boolean?,
+    val rawAsProperty: Boolean?,
+    val asProperty: Boolean,
     val functionName: String,
 ) {
     companion object {
@@ -49,6 +50,7 @@ data class TransformAnnotationData(
             annotationAsPropertyPropertyName: String = "asProperty",
             defaultBaseName: String,
             defaultSuffix: String,
+            defaultAsProperty: Boolean,
         ): TransformAnnotationData {
             val baseName = annotationDescriptor.argumentValue(annotationBaseNamePropertyName)
                 ?.accept(AbstractNullableAnnotationArgumentVoidDataVisitor.stringOnly, null)
@@ -57,15 +59,18 @@ data class TransformAnnotationData(
             val suffix = annotationDescriptor.argumentValue(annotationSuffixPropertyName)
                 ?.accept(AbstractNullableAnnotationArgumentVoidDataVisitor.stringOnly, null)
 
-            val asProperty = annotationDescriptor.argumentValue(annotationAsPropertyPropertyName)
+
+            val rawAsProperty = annotationDescriptor.argumentValue(annotationAsPropertyPropertyName)
                 ?.accept(AbstractNullableAnnotationArgumentVoidDataVisitor.booleanOnly, null)
+
             val functionName = "${baseName ?: defaultBaseName}${suffix ?: defaultSuffix}"
 
             return TransformAnnotationData(
                 annotationDescriptor,
                 baseName,
                 suffix,
-                asProperty,
+                rawAsProperty,
+                rawAsProperty ?: defaultAsProperty,
                 functionName,
             )
         }
@@ -97,6 +102,7 @@ fun Transformer.resolveAnnotationData(
             annotationAsPropertyPropertyName,
             defaultBaseName,
             markAnnotation.defaultSuffix,
+            markAnnotation.defaultAsProperty,
         )
     }
 }