Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ fun FieldInfo.mapFieldToRegisteredSignal(settings: Settings, classInfo: ClassInf
parameterValues
.getValue(signalParametersName) as Array<String>
).toList(),
isFunctionReference = classInfo.isScala,
isOverridee = isOverridee,
annotations = annotations.mapNotNull { it.mapToGodotAnnotation(this, fqName) as? PropertyAnnotation },
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ object SignalRegistrationGenerator {
}

private fun getStringTemplate(registeredSignal: RegisteredSignal): String = buildString {
append("signal(%L")
append(if (registeredSignal.isFunctionReference) "signalFunction(%L" else "signalProperty(%L")
repeat(kotlin.math.max(registeredSignal.parameterTypes.size, registeredSignal.parameterNames.size)) {
append(", %T(%M, %S, %S)")
}
Expand Down Expand Up @@ -68,4 +68,3 @@ object SignalRegistrationGenerator {
.reference()
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ data class RegisteredSignal(
val type: Type,
val parameterTypes: List<Type>,
val parameterNames: List<String>,
val isFunctionReference: Boolean = false,
val isOverridee: Boolean = false,
val annotations: List<PropertyAnnotation> = emptyList(),
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import godot.core.KtRpcConfig
import godot.core.KtSignalInfo
import godot.core.NotificationFunction
import godot.core.PropertyHint
import godot.core.Signal
import godot.internal.reflection.TypeManager
import godot.core.VariantParser
import godot.core.toVariantArray
Expand Down Expand Up @@ -1185,12 +1186,12 @@ class ClassBuilderDsl<T : KtObject>(
)
}

fun <T> signal(kProperty: KProperty<T>, vararg parameters: KtFunctionArgument) = signal(
fun <T> signalProperty(kProperty: KProperty<T>, vararg parameters: KtFunctionArgument) = signal(
kProperty.name.convertToSnakeCase(),
*parameters
)

fun <T> signal(kFunction: KFunction<T>, vararg parameters: KtFunctionArgument) = signal(
fun <T : Signal> signalFunction(kFunction: KFunction<T>, vararg parameters: KtFunctionArgument) = signal(
kFunction.name.convertToSnakeCase(),
*parameters
)
Expand Down
Loading