fix: Getter now calls method from parent even if getter stats with is

utopia-rise · Jun 10, 2021 · 8bd2d00 · 8bd2d00
1 parent 88ad27e
commit 8bd2d00
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 34 deletions.
diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/generationEntry.kt b/kt/api-generator/src/main/kotlin/godot/codegen/generationEntry.kt
@@ -3,6 +3,7 @@ package godot.codegen
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.squareup.kotlinpoet.*
+import godot.codegen.utils.convertToSnakeCase
 import godot.codegen.utils.getPackage
 import godot.codegen.utils.jvmVariantTypeValue
 import godot.docgen.ClassDoc
@@ -35,17 +36,18 @@ fun File.generateApiFrom(jsonSource: File, docsDir: File? = null) {
     classes.forEach { clazz ->
         clazz.properties.forEach { property ->
             val method = Method(
-                "get_${property.oldName}",
+                property.getter.convertToSnakeCase(),
                 property.type,
                 isVirtual = false,
                 hasVarargs = false,
                 arguments = listOf()
             )
             val parentClassAndMethod = tree.getMethodFromAncestor(clazz, method)
             if (parentClassAndMethod != null && !property.hasValidGetter) {
-                val parentMethodName = "get${parentClassAndMethod.first.newName}${property.newName.capitalize()}"
+                val isBoolGetter = property.getter.startsWith("is")
+                val parentMethodName = "${if (isBoolGetter) "is" else "get"}${parentClassAndMethod.first.newName}${property.newName.capitalize()}"
                 property.parentMethodToCall = parentMethodName
-                val find = parentClassAndMethod.first.methods.find { it.newName == "get${property.newName.capitalize()}" }
+                val find = parentClassAndMethod.first.methods.find { it.newName == property.getter }
                 if (find != null) {
                     methodsToRename[find] = parentMethodName
                 }

diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/BitmapFont.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/BitmapFont.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Font.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Font.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEvent.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEvent.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEventAction.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEventAction.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEventJoypadButton.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEventJoypadButton.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEventKey.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEventKey.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEventMouseButton.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEventMouseButton.kt
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEventScreenTouch.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/InputEventScreenTouch.kt