Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
root = true

[*]
charset = utf-8
end_of_line = lf
Expand Down Expand Up @@ -33,6 +35,7 @@ ktlint_standard_chain-method-continuation = disabled
ktlint_ignore_back_ticked_identifier = true
ktlint_standard_multiline-expression-wrapping = disabled
ktlint_standard_when-entry-bracing = disabled
ktlint_standard_expression-operand-wrapping = disabled

[{*/build/**/*,**/*keywords*/**,**/*.Generated.kt,**/*$Extensions.kt}]
ktlint = disabled
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ allprojects {
afterEvaluate {
try {
configure<KtlintExtension> {
version = "1.6.0"
version = "1.8.0"
// rules are set up through .editorconfig
}
} catch (_: UnknownDomainObjectException) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,11 @@ internal fun convertToDataFrame(
val shouldCreateValueCol = keepSubtree ||
kClass in preserveClasses ||
property in preserveProperties ||
!kClass.canBeUnfolded &&
!fieldKind.shouldBeConvertedToFrameColumn &&
!fieldKind.shouldBeConvertedToColumnGroup
(
!kClass.canBeUnfolded &&
!fieldKind.shouldBeConvertedToFrameColumn &&
!fieldKind.shouldBeConvertedToColumnGroup
)

val shouldCreateFrameCol = kClass == DataFrame::class && !nullable
val shouldCreateColumnGroup = kClass == DataRow::class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,17 +190,17 @@ class FastDoubleParserTests {
val parsedByNumberFormatter = formatter.parse(formatted)?.toDouble()

val parsedString = parser.parseOrNull(formatted)
assert(double == parsedString || double.isNaN() && parsedString?.isNaN() == true) {
assert(double == parsedString || (double.isNaN() && parsedString?.isNaN() == true)) {
"Failed to parse $formatted with locale $locale. Expected $double, got $parsedString. NumberFormat parsed it like: $parsedByNumberFormatter"
}

val parsedCharArray = parser.parseOrNull(formatted.toCharArray())
assert(double == parsedCharArray || double.isNaN() && parsedCharArray?.isNaN() == true) {
assert(double == parsedCharArray || (double.isNaN() && parsedCharArray?.isNaN() == true)) {
"Failed to parse $formatted with locale $locale. Expected $double, got $parsedCharArray. NumberFormat parsed it like: $parsedByNumberFormatter"
}

val parsedByteArray = parser.parseOrNull(formatted.toByteArray())
assert(double == parsedByteArray || double.isNaN() && parsedByteArray?.isNaN() == true) {
assert(double == parsedByteArray || (double.isNaN() && parsedByteArray?.isNaN() == true)) {
"Failed to parse $formatted with locale $locale. Expected $double, got $parsedByteArray. NumberFormat parsed it like: $parsedByNumberFormatter"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
@file:Suppress("ktlint")

package org.jetbrains.kotlinx.dataframe.samples.api

import io.kotest.matchers.should
import io.kotest.matchers.shouldBe
import io.kotest.matchers.shouldNotBe
import org.jetbrains.kotlinx.dataframe.DataRow
import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
import org.jetbrains.kotlinx.dataframe.api.asColumn
import org.jetbrains.kotlinx.dataframe.api.asColumnGroup
import org.jetbrains.kotlinx.dataframe.api.cast
import org.jetbrains.kotlinx.dataframe.api.convert
Expand All @@ -16,7 +15,6 @@ import org.jetbrains.kotlinx.dataframe.api.into
import org.jetbrains.kotlinx.dataframe.api.isValueColumn
import org.jetbrains.kotlinx.dataframe.api.map
import org.jetbrains.kotlinx.dataframe.api.print
import org.jetbrains.kotlinx.dataframe.api.asColumn
import org.jetbrains.kotlinx.dataframe.api.to
import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
import org.jetbrains.kotlinx.dataframe.explainer.PluginCallbackProxy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class SchemaGeneratorPlugin : Plugin<Project> {
// Configure the right ksp task to be aware of these new sources
val kspTaskName = "ksp${sourceSetName.replaceFirstChar { it.uppercase() }}Kotlin"
target.tasks.withType(KspTaskJvm::class.java).configureEach {
if (sourceSetName == "main" && name == "kspKotlin" || name == kspTaskName) {
if ((sourceSetName == "main" && name == "kspKotlin") || name == kspTaskName) {
source(src)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ internal fun renderExtensions(
val type = it.propertyType.resolve()
val qualifiedTypeReference = getQualifiedTypeReference(type)
val fieldType = when {
qualifiedTypeReference == "kotlin.collections.List" &&
type.singleTypeArgumentIsDataSchema() ||
(qualifiedTypeReference == "kotlin.collections.List" && type.singleTypeArgumentIsDataSchema()) ||
qualifiedTypeReference == DataFrameNames.DATA_FRAME ->
FieldType.FrameFieldType(
markerName = type.renderTypeArguments(),
Expand Down