Merge branch 'master' into unsupported-data-sources-examples

Author: Jolanrensen

.gitignore

@@ -1,5 +1,9 @@
 # Default ignored files
 .idea
+!.idea/runConfigurations
+!.idea/runConfigurations/*.xml
+!.idea/externalDependencies.xml
+!.idea/vcs.xml
 .gradle
 .kotlin
 build

.idea/externalDependencies.xml

@@ -189,7 +189,7 @@ allprojects {
     afterEvaluate {
         try {
             configure<KtlintExtension> {
-                version = "1.4.1"
+                version = "1.6.0"
                 // rules are set up through .editorconfig
             }
         } catch (_: UnknownDomainObjectException) {

.idea/runConfigurations/Build_Docs_Website.xml

@@ -314,29 +314,29 @@ private fun convertToDescription(dataframeLike: Any): String =
         else -> throw IllegalArgumentException("Unsupported type: ${dataframeLike::class}")
     }.escapeHtmlForIFrame()
 
-internal fun String.escapeHtmlForIFrame(): String {
-    val str = this
-    return buildString {
-        for (c in str) {
-            when {
-                c.code > 127 || c == '\'' || c == '\\' -> {
-                    append("&#")
-                    append(c.code)
-                    append(';')
-                }
+internal fun String.escapeHtmlForIFrame(): String =
+    buildString {
+        for (c in this@escapeHtmlForIFrame) {
+            when (c) {
+                '<' -> append("&lt;")
+
+                '>' -> append("&gt;")
 
-                c == '"' -> append("&quot;")
+                '&' -> append("&amp;")
 
-                c == '<' -> append("&amp;lt;")
+                '"' -> append("&quot;")
 
-                c == '>' -> append("&amp;gt;")
+                '\'' -> append("&#39;")
 
-                c == '&' -> append("&amp;")
+                '\\' -> append("&#92;")
 
                 else -> {
-                    append(c)
+                    if (c.code > 127) {
+                        append("&#${c.code};")
+                    } else {
+                        append(c)
+                    }
                 }
             }
         }
     }
-}

.idea/runConfigurations/Run_Docs_Website_Locally.xml

@@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.dataframe.puzzles
 import io.kotest.matchers.shouldBe
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.Month
+import kotlinx.datetime.isoDayNumber
 import kotlinx.datetime.toJavaLocalDate
 import org.jetbrains.kotlinx.dataframe.api.add
 import org.jetbrains.kotlinx.dataframe.api.aggregate
@@ -113,7 +114,7 @@ class DateTests {
 
         (start..end).toList().toColumn("3thu").filter {
             it.toJavaLocalDate()[WeekFields.of(Locale.ENGLISH).weekOfMonth()] == 3 &&
-                it.dayOfWeek.value == 4
+                it.dayOfWeek.isoDayNumber == 4
         } shouldBe expected
     }
 }

.idea/vcs.xml

@@ -314,29 +314,29 @@ private fun convertToDescription(dataframeLike: Any): String =
         else -> throw IllegalArgumentException("Unsupported type: ${dataframeLike::class}")
     }.escapeHtmlForIFrame()
 
-internal fun String.escapeHtmlForIFrame(): String {
-    val str = this
-    return buildString {
-        for (c in str) {
-            when {
-                c.code > 127 || c == '\'' || c == '\\' -> {
-                    append("&#")
-                    append(c.code)
-                    append(';')
-                }
+internal fun String.escapeHtmlForIFrame(): String =
+    buildString {
+        for (c in this@escapeHtmlForIFrame) {
+            when (c) {
+                '<' -> append("&lt;")
+
+                '>' -> append("&gt;")
 
-                c == '"' -> append("&quot;")
+                '&' -> append("&amp;")
 
-                c == '<' -> append("&amp;lt;")
+                '"' -> append("&quot;")
 
-                c == '>' -> append("&amp;gt;")
+                '\'' -> append("&#39;")
 
-                c == '&' -> append("&amp;")
+                '\\' -> append("&#92;")
 
                 else -> {
-                    append(c)
+                    if (c.code > 127) {
+                        append("&#${c.code};")
+                    } else {
+                        append(c)
+                    }
                 }
             }
         }
     }
-}

build.gradle.kts

@@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.dataframe.puzzles
 import io.kotest.matchers.shouldBe
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.Month
+import kotlinx.datetime.isoDayNumber
 import kotlinx.datetime.toJavaLocalDate
 import org.jetbrains.kotlinx.dataframe.api.add
 import org.jetbrains.kotlinx.dataframe.api.aggregate
@@ -113,7 +114,7 @@ class DateTests {
 
         (start..end).toList().toColumn("3thu").filter {
             it.toJavaLocalDate()[WeekFields.of(Locale.ENGLISH).weekOfMonth()] == 3 &&
-                it.dayOfWeek.value == 4
+                it.dayOfWeek.isoDayNumber == 4
         } shouldBe expected
     }
 }