Skip to content

Commit cf60da2

Browse files
Automated commit of generated code
1 parent 4ccdcb0 commit cf60da2

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ import org.jetbrains.kotlinx.dataframe.codeGen.Marker
99
import org.jetbrains.kotlinx.dataframe.codeGen.MarkerNameProvider
1010
import org.jetbrains.kotlinx.dataframe.codeGen.MarkerVisibility
1111
import org.jetbrains.kotlinx.dataframe.codeGen.NameNormalizer
12+
import org.jetbrains.kotlinx.dataframe.codeGen.ValidFieldName
1213
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1314
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
1415
import org.jetbrains.kotlinx.dataframe.documentation.AccessApis.ExtensionPropertiesApi
1516
import org.jetbrains.kotlinx.dataframe.documentation.DocumentationUrls
1617
import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources
17-
import org.jetbrains.kotlinx.dataframe.impl.codeGen.from
18+
import org.jetbrains.kotlinx.dataframe.impl.codeGen.id
19+
import org.jetbrains.kotlinx.dataframe.impl.codeGen.toCamelCaseFrom
1820
import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
1921
import org.jetbrains.kotlinx.dataframe.util.GENERATE_CODE
2022
import org.jetbrains.kotlinx.dataframe.util.GENERATE_CODE_REPLACE1
@@ -369,7 +371,19 @@ internal inline fun <reified T> markerName(): String =
369371
/**
370372
* Converts delimited 'my_name', 'my name', etc., String to camelCase 'myName'
371373
*/
372-
public val NameNormalizer.Companion.default: NameNormalizer get() = NameNormalizer.from(setOf('\t', ' ', '_'))
374+
public val NameNormalizer.Companion.toCamelCaseByDelimiter: NameNormalizer
375+
get() = NameNormalizer.toCamelCaseFrom(setOf('\t', ' ', '_'))
376+
377+
/**
378+
* Performs no name normalization.
379+
*
380+
* (Inside the [code generation][CodeGenerator.generate],
381+
* [ValidFieldName] is still used to prevent incompilable code from being generated.)
382+
*
383+
* @see [NameNormalizer.Companion.toCamelCaseByDelimiter]
384+
*/
385+
public val NameNormalizer.Companion.default: NameNormalizer
386+
get() = NameNormalizer.id()
373387

374388
/**
375389
* A value class wrapper for [String], containing

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/NameNormalizerImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.jetbrains.kotlinx.dataframe.codeGen.NameNormalizer
44
import org.jetbrains.kotlinx.dataframe.impl.toCamelCaseByDelimiters
55
import java.util.Locale
66

7-
public fun NameNormalizer.Companion.from(normalizationDelimiters: Set<Char>): NameNormalizer {
7+
public fun NameNormalizer.Companion.toCamelCaseFrom(normalizationDelimiters: Set<Char>): NameNormalizer {
88
val delimitersSet = normalizationDelimiters.joinToString("", "[", "]")
99
val delimitedStringRegex by lazy {
1010
".+$delimitersSet.+".toRegex()

0 commit comments

Comments
 (0)