Skip to content

Commit 4aeb173

Browse files
committed
Update generated sources with recent changes
1 parent b34cca0 commit 4aeb173

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/MarkersExtractor.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jetbrains.kotlinx.dataframe.codeGen
22

3+
import com.squareup.kotlinpoet.asTypeName
34
import org.jetbrains.kotlinx.dataframe.DataFrame
45
import org.jetbrains.kotlinx.dataframe.DataRow
56
import org.jetbrains.kotlinx.dataframe.annotations.ColumnName
@@ -109,7 +110,11 @@ internal object MarkersExtractor {
109110

110111
else -> {
111112
fieldType = FieldType.ValueFieldType(
112-
if (nullableProperties) type.toString().toNullable() else type.toString(),
113+
if (nullableProperties) {
114+
type.asTypeName().toString().toNullable()
115+
} else {
116+
type.asTypeName().toString()
117+
},
113118
)
114119
ColumnSchema.Value(
115120
if (nullableProperties) type.withNullability(true) else type,

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/SchemaProcessorImpl.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jetbrains.kotlinx.dataframe.impl.codeGen
22

3+
import com.squareup.kotlinpoet.asTypeName
34
import org.jetbrains.kotlinx.dataframe.codeGen.FieldType
45
import org.jetbrains.kotlinx.dataframe.codeGen.GeneratedField
56
import org.jetbrains.kotlinx.dataframe.codeGen.Marker
@@ -66,7 +67,7 @@ internal class SchemaProcessorImpl(
6667
fun getFieldType(columnSchema: ColumnSchema): FieldType =
6768
when (columnSchema) {
6869
is ColumnSchema.Value ->
69-
FieldType.ValueFieldType(columnSchema.type.toString())
70+
FieldType.ValueFieldType(columnSchema.type.asTypeName().toString())
7071

7172
is ColumnSchema.Group ->
7273
FieldType.GroupFieldType(

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/ShortNamesRenderingTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ internal class ShortNamesRenderingTest : TypeRenderingStrategy by ShortNames {
6161
@Test
6262
fun `short functional types are not supported`() {
6363
fields.keys.asClue {
64-
fields["d"]!!.renderAccessorFieldType() shouldBe "() -> kotlin.Unit"
65-
fields["d"]!!.renderFieldType() shouldBe "() -> kotlin.Unit"
64+
fields["d"]!!.renderAccessorFieldType() shouldBe "kotlin.Function0<kotlin.Unit>"
65+
fields["d"]!!.renderFieldType() shouldBe "kotlin.Function0<kotlin.Unit>"
6666
}
6767
}
6868

@@ -112,7 +112,7 @@ internal class ShortNamesRenderingTest : TypeRenderingStrategy by ShortNames {
112112
@Test
113113
fun `functional type column`() {
114114
fields.keys.asClue {
115-
fields["d"]!!.renderColumnType() shouldBe "DataColumn<() -> kotlin.Unit>"
115+
fields["d"]!!.renderColumnType() shouldBe "DataColumn<kotlin.Function0<kotlin.Unit>>"
116116
}
117117
}
118118

0 commit comments

Comments
 (0)