Skip to content

Commit 17c52f5

Browse files
koperagenkoperagen
committed
fix compilation for markers with empty bodies in Jupyter
(cherry picked from commit bf5e98f)
1 parent ffe9ecd commit 17c52f5

File tree

8 files changed

+44
-38
lines changed

8 files changed

+44
-38
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,6 @@ internal open class ExtensionsCodeGeneratorImpl(
226226

227227
private fun String.removeQuotes() = this.removeSurrounding("`")
228228

229-
private fun generateExtensionProperties(markers: List<Marker>) = markers.map { generateExtensionProperties(it) }
230-
231229
private fun generatePropertyCode(
232230
marker: IsolatedMarker,
233231
shortMarkerName: String,
@@ -430,11 +428,6 @@ internal class CodeGeneratorImpl(typeRendering: TypeRenderingStrategy = FullyQua
430428
return CodeGenResult(code, context.generatedMarkers)
431429
}
432430

433-
private fun generateInterfaces(
434-
schemas: List<Marker>,
435-
fields: Boolean,
436-
) = schemas.map { generateInterface(it, fields) }
437-
438431
private fun generateInterface(
439432
marker: Marker,
440433
fields: Boolean,
@@ -483,7 +476,7 @@ internal class CodeGeneratorImpl(typeRendering: TypeRenderingStrategy = FullyQua
483476
append("\n}")
484477
}
485478
} else {
486-
""
479+
" { }"
487480
}
488481
resultDeclarations.add(header + baseInterfacesDeclaration + body)
489482
return resultDeclarations.join()

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class CodeGenerationTests : BaseTest() {
6060
val typeName = ReplCodeGeneratorImpl.markerInterfacePrefix
6161
val expectedDeclaration = """
6262
@DataSchema
63-
interface $typeName
63+
interface $typeName { }
6464
6565
""".trimIndent() + "\n" + expectedProperties(typeName, typeName)
6666

@@ -85,7 +85,7 @@ class CodeGenerationTests : BaseTest() {
8585
val typeName = ReplCodeGeneratorImpl.markerInterfacePrefix
8686
val expectedDeclaration = """
8787
@DataSchema
88-
interface $typeName
88+
interface $typeName { }
8989
9090
""".trimIndent() + "\n" + expectedProperties(typeName, typeName)
9191

@@ -104,7 +104,7 @@ class CodeGenerationTests : BaseTest() {
104104
val type2 = ReplCodeGeneratorImpl.markerInterfacePrefix
105105
val declaration1 = """
106106
@DataSchema(isOpen = false)
107-
interface $type1
107+
interface $type1 { }
108108
109109
val $dfName<$type1>.city: $dataCol<$stringName?> @JvmName("${type1}_city") get() = this["city"] as $dataCol<$stringName?>
110110
val $dfRowName<$type1>.city: $stringName? @JvmName("${type1}_city") get() = this["city"] as $stringName?
@@ -119,7 +119,7 @@ class CodeGenerationTests : BaseTest() {
119119

120120
val declaration2 = """
121121
@DataSchema
122-
interface $type2
122+
interface $type2 { }
123123
124124
val $dfName<$type2>.age: $dataCol<$intName> @JvmName("${type2}_age") get() = this["age"] as $dataCol<$intName>
125125
val $dfRowName<$type2>.age: $intName @JvmName("${type2}_age") get() = this["age"] as $intName
@@ -146,7 +146,7 @@ class CodeGenerationTests : BaseTest() {
146146
val personClass = (Person::class).qualifiedName!!
147147
val expected = """
148148
@DataSchema
149-
interface $personClass
149+
interface $personClass { }
150150
""".trimIndent() + "\n" + expectedProperties(personClassName, personShortName)
151151

152152
val code = CodeGenerator.create(useFqNames = false)
@@ -203,7 +203,7 @@ class CodeGenerationTests : BaseTest() {
203203
val code = codeGen.generate(df.schema(), "Person", false, true, true).code.declarations
204204
val expected = """
205205
@DataSchema
206-
interface Person
206+
interface Person { }
207207
208208
""".trimIndent() + "\n" + expectedProperties("Person", "Person")
209209
code shouldBe expected

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class ReplCodeGenTests : BaseTest() {
7575

7676
val expected = """
7777
@DataSchema
78-
interface $marker
78+
interface $marker { }
7979
8080
val $dfName<$marker>.age: $dataCol<$intName> @JvmName("${marker}_age") get() = this["age"] as $dataCol<$intName>
8181
val $dfRowName<$marker>.age: $intName @JvmName("${marker}_age") get() = this["age"] as $intName
@@ -104,7 +104,7 @@ class ReplCodeGenTests : BaseTest() {
104104
val marker3 = marker + "1"
105105
val expected3 = """
106106
@DataSchema
107-
interface $marker3 : $markerFull
107+
interface $marker3 : $markerFull { }
108108
109109
val $dfName<$marker3>.city: $dataCol<$stringName> @JvmName("${marker3}_city") get() = this["city"] as $dataCol<$stringName>
110110
val $dfRowName<$marker3>.city: $stringName @JvmName("${marker3}_city") get() = this["city"] as $stringName
@@ -122,7 +122,7 @@ class ReplCodeGenTests : BaseTest() {
122122
val marker5 = marker + "2"
123123
val expected5 = """
124124
@DataSchema
125-
interface $marker5 : $markerFull
125+
interface $marker5 : $markerFull { }
126126
127127
val $dfName<$marker5>.weight: $dataCol<$intName> @JvmName("${marker5}_weight") get() = this["weight"] as $dataCol<$intName>
128128
val $dfRowName<$marker5>.weight: $intName @JvmName("${marker5}_weight") get() = this["weight"] as $intName
@@ -145,7 +145,7 @@ class ReplCodeGenTests : BaseTest() {
145145

146146
val expected = """
147147
@DataSchema
148-
interface ${Test2._DataFrameType2::class.simpleName!!} : ${Test2._DataFrameType::class.qualifiedName}, ${Test2._DataFrameType1::class.qualifiedName}
148+
interface ${Test2._DataFrameType2::class.simpleName!!} : ${Test2._DataFrameType::class.qualifiedName}, ${Test2._DataFrameType1::class.qualifiedName} { }
149149
150150
""".trimIndent()
151151

@@ -164,7 +164,7 @@ class ReplCodeGenTests : BaseTest() {
164164
val marker = Test2._DataFrameType2::class.simpleName!!
165165
val expected = """
166166
@DataSchema
167-
interface $marker : ${Test2._DataFrameType::class.qualifiedName}
167+
interface $marker : ${Test2._DataFrameType::class.qualifiedName} { }
168168
169169
val $dfName<$marker>.city: $dataCol<$stringName?> @JvmName("${marker}_city") get() = this["city"] as $dataCol<$stringName?>
170170
val $dfRowName<$marker>.city: $stringName? @JvmName("${marker}_city") get() = this["city"] as $stringName?

‎core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/CodeGenerationTests.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,14 @@ class CodeGenerationTests : DataFrameJupyterTest() {
5151
row.a
5252
""".checkCompilation()
5353
}
54+
55+
@Test
56+
fun `interface without body compiled correctly`() {
57+
"""
58+
val a = dataFrameOf("a")(1, 2, 3)
59+
val b = dataFrameOf("b")(1, 2, 3)
60+
val ab = dataFrameOf("a", "b")(1, 2)
61+
ab.a
62+
""".checkCompilation()
63+
}
5464
}

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/CodeGeneratorImpl.kt‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,6 @@ internal open class ExtensionsCodeGeneratorImpl(
226226

227227
private fun String.removeQuotes() = this.removeSurrounding("`")
228228

229-
private fun generateExtensionProperties(markers: List<Marker>) = markers.map { generateExtensionProperties(it) }
230-
231229
private fun generatePropertyCode(
232230
marker: IsolatedMarker,
233231
shortMarkerName: String,
@@ -430,11 +428,6 @@ internal class CodeGeneratorImpl(typeRendering: TypeRenderingStrategy = FullyQua
430428
return CodeGenResult(code, context.generatedMarkers)
431429
}
432430

433-
private fun generateInterfaces(
434-
schemas: List<Marker>,
435-
fields: Boolean,
436-
) = schemas.map { generateInterface(it, fields) }
437-
438431
private fun generateInterface(
439432
marker: Marker,
440433
fields: Boolean,
@@ -483,7 +476,7 @@ internal class CodeGeneratorImpl(typeRendering: TypeRenderingStrategy = FullyQua
483476
append("\n}")
484477
}
485478
} else {
486-
""
479+
" { }"
487480
}
488481
resultDeclarations.add(header + baseInterfacesDeclaration + body)
489482
return resultDeclarations.join()

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/CodeGenerationTests.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class CodeGenerationTests : BaseTest() {
6060
val typeName = ReplCodeGeneratorImpl.markerInterfacePrefix
6161
val expectedDeclaration = """
6262
@DataSchema
63-
interface $typeName
63+
interface $typeName { }
6464
6565
""".trimIndent() + "\n" + expectedProperties(typeName, typeName)
6666

@@ -85,7 +85,7 @@ class CodeGenerationTests : BaseTest() {
8585
val typeName = ReplCodeGeneratorImpl.markerInterfacePrefix
8686
val expectedDeclaration = """
8787
@DataSchema
88-
interface $typeName
88+
interface $typeName { }
8989
9090
""".trimIndent() + "\n" + expectedProperties(typeName, typeName)
9191

@@ -104,7 +104,7 @@ class CodeGenerationTests : BaseTest() {
104104
val type2 = ReplCodeGeneratorImpl.markerInterfacePrefix
105105
val declaration1 = """
106106
@DataSchema(isOpen = false)
107-
interface $type1
107+
interface $type1 { }
108108
109109
val $dfName<$type1>.city: $dataCol<$stringName?> @JvmName("${type1}_city") get() = this["city"] as $dataCol<$stringName?>
110110
val $dfRowName<$type1>.city: $stringName? @JvmName("${type1}_city") get() = this["city"] as $stringName?
@@ -119,7 +119,7 @@ class CodeGenerationTests : BaseTest() {
119119

120120
val declaration2 = """
121121
@DataSchema
122-
interface $type2
122+
interface $type2 { }
123123
124124
val $dfName<$type2>.age: $dataCol<$intName> @JvmName("${type2}_age") get() = this["age"] as $dataCol<$intName>
125125
val $dfRowName<$type2>.age: $intName @JvmName("${type2}_age") get() = this["age"] as $intName
@@ -146,7 +146,7 @@ class CodeGenerationTests : BaseTest() {
146146
val personClass = (Person::class).qualifiedName!!
147147
val expected = """
148148
@DataSchema
149-
interface $personClass
149+
interface $personClass { }
150150
""".trimIndent() + "\n" + expectedProperties(personClassName, personShortName)
151151

152152
val code = CodeGenerator.create(useFqNames = false)
@@ -203,7 +203,7 @@ class CodeGenerationTests : BaseTest() {
203203
val code = codeGen.generate(df.schema(), "Person", false, true, true).code.declarations
204204
val expected = """
205205
@DataSchema
206-
interface Person
206+
interface Person { }
207207
208208
""".trimIndent() + "\n" + expectedProperties("Person", "Person")
209209
code shouldBe expected

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/ReplCodeGenTests.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class ReplCodeGenTests : BaseTest() {
7575

7676
val expected = """
7777
@DataSchema
78-
interface $marker
78+
interface $marker { }
7979
8080
val $dfName<$marker>.age: $dataCol<$intName> @JvmName("${marker}_age") get() = this["age"] as $dataCol<$intName>
8181
val $dfRowName<$marker>.age: $intName @JvmName("${marker}_age") get() = this["age"] as $intName
@@ -104,7 +104,7 @@ class ReplCodeGenTests : BaseTest() {
104104
val marker3 = marker + "1"
105105
val expected3 = """
106106
@DataSchema
107-
interface $marker3 : $markerFull
107+
interface $marker3 : $markerFull { }
108108
109109
val $dfName<$marker3>.city: $dataCol<$stringName> @JvmName("${marker3}_city") get() = this["city"] as $dataCol<$stringName>
110110
val $dfRowName<$marker3>.city: $stringName @JvmName("${marker3}_city") get() = this["city"] as $stringName
@@ -122,7 +122,7 @@ class ReplCodeGenTests : BaseTest() {
122122
val marker5 = marker + "2"
123123
val expected5 = """
124124
@DataSchema
125-
interface $marker5 : $markerFull
125+
interface $marker5 : $markerFull { }
126126
127127
val $dfName<$marker5>.weight: $dataCol<$intName> @JvmName("${marker5}_weight") get() = this["weight"] as $dataCol<$intName>
128128
val $dfRowName<$marker5>.weight: $intName @JvmName("${marker5}_weight") get() = this["weight"] as $intName
@@ -145,7 +145,7 @@ class ReplCodeGenTests : BaseTest() {
145145

146146
val expected = """
147147
@DataSchema
148-
interface ${Test2._DataFrameType2::class.simpleName!!} : ${Test2._DataFrameType::class.qualifiedName}, ${Test2._DataFrameType1::class.qualifiedName}
148+
interface ${Test2._DataFrameType2::class.simpleName!!} : ${Test2._DataFrameType::class.qualifiedName}, ${Test2._DataFrameType1::class.qualifiedName} { }
149149
150150
""".trimIndent()
151151

@@ -164,7 +164,7 @@ class ReplCodeGenTests : BaseTest() {
164164
val marker = Test2._DataFrameType2::class.simpleName!!
165165
val expected = """
166166
@DataSchema
167-
interface $marker : ${Test2._DataFrameType::class.qualifiedName}
167+
interface $marker : ${Test2._DataFrameType::class.qualifiedName} { }
168168
169169
val $dfName<$marker>.city: $dataCol<$stringName?> @JvmName("${marker}_city") get() = this["city"] as $dataCol<$stringName?>
170170
val $dfRowName<$marker>.city: $stringName? @JvmName("${marker}_city") get() = this["city"] as $stringName?

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/CodeGenerationTests.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,14 @@ class CodeGenerationTests : DataFrameJupyterTest() {
5151
row.a
5252
""".checkCompilation()
5353
}
54+
55+
@Test
56+
fun `interface without body compiled correctly`() {
57+
"""
58+
val a = dataFrameOf("a")(1, 2, 3)
59+
val b = dataFrameOf("b")(1, 2, 3)
60+
val ab = dataFrameOf("a", "b")(1, 2)
61+
ab.a
62+
""".checkCompilation()
63+
}
5464
}

0 commit comments

Comments
 (0)