Skip to content

Commit cd5888c

Browse files
committed
simplified rename {}.toCamelCase() plugin implementation, as suggested
1 parent ce2e00a commit cd5888c

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

plugins/kotlin-dataframe/src/org/jetbrains/kotlinx/dataframe/plugin/impl/api/rename.kt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package org.jetbrains.kotlinx.dataframe.plugin.impl.api
22

3+
import org.jetbrains.kotlinx.dataframe.api.rename
34
import org.jetbrains.kotlinx.dataframe.api.renameToCamelCase
5+
import org.jetbrains.kotlinx.dataframe.api.toCamelCase
6+
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
47
import org.jetbrains.kotlinx.dataframe.plugin.impl.AbstractInterpreter
58
import org.jetbrains.kotlinx.dataframe.plugin.impl.AbstractSchemaModificationInterpreter
69
import org.jetbrains.kotlinx.dataframe.plugin.impl.Arguments
@@ -9,7 +12,6 @@ import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleCol
912
import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleColumnGroup
1013
import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleDataColumn
1114
import org.jetbrains.kotlinx.dataframe.plugin.impl.SimpleFrameColumn
12-
import org.jetbrains.kotlinx.dataframe.plugin.impl.asDataColumn
1315
import org.jetbrains.kotlinx.dataframe.plugin.impl.asDataFrame
1416
import org.jetbrains.kotlinx.dataframe.plugin.impl.dataFrame
1517
import org.jetbrains.kotlinx.dataframe.plugin.impl.toPluginDataFrameSchema
@@ -109,12 +111,9 @@ class RenameToCamelCaseClause : AbstractSchemaModificationInterpreter() {
109111
val Arguments.receiver: RenameClauseApproximation by arg()
110112

111113
override fun Arguments.interpret(): PluginDataFrameSchema {
112-
val columns = receiver.columns.resolve(receiver.schema)
113-
return receiver.schema.map(
114-
selected = columns.map { it.path }.toSet(),
115-
transform = { _, column ->
116-
column.rename(column.asDataColumn().renameToCamelCase().name())
117-
},
118-
)
114+
val selectedPaths = receiver.columns.resolve(receiver.schema).map { it.path }
115+
return receiver.schema.asDataFrame()
116+
.rename { selectedPaths.toColumnSet() }.toCamelCase()
117+
.toPluginDataFrameSchema()
119118
}
120119
}

plugins/kotlin-dataframe/tests-gen/org/jetbrains/kotlin/fir/dataframe/DataFrameDiagnosticTestGenerated.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ public void testHistoryItem() {
3232
runTest("testData/diagnostics/HistoryItem.kt");
3333
}
3434

35-
@Test
36-
@TestMetadata("renameToCamelCase.kt")
37-
public void testRenameToCamelCase() {
38-
runTest("testData/diagnostics/renameToCamelCase.kt");
39-
}
40-
4135
@Test
4236
@TestMetadata("selectDuringTyping.kt")
4337
public void testSelectDuringTyping() {

0 commit comments

Comments
 (0)