K2 compatibility: tiny fixes regarding type resolution

Author: Jolanrensen

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

@@ -156,11 +156,11 @@ internal object FullyQualifiedNames : TypeRenderingStrategy {
 
 internal object ShortNames : TypeRenderingStrategy {
 
-    private val DataRow = DataRow::class.simpleName!!
-    private val ColumnsContainer = ColumnsContainer::class.simpleName!!
-    private val DataFrame = DataFrame::class.simpleName!!
-    private val DataColumn = DataColumn::class.simpleName!!
-    private val ColumnGroup = ColumnGroup::class.simpleName!!
+    private val DataRow = org.jetbrains.kotlinx.dataframe.DataRow::class.simpleName!!
+    private val ColumnsContainer = org.jetbrains.kotlinx.dataframe.ColumnsContainer::class.simpleName!!
+    private val DataFrame = org.jetbrains.kotlinx.dataframe.DataFrame::class.simpleName!!
+    private val DataColumn = org.jetbrains.kotlinx.dataframe.DataColumn::class.simpleName!!
+    private val ColumnGroup = org.jetbrains.kotlinx.dataframe.columns.ColumnGroup::class.simpleName!!
 
     override fun renderRowTypeName(markerName: String): String = "$DataRow<${markerName.shorten()}>"
 

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/statistics/cumsum.kt

@@ -1,6 +1,7 @@
 package org.jetbrains.kotlinx.dataframe.statistics
 
 import io.kotest.matchers.shouldBe
+import org.jetbrains.kotlinx.dataframe.DataColumn
 import org.jetbrains.kotlinx.dataframe.api.columnOf
 import org.jetbrains.kotlinx.dataframe.api.concat
 import org.jetbrains.kotlinx.dataframe.api.cumSum
@@ -43,7 +44,7 @@ class CumsumTests {
 
     @Test
     fun `number column`() {
-        val doubles by columnOf(1, 2, null, Double.NaN, 4)
+        val doubles: DataColumn<Number?> by columnOf(1, 2, null, Double.NaN, 4)
         doubles.cumSum().toList() shouldBe listOf(1.0, 3.0, Double.NaN, Double.NaN, 7.0)
     }
 

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

@@ -156,11 +156,11 @@ internal object FullyQualifiedNames : TypeRenderingStrategy {
 
 internal object ShortNames : TypeRenderingStrategy {
 
-    private val DataRow = DataRow::class.simpleName!!
-    private val ColumnsContainer = ColumnsContainer::class.simpleName!!
-    private val DataFrame = DataFrame::class.simpleName!!
-    private val DataColumn = DataColumn::class.simpleName!!
-    private val ColumnGroup = ColumnGroup::class.simpleName!!
+    private val DataRow = org.jetbrains.kotlinx.dataframe.DataRow::class.simpleName!!
+    private val ColumnsContainer = org.jetbrains.kotlinx.dataframe.ColumnsContainer::class.simpleName!!
+    private val DataFrame = org.jetbrains.kotlinx.dataframe.DataFrame::class.simpleName!!
+    private val DataColumn = org.jetbrains.kotlinx.dataframe.DataColumn::class.simpleName!!
+    private val ColumnGroup = org.jetbrains.kotlinx.dataframe.columns.ColumnGroup::class.simpleName!!
 
     override fun renderRowTypeName(markerName: String): String = "$DataRow<${markerName.shorten()}>"
 

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/statistics/cumsum.kt

@@ -1,6 +1,7 @@
 package org.jetbrains.kotlinx.dataframe.statistics
 
 import io.kotest.matchers.shouldBe
+import org.jetbrains.kotlinx.dataframe.DataColumn
 import org.jetbrains.kotlinx.dataframe.api.columnOf
 import org.jetbrains.kotlinx.dataframe.api.concat
 import org.jetbrains.kotlinx.dataframe.api.cumSum
@@ -43,7 +44,7 @@ class CumsumTests {
 
     @Test
     fun `number column`() {
-        val doubles by columnOf(1, 2, null, Double.NaN, 4)
+        val doubles: DataColumn<Number?> by columnOf(1, 2, null, Double.NaN, 4)
         doubles.cumSum().toList() shouldBe listOf(1.0, 3.0, Double.NaN, Double.NaN, 7.0)
     }