Skip to content

Commit a312860

Browse files
committed
linting fixes
1 parent 0d4afc4 commit a312860

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public fun AnyFrame.toStaticHtml(
201201
val id = "static_df_${nextTableId()}"
202202

203203
// Retrieve all columns, including nested ones
204-
val flattenedCols = getColumnsWithPaths { cols { !it.isColumnGroup() }.recursively() }
204+
val flattenedCols = getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } }
205205

206206
// Get a grid of columns for the header, as well as the side borders for each cell
207207
val colGrid = getColumnsHeaderGrid()
@@ -389,9 +389,9 @@ private fun AnyFrame.getColumnsHeaderGrid(): List<List<ColumnWithPathWithBorder<
389389

390390
fun ColumnWithPath<*>.addChildren(depth: Int = 0, breadth: Int = 0) {
391391
var breadth = breadth
392-
val children = children()
392+
val children = cols()
393393
val lastIndex = children.lastIndex
394-
for ((i, child) in children().withIndex()) {
394+
for ((i, child) in cols().withIndex()) {
395395
matrix[depth][breadth] = matrix[depth][breadth].copy(columnWithPath = child)
396396

397397
// draw colGroup side borders unless at start/end of table

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ private const val message_0_16 = "Will be removed in 0.16."
8181

8282
// endregion
8383

84-
8584
// region keep across releases
8685

8786
internal const val IDENTITY_FUNCTION = "This overload is an identity function and can be omitted."

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public fun AnyFrame.toStaticHtml(
201201
val id = "static_df_${nextTableId()}"
202202

203203
// Retrieve all columns, including nested ones
204-
val flattenedCols = getColumnsWithPaths { cols { !it.isColumnGroup() }.recursively() }
204+
val flattenedCols = getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } }
205205

206206
// Get a grid of columns for the header, as well as the side borders for each cell
207207
val colGrid = getColumnsHeaderGrid()
@@ -389,9 +389,9 @@ private fun AnyFrame.getColumnsHeaderGrid(): List<List<ColumnWithPathWithBorder<
389389

390390
fun ColumnWithPath<*>.addChildren(depth: Int = 0, breadth: Int = 0) {
391391
var breadth = breadth
392-
val children = children()
392+
val children = cols()
393393
val lastIndex = children.lastIndex
394-
for ((i, child) in children().withIndex()) {
394+
for ((i, child) in cols().withIndex()) {
395395
matrix[depth][breadth] = matrix[depth][breadth].copy(columnWithPath = child)
396396

397397
// draw colGroup side borders unless at start/end of table

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ private const val message_0_16 = "Will be removed in 0.16."
8181

8282
// endregion
8383

84-
8584
// region keep across releases
8685

8786
internal const val IDENTITY_FUNCTION = "This overload is an identity function and can be omitted."

0 commit comments

Comments
 (0)