Support companion objects

deepmedia · Sep 8, 2024 · acb5242 · acb5242
1 parent 0acb0bc
commit acb5242
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/knee-compiler-plugin/src/main/kotlin/utils/PoetUtils.kt b/knee-compiler-plugin/src/main/kotlin/utils/PoetUtils.kt
@@ -22,7 +22,10 @@ fun IrClass.asTypeSpec(rename: ((String) -> String)? = null): TypeSpec.Builder {
     val name = codegenName.map { rename?.invoke(it) ?: it }.asString()
     return when (kind) {
         ClassKind.ENUM_CLASS -> TypeSpec.enumBuilder(name)
-        ClassKind.OBJECT -> TypeSpec.objectBuilder(name)
+        ClassKind.OBJECT -> when {
+            isCompanion -> TypeSpec.companionObjectBuilder(if (name == "Companion") null else name)
+            else -> TypeSpec.objectBuilder(name)
+        }
         ClassKind.INTERFACE -> TypeSpec.interfaceBuilder(name)
         ClassKind.ANNOTATION_CLASS -> TypeSpec.annotationBuilder(name)
         ClassKind.ENUM_ENTRY -> error("Enum entries ($this) can't become a TypeSpec.")

diff --git a/...t-classes/src/androidInstrumentedTest/kotlin/io/deepmedia/tools/knee/tests/ObjectTests.kt b/...t-classes/src/androidInstrumentedTest/kotlin/io/deepmedia/tools/knee/tests/ObjectTests.kt
@@ -41,4 +41,16 @@ class ObjectTests {
         check(TopLevelObject.value == 15) { TopLevelObject.value }
     }
 
+    @Test
+    fun testInner_property() {
+        ObjectParent.InnerObject.value = 15
+        check(ObjectParent.InnerObject.value == 15) { ObjectParent.InnerObject.value }
+    }
+
+    @Test
+    fun testCompanion_property() {
+        ObjectParent.value = 15
+        check(ObjectParent.value == 15) { ObjectParent.value }
+    }
+
 }
diff --git a/tests/test-classes/src/backendMain/kotlin/ObjectDefinitions.kt b/tests/test-classes/src/backendMain/kotlin/ObjectDefinitions.kt
@@ -13,3 +13,13 @@ object TopLevelObject {
     @Knee fun decrement() { value -= 1 }
     @Knee override fun toString(): String = "TopLevelObject($value)"
 }
+
+class ObjectParent {
+    @KneeObject object InnerObject {
+        @Knee var value: Int = 0
+    }
+
+    @KneeObject companion object {
+        @Knee var value: Int = 0
+    }
+}