Skip to content

Commit c3f52fe

Browse files
committed
added clarifying parentheses around &&/|| mixed boolean expressions
1 parent e07f136 commit c3f52fe

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/toDataFrame.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,11 @@ internal fun convertToDataFrame(
319319
val shouldCreateValueCol = keepSubtree ||
320320
kClass in preserveClasses ||
321321
property in preserveProperties ||
322-
!kClass.canBeUnfolded &&
323-
!fieldKind.shouldBeConvertedToFrameColumn &&
324-
!fieldKind.shouldBeConvertedToColumnGroup
322+
(
323+
!kClass.canBeUnfolded &&
324+
!fieldKind.shouldBeConvertedToFrameColumn &&
325+
!fieldKind.shouldBeConvertedToColumnGroup
326+
)
325327

326328
val shouldCreateFrameCol = kClass == DataFrame::class && !nullable
327329
val shouldCreateColumnGroup = kClass == DataRow::class

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/FastDoubleParserTests.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,17 @@ class FastDoubleParserTests {
190190
val parsedByNumberFormatter = formatter.parse(formatted)?.toDouble()
191191

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

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

202202
val parsedByteArray = parser.parseOrNull(formatted.toByteArray())
203-
assert(double == parsedByteArray || double.isNaN() && parsedByteArray?.isNaN() == true) {
203+
assert(double == parsedByteArray || (double.isNaN() && parsedByteArray?.isNaN() == true)) {
204204
"Failed to parse $formatted with locale $locale. Expected $double, got $parsedByteArray. NumberFormat parsed it like: $parsedByNumberFormatter"
205205
}
206206
}

plugins/dataframe-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/SchemaGeneratorPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class SchemaGeneratorPlugin : Plugin<Project> {
9191
// Configure the right ksp task to be aware of these new sources
9292
val kspTaskName = "ksp${sourceSetName.replaceFirstChar { it.uppercase() }}Kotlin"
9393
target.tasks.withType(KspTaskJvm::class.java).configureEach {
94-
if (sourceSetName == "main" && name == "kspKotlin" || name == kspTaskName) {
94+
if ((sourceSetName == "main" && name == "kspKotlin") || name == kspTaskName) {
9595
source(src)
9696
}
9797
}

plugins/symbol-processor/src/main/kotlin/org/jetbrains/dataframe/ksp/PropertyRenderer.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ internal fun renderExtensions(
4545
val type = it.propertyType.resolve()
4646
val qualifiedTypeReference = getQualifiedTypeReference(type)
4747
val fieldType = when {
48-
qualifiedTypeReference == "kotlin.collections.List" &&
49-
type.singleTypeArgumentIsDataSchema() ||
48+
(qualifiedTypeReference == "kotlin.collections.List" && type.singleTypeArgumentIsDataSchema()) ||
5049
qualifiedTypeReference == DataFrameNames.DATA_FRAME ->
5150
FieldType.FrameFieldType(
5251
markerName = type.renderTypeArguments(),

0 commit comments

Comments
 (0)