linting fixes

Kotlin · Mar 25, 2024 · a312860 · a312860
1 parent 0d4afc4
commit a312860
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt b/core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt
@@ -201,7 +201,7 @@ public fun AnyFrame.toStaticHtml(
     val id = "static_df_${nextTableId()}"
 
     // Retrieve all columns, including nested ones
-    val flattenedCols = getColumnsWithPaths { cols { !it.isColumnGroup() }.recursively() }
+    val flattenedCols = getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } }
 
     // Get a grid of columns for the header, as well as the side borders for each cell
     val colGrid = getColumnsHeaderGrid()
@@ -389,9 +389,9 @@ private fun AnyFrame.getColumnsHeaderGrid(): List<List<ColumnWithPathWithBorder<
 
     fun ColumnWithPath<*>.addChildren(depth: Int = 0, breadth: Int = 0) {
         var breadth = breadth
-        val children = children()
+        val children = cols()
         val lastIndex = children.lastIndex
-        for ((i, child) in children().withIndex()) {
+        for ((i, child) in cols().withIndex()) {
             matrix[depth][breadth] = matrix[depth][breadth].copy(columnWithPath = child)
 
             // draw colGroup side borders unless at start/end of table

diff --git a/...rated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt b/...rated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt
@@ -81,7 +81,6 @@ private const val message_0_16 = "Will be removed in 0.16."
 
 // endregion
 
-
 // region keep across releases
 
 internal const val IDENTITY_FUNCTION = "This overload is an identity function and can be omitted."

diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt
@@ -201,7 +201,7 @@ public fun AnyFrame.toStaticHtml(
     val id = "static_df_${nextTableId()}"
 
     // Retrieve all columns, including nested ones
-    val flattenedCols = getColumnsWithPaths { cols { !it.isColumnGroup() }.recursively() }
+    val flattenedCols = getColumnsWithPaths { colsAtAnyDepth { !it.isColumnGroup() } }
 
     // Get a grid of columns for the header, as well as the side borders for each cell
     val colGrid = getColumnsHeaderGrid()
@@ -389,9 +389,9 @@ private fun AnyFrame.getColumnsHeaderGrid(): List<List<ColumnWithPathWithBorder<
 
     fun ColumnWithPath<*>.addChildren(depth: Int = 0, breadth: Int = 0) {
         var breadth = breadth
-        val children = children()
+        val children = cols()
         val lastIndex = children.lastIndex
-        for ((i, child) in children().withIndex()) {
+        for ((i, child) in cols().withIndex()) {
             matrix[depth][breadth] = matrix[depth][breadth].copy(columnWithPath = child)
 
             // draw colGroup side borders unless at start/end of table

diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt
@@ -81,7 +81,6 @@ private const val message_0_16 = "Will be removed in 0.16."
 
 // endregion
 
-
 // region keep across releases
 
 internal const val IDENTITY_FUNCTION = "This overload is an identity function and can be omitted."
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,7 +81,6 @@ private const val message_0_16 = "Will be removed in 0.16."

		// endregion


		// region keep across releases

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