From 4aeb173991b1e6b091ee59efa6d1a62b3c01fccf Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 4 Oct 2024 18:44:10 +0000 Subject: [PATCH] Update generated sources with recent changes --- .../kotlinx/dataframe/codeGen/MarkersExtractor.kt | 7 ++++++- .../kotlinx/dataframe/impl/codeGen/SchemaProcessorImpl.kt | 3 ++- .../kotlinx/dataframe/codeGen/ShortNamesRenderingTest.kt | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/MarkersExtractor.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/MarkersExtractor.kt index 5458c9de40..cbfb847f53 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/MarkersExtractor.kt +++ b/core/generated-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/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/SchemaProcessorImpl.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/SchemaProcessorImpl.kt index 9517fbe078..ab66221a23 100644 --- a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/SchemaProcessorImpl.kt +++ b/core/generated-sources/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/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/ShortNamesRenderingTest.kt b/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/ShortNamesRenderingTest.kt index 57e13be92c..047ddcd6c5 100644 --- a/core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/ShortNamesRenderingTest.kt +++ b/core/generated-sources/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" + fields["d"]!!.renderFieldType() shouldBe "kotlin.Function0" } } @@ -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>" } }