Merge pull request #1731 from Kotlin/soft-keywords-quote

Prevented escaping of SoftKeywords in code generator

Author: Allex-Nik

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/CodeGeneratorImpl.kt

@@ -37,6 +37,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
 import org.jetbrains.kotlinx.dataframe.impl.toSnakeCase
 import org.jetbrains.kotlinx.dataframe.keywords.HardKeywords
 import org.jetbrains.kotlinx.dataframe.keywords.ModifierKeywords
+import org.jetbrains.kotlinx.dataframe.keywords.SoftKeywords
 import org.jetbrains.kotlinx.dataframe.schema.ComparisonMode
 import org.jetbrains.kotlinx.dataframe.schema.DataFrameSchema
 import kotlin.reflect.KClass
@@ -71,12 +72,15 @@ internal fun String.needsQuoting(): Boolean =
         isBlank() ||
             first().isDigit() ||
             contains(charsToQuote) ||
-            HardKeywords.VALUES.contains(this) ||
-            ModifierKeywords.VALUES.contains(this) ||
+            hardKeywords.contains(this) ||
+            modifierKeywordsToQuote.contains(this) ||
             all { it == '_' } ||
             any { it != '_' && it.category !in letterCategories }
     }
 
+private val hardKeywords: Set<String> = HardKeywords.VALUES.toSet()
+private val modifierKeywordsToQuote: Set<String> = ModifierKeywords.VALUES.toSet() - SoftKeywords.VALUES.toSet()
+
 public fun String.isQuoted(): Boolean = startsWith("`") && endsWith("`")
 
 public fun String.quoteIfNeeded(): String = if (needsQuoting()) "`$this`" else this

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/codeGen/CodeGenerationTests.kt

@@ -196,6 +196,20 @@ class CodeGenerationTests : BaseTest() {
         assertEquals(expected, code.value)
     }
 
+    @Test
+    fun `generateDataClasses with SoftKeywords`() {
+        val df = dataFrameOf("value" to columnOf(123))
+        val code = df.generateDataClasses()
+        val expected =
+            """
+            @DataSchema
+            data class DataEntry(
+                val value: Int
+            )
+            """.trimIndent()
+        assertEquals(expected, code.value)
+    }
+
     val personClassName = Person::class.qualifiedName!!
 
     val personShortName = Person::class.simpleName!!