Skip to content

Commit c21dc41

Browse files
committed
cols {} fix, still 3 failing tests
1 parent 45d90b4 commit c21dc41

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,7 +1676,12 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
16761676
@Suppress("UNCHECKED_CAST")
16771677
public fun <C> ColumnSet<C>.cols(
16781678
predicate: ColumnFilter<C> = { true },
1679-
): ColumnSet<C> = colsInternal(predicate as ColumnFilter<*>).cast()
1679+
): ColumnSet<C> = transformWithContext {
1680+
dataFrameOf(it)
1681+
.asColumnGroup()
1682+
.cols(predicate as ColumnFilter<*>)
1683+
.resolve(this)
1684+
} as ColumnSet<C>
16801685

16811686
/** ## Cols
16821687
* Creates a sub-[ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] from a parent [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] or [ColumnGroup][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]
@@ -1785,7 +1790,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
17851790
*/
17861791
public fun SingleColumn<AnyRow>.cols(
17871792
predicate: ColumnFilter<*> = { true },
1788-
): ColumnSet<*> = all().cols(predicate)
1793+
): ColumnSet<*> = colsInternal(predicate)
17891794

17901795
/**
17911796
* ## Cols

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,12 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
893893
@Suppress("UNCHECKED_CAST")
894894
public fun <C> ColumnSet<C>.cols(
895895
predicate: ColumnFilter<C> = { true },
896-
): ColumnSet<C> = colsInternal(predicate as ColumnFilter<*>).cast()
896+
): ColumnSet<C> = transformWithContext {
897+
dataFrameOf(it)
898+
.asColumnGroup()
899+
.cols(predicate as ColumnFilter<*>)
900+
.resolve(this)
901+
} as ColumnSet<C>
897902

898903
/** @include [ColumnSetColsPredicateDocs] */
899904
public operator fun <C> ColumnSet<C>.get(
@@ -928,7 +933,7 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
928933
/** @include [SingleColumnAnyRowColsPredicateDocs] */
929934
public fun SingleColumn<AnyRow>.cols(
930935
predicate: ColumnFilter<*> = { true },
931-
): ColumnSet<*> = all().cols(predicate)
936+
): ColumnSet<*> = colsInternal(predicate)
932937

933938
/**
934939
* @include [SingleColumnAnyRowColsPredicateDocs]

0 commit comments

Comments
 (0)