Skip to content

Commit 533ac2e

Browse files
committed
Merge branch 'refs/heads/master' into load-jupyter-from-core
2 parents 5841bc8 + e255c40 commit 533ac2e

File tree

7 files changed

+12
-1
lines changed

7 files changed

+12
-1
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,7 @@ public interface ColColumnsSelectionDsl<out _UNUSED> {
780780
*/
781781
@Suppress("INAPPLICABLE_JVM_NAME")
782782
@JvmName("colUnTyped")
783+
@Interpretable("SingleColumnNestedColUntyped")
783784
public fun SingleColumn<DataRow<*>>.col(name: String): SingleColumn<*> = col<Any?>(name)
784785

785786
/**
@@ -832,6 +833,7 @@ public interface ColColumnsSelectionDsl<out _UNUSED> {
832833
* @param [name] The name of the column.
833834
* @param [C] The type of the column.
834835
*/
836+
@Interpretable("SingleColumnNestedCol")
835837
public fun <C> SingleColumn<DataRow<*>>.col(name: String): SingleColumn<C> =
836838
this.ensureIsColumnGroup().transformSingle {
837839
val child = it.getCol(name)?.cast<C>()

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,11 @@ public class GroupClause<T, C>(internal val df: DataFrame<T>, internal val colum
291291
* where that column should be grouped.
292292
* All selected columns will be moved under the groups defined by this expression.
293293
*/
294+
@Refine
294295
@JvmName("intoString")
295296
@OverloadResolutionByLambdaReturnType
296297
@OptIn(ExperimentalTypeInference::class)
298+
@Interpretable("IntoStringLambda")
297299
public fun <T, C> GroupClause<T, C>.into(column: ColumnsSelectionDsl<T>.(ColumnWithPath<C>) -> String): DataFrame<T> =
298300
df.move(columns).under { column(it).toColumnAccessor() }
299301

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,8 @@ public fun <T, C> RenameClause<T, C>.into(vararg newNames: KProperty<*>): DataFr
396396
* and returns the new column name.
397397
* @return A new [DataFrame] with the columns renamed.
398398
*/
399+
@Refine
400+
@Interpretable("RenameIntoLambda")
399401
public fun <T, C> RenameClause<T, C>.into(transform: (ColumnWithPath<C>) -> String): DataFrame<T> =
400402
renameImpl(transform)
401403

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,14 @@ public interface ColColumnsSelectionDsl<out _UNUSED> {
241241
*/
242242
@Suppress("INAPPLICABLE_JVM_NAME")
243243
@JvmName("colUnTyped")
244+
@Interpretable("SingleColumnNestedColUntyped")
244245
public fun SingleColumn<DataRow<*>>.col(name: String): SingleColumn<*> = col<Any?>(name)
245246

246247
/**
247248
* @include [ColNameDocs] {@set [CommonColDocs.RECEIVER] myColumnGroup.}
248249
* @include [CommonColDocs.ColumnTypeParam]
249250
*/
251+
@Interpretable("SingleColumnNestedCol")
250252
public fun <C> SingleColumn<DataRow<*>>.col(name: String): SingleColumn<C> =
251253
this.ensureIsColumnGroup().transformSingle {
252254
val child = it.getCol(name)?.cast<C>()

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,11 @@ public class GroupClause<T, C>(internal val df: DataFrame<T>, internal val colum
171171
* where that column should be grouped.
172172
* All selected columns will be moved under the groups defined by this expression.
173173
*/
174+
@Refine
174175
@JvmName("intoString")
175176
@OverloadResolutionByLambdaReturnType
176177
@OptIn(ExperimentalTypeInference::class)
178+
@Interpretable("IntoStringLambda")
177179
public fun <T, C> GroupClause<T, C>.into(column: ColumnsSelectionDsl<T>.(ColumnWithPath<C>) -> String): DataFrame<T> =
178180
df.move(columns).under { column(it).toColumnAccessor() }
179181

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,8 @@ public fun <T, C> RenameClause<T, C>.into(vararg newNames: KProperty<*>): DataFr
282282
* and returns the new column name.
283283
* @return A new [DataFrame] with the columns renamed.
284284
*/
285+
@Refine
286+
@Interpretable("RenameIntoLambda")
285287
public fun <T, C> RenameClause<T, C>.into(transform: (ColumnWithPath<C>) -> String): DataFrame<T> =
286288
renameImpl(transform)
287289

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/format.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import io.kotest.matchers.shouldNotBe
55
import org.jetbrains.kotlinx.dataframe.api.FormattingDsl.blue
66
import org.jetbrains.kotlinx.dataframe.api.FormattingDsl.red
77
import org.jetbrains.kotlinx.dataframe.api.FormattingDsl.rgb
8-
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
98
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
109
import org.jetbrains.kotlinx.dataframe.samples.api.TestBase
1110
import org.jetbrains.kotlinx.dataframe.samples.api.age

0 commit comments

Comments
 (0)