simplified rename {}.toCamelCase() plugin implementation, as suggested

Kotlin · Jan 27, 2025 · cd5888c · cd5888c
1 parent ce2e00a
commit cd5888c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/impl/api/rename.kt b/plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/impl/api/rename.kt
@@ -1,6 +1,9 @@
 package org.jetbrains.kotlinx.dataframe.plugin.impl.api
 
+import org.jetbrains.kotlinx.dataframe.api.rename
 import org.jetbrains.kotlinx.dataframe.api.renameToCamelCase
+import org.jetbrains.kotlinx.dataframe.api.toCamelCase
+import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
 import org.jetbrains.kotlinx.dataframe.plugin.impl.AbstractInterpreter
 import org.jetbrains.kotlinx.dataframe.plugin.impl.AbstractSchemaModificationInterpreter
 import org.jetbrains.kotlinx.dataframe.plugin.impl.Arguments
@@ -9,7 +12,6 @@ import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleCol
 import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleColumnGroup
 import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleDataColumn
 import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleFrameColumn
-import org.jetbrains.kotlinx.dataframe.plugin.impl.asDataColumn
 import org.jetbrains.kotlinx.dataframe.plugin.impl.asDataFrame
 import org.jetbrains.kotlinx.dataframe.plugin.impl.dataFrame
 import org.jetbrains.kotlinx.dataframe.plugin.impl.toPluginDataFrameSchema
@@ -109,12 +111,9 @@ class RenameToCamelCaseClause : AbstractSchemaModificationInterpreter() {
     val Arguments.receiver: RenameClauseApproximation by arg()
 
     override fun Arguments.interpret(): PluginDataFrameSchema {
-        val columns = receiver.columns.resolve(receiver.schema)
-        return receiver.schema.map(
-            selected = columns.map { it.path }.toSet(),
-            transform = { _, column ->
-                column.rename(column.asDataColumn().renameToCamelCase().name())
-            },
-        )
+        val selectedPaths = receiver.columns.resolve(receiver.schema).map { it.path }
+        return receiver.schema.asDataFrame()
+            .rename { selectedPaths.toColumnSet() }.toCamelCase()
+            .toPluginDataFrameSchema()
     }
 }
diff --git a/...aframe/tests-gen/org/jetbrains/kotlin/fir/dataframe/DataFrameDiagnosticTestGenerated.java b/...aframe/tests-gen/org/jetbrains/kotlin/fir/dataframe/DataFrameDiagnosticTestGenerated.java
@@ -32,12 +32,6 @@ public void testHistoryItem() {
     runTest("testData/diagnostics/HistoryItem.kt");
   }
 
-  @Test
-  @TestMetadata("renameToCamelCase.kt")
-  public void testRenameToCamelCase() {
-    runTest("testData/diagnostics/renameToCamelCase.kt");
-  }
-
   @Test
   @TestMetadata("selectDuringTyping.kt")
   public void testSelectDuringTyping() {