Skip to content

Commit 512f6b4

Browse files
fix exception's message + improve doc + remove deprecated overloads
1 parent d365add commit 512f6b4

File tree

2 files changed

+3
-10
lines changed
  • core/src/main/kotlin/org/jetbrains/kotlinx/dataframe

2 files changed

+3
-10
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -668,14 +668,6 @@ public fun <T, C> MoveClause<T, C>.before(column: ColumnSelector<T, *>): DataFra
668668
*/
669669
public fun <T, C> MoveClause<T, C>.before(column: String): DataFrame<T> = before { column.toColumnAccessor() }
670670

671-
@Deprecated(DEPRECATED_ACCESS_API)
672-
@AccessApiOverload
673-
public fun <T, C> MoveClause<T, C>.before(column: AnyColumnReference): DataFrame<T> = before { column }
674-
675-
@Deprecated(DEPRECATED_ACCESS_API)
676-
@AccessApiOverload
677-
public fun <T, C> MoveClause<T, C>.before(column: KProperty<*>): DataFrame<T> = before { column.toColumnAccessor() }
678-
679671
// endregion
680672

681673
@Deprecated(TO_LEFT, ReplaceWith(TO_LEFT_REPLACE), DeprecationLevel.ERROR)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ internal fun <T, C> MoveClause<T, C>.afterOrBefore(column: ColumnSelector<T, *>,
3939
if (sourceSegments.size <= targetSegments.size &&
4040
sourceSegments.indices.all { targetSegments[it] == sourceSegments[it] }
4141
) {
42+
val afterOrBefore = if (isAfter) "after" else "before"
4243
throw IllegalArgumentException(
43-
"Cannot move column '${sourcePath.joinToString()}' after its own child column '${targetPath.joinToString()}'",
44+
"Cannot move column '${sourcePath.joinToString()}' $afterOrBefore its own child column '${targetPath.joinToString()}'",
4445
)
4546
}
4647
}
@@ -86,7 +87,7 @@ internal fun <T, C> MoveClause<T, C>.afterOrBefore(column: ColumnSelector<T, *>,
8687
return removeResult.df.insertImpl(toInsert)
8788
}
8889

89-
// move target after last of toInsert
90+
// Move the target column after the removed/inserted columns
9091
val logicOfAfter = removeResult.df.insertImpl(toInsert)
9192
val lastOfInsertedCols = toInsert.last().insertionPath
9293
val siblingsOfTargetAndTarget = removeResult.df[parentPath].asColumnGroup().columns().map { parentPath + it.path }

0 commit comments

Comments
 (0)