move fixes

Author: AndreiKingsley

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/move.kt

@@ -15,6 +15,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
 import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
 import org.jetbrains.kotlinx.dataframe.columns.UnresolvedColumnsPolicy
 import org.jetbrains.kotlinx.dataframe.impl.DataFrameReceiver
+import org.jetbrains.kotlinx.dataframe.impl.asList
 import org.jetbrains.kotlinx.dataframe.impl.columns.toColumnWithPath
 import org.jetbrains.kotlinx.dataframe.impl.columns.tree.ColumnPosition
 import org.jetbrains.kotlinx.dataframe.impl.columns.tree.getOrPut
@@ -35,15 +36,15 @@ internal fun <T, C> MoveClause<T, C>.afterOrBefore(column: ColumnSelector<T, *>,
             sourceSegments.indices.all { targetSegments[it] == sourceSegments[it] }
         ) {
             throw IllegalArgumentException(
-                "Cannot move column '${sourcePath.joinToString()}' after its child column '${targetPath.joinToString()}'",
+                "Cannot move column '${sourcePath.joinToString()}' after its own child column '${targetPath.joinToString()}'",
             )
         }
     }
 
     val removeRoot = removeResult.removedColumns.first().getRoot()
 
     val refNode = removeRoot.getOrPut(targetPath) {
-        val path = it.toList()
+        val path = it.asList()
 
         // Find the group reference (if any) and adjust the path
         val groupRefIndex = path.indexOfFirst { it.isEmpty() }

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTreeTests.kt

@@ -527,7 +527,6 @@ class DataFrameTreeTests : BaseTest() {
     @Test
     fun moveAfter() {
         val moved = typed2.move { age }.after { nameAndCity.name }
-        println(moved)
         moved.columnsCount() shouldBe 2
         moved.nameAndCity.columnsCount() shouldBe 3
         moved.nameAndCity.select { all() } shouldBe dataFrameOf(

plugins/kotlin-dataframe/testData/box/insertAfter.kt

@@ -4,7 +4,7 @@ import org.jetbrains.kotlinx.dataframe.api.*
 fun box(): String {
     val df = dataFrameOf("a", "b", "c")(1, 2, 3, 4, 5, 6)
 
-    val dfWithD = df.insert("d") { b  * c }.after { a }
+    val dfWithD = df.insert("d") { b * c }.after { a }
 
     val dCol: DataColumn<Int> = dfWithD.d
 

plugins/kotlin-dataframe/testData/box/moveAfterNested.kt

@@ -4,7 +4,6 @@ import org.jetbrains.kotlinx.dataframe.api.*
 fun box(): String {
     val df = dataFrameOf("a", "b", "c")(1, 2, 3, 4, 5, 6)
     val grouped = df.group { a and b }.into("g")
-    grouped.move { g.a }.after { g.b }
 
     val dfMovedAfterNested = grouped.move { c }.after { g.a }
     val cNested: DataColumn<Int> = dfMovedAfterNested.g.c