Update generated sources with recent changes

Kotlin · Oct 4, 2024 · 4aeb173 · 4aeb173
1 parent b34cca0
commit 4aeb173
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/...rated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/MarkersExtractor.kt b/...rated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/MarkersExtractor.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.kotlinx.dataframe.codeGen
 
+import com.squareup.kotlinpoet.asTypeName
 import org.jetbrains.kotlinx.dataframe.DataFrame
 import org.jetbrains.kotlinx.dataframe.DataRow
 import org.jetbrains.kotlinx.dataframe.annotations.ColumnName
@@ -109,7 +110,11 @@ internal object MarkersExtractor {
 
                 else -> {
                     fieldType = FieldType.ValueFieldType(
-                        if (nullableProperties) type.toString().toNullable() else type.toString(),
+                        if (nullableProperties) {
+                            type.asTypeName().toString().toNullable()
+                        } else {
+                            type.asTypeName().toString()
+                        },
                     )
                     ColumnSchema.Value(
                         if (nullableProperties) type.withNullability(true) else type,

diff --git a/...urces/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/SchemaProcessorImpl.kt b/...urces/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/SchemaProcessorImpl.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.kotlinx.dataframe.impl.codeGen
 
+import com.squareup.kotlinpoet.asTypeName
 import org.jetbrains.kotlinx.dataframe.codeGen.FieldType
 import org.jetbrains.kotlinx.dataframe.codeGen.GeneratedField
 import org.jetbrains.kotlinx.dataframe.codeGen.Marker
@@ -66,7 +67,7 @@ internal class SchemaProcessorImpl(
         fun getFieldType(columnSchema: ColumnSchema): FieldType =
             when (columnSchema) {
                 is ColumnSchema.Value ->
-                    FieldType.ValueFieldType(columnSchema.type.toString())
+                    FieldType.ValueFieldType(columnSchema.type.asTypeName().toString())
 
                 is ColumnSchema.Group ->
                     FieldType.GroupFieldType(

diff --git a/...ources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/ShortNamesRenderingTest.kt b/...ources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/ShortNamesRenderingTest.kt
@@ -61,8 +61,8 @@ internal class ShortNamesRenderingTest : TypeRenderingStrategy by ShortNames {
     @Test
     fun `short functional types are not supported`() {
         fields.keys.asClue {
-            fields["d"]!!.renderAccessorFieldType() shouldBe "() -> kotlin.Unit"
-            fields["d"]!!.renderFieldType() shouldBe "() -> kotlin.Unit"
+            fields["d"]!!.renderAccessorFieldType() shouldBe "kotlin.Function0<kotlin.Unit>"
+            fields["d"]!!.renderFieldType() shouldBe "kotlin.Function0<kotlin.Unit>"
         }
     }
 
@@ -112,7 +112,7 @@ internal class ShortNamesRenderingTest : TypeRenderingStrategy by ShortNames {
     @Test
     fun `functional type column`() {
         fields.keys.asClue {
-            fields["d"]!!.renderColumnType() shouldBe "DataColumn<() -> kotlin.Unit>"
+            fields["d"]!!.renderColumnType() shouldBe "DataColumn<kotlin.Function0<kotlin.Unit>>"
         }
     }