Fix on destroy registration

utopia-rise · Oct 13, 2024 · b313ec7 · b313ec7
1 parent 1afeba8
commit b313ec7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/harness/tests/scripts/godot/tests/Invocation.gdj b/harness/tests/scripts/godot/tests/Invocation.gdj
@@ -82,6 +82,7 @@ functions = [
  init_nullables,
  _enter_tree,
  _ready,
+ _on_destroy,
  get_rid_id,
  get_nav_mesh_rid,
  append_to_any_dict,

diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt b/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt
@@ -44,7 +44,6 @@ import godot.codegen.services.IEnumService
 import godot.codegen.services.IGenerationService
 import godot.codegen.traits.CallableTrait
 import godot.codegen.traits.addKdoc
-import godot.tools.common.constants.TO_GODOT_NAME_UTIL_FUNCTION
 import godot.tools.common.constants.CORE_TYPE_HELPER
 import godot.tools.common.constants.CORE_TYPE_LOCAL_COPY
 import godot.tools.common.constants.GENERATED_COMMENT
@@ -54,6 +53,7 @@ import godot.tools.common.constants.GODOT_ERROR
 import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.GodotTypes
 import godot.tools.common.constants.KT_OBJECT
+import godot.tools.common.constants.TO_GODOT_NAME_UTIL_FUNCTION
 import godot.tools.common.constants.TRANSFER_CONTEXT
 import godot.tools.common.constants.TYPE_MANAGER
 import godot.tools.common.constants.VARIANT_CASTER_ANY
@@ -674,6 +674,9 @@ class GenerationService(
  addFunction(
  FunSpec.builder("_onDestroy")
  .addModifiers(KModifier.OVERRIDE, KModifier.FINAL)
+ // needed as we override the base function.
+ // in order for the entry gen to detect that this is not a user override, we need to declare this override an api member
+ .addAnnotation(GODOT_API_MEMBER)
  .returns(Unit::class)
  .addStatement("")
  .build()

diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt