Skip to content

Commit 66beb7d

Browse files
JolanrensenJolanrensen
committed
ktlint: manual fixes after merging master
1 parent 7eac7ce commit 66beb7d

File tree

50 files changed

+1213
-1212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1213
-1212
lines changed

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

Lines changed: 216 additions & 365 deletions
Large diffs are not rendered by default.

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,21 @@ import kotlin.reflect.typeOf
2626
@Check
2727
public fun <T> AnyFrame.cast(): DataFrame<T> = this as DataFrame<T>
2828

29-
public inline fun <reified T> AnyFrame.cast(verify: Boolean = true): DataFrame<T> = if (verify) convertToImpl(
30-
typeOf<T>(),
31-
allowConversion = false,
32-
ExcessiveColumns.Keep
33-
).cast()
34-
else cast()
29+
public inline fun <reified T> AnyFrame.cast(verify: Boolean = true): DataFrame<T> =
30+
if (verify) {
31+
convertToImpl(
32+
typeOf<T>(),
33+
allowConversion = false,
34+
ExcessiveColumns.Keep,
35+
).cast()
36+
} else {
37+
cast()
38+
}
3539

3640
public inline fun <reified T> AnyFrame.castTo(
3741
@Suppress("UNUSED_PARAMETER") schemaFrom: DataFrame<T>,
38-
verify: Boolean = true
39-
): DataFrame<T> {
40-
return cast<T>(verify = verify)
41-
}
42+
verify: Boolean = true,
43+
): DataFrame<T> = cast<T>(verify = verify)
4244

4345
public fun <T> AnyRow.cast(): DataRow<T> = this as DataRow<T>
4446

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

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
1515
import org.jetbrains.kotlinx.dataframe.DataRow
1616
import org.jetbrains.kotlinx.dataframe.RowColumnExpression
1717
import org.jetbrains.kotlinx.dataframe.RowValueExpression
18-
import org.jetbrains.kotlinx.dataframe.annotations.*
18+
import org.jetbrains.kotlinx.dataframe.annotations.HasSchema
19+
import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
20+
import org.jetbrains.kotlinx.dataframe.annotations.Refine
1921
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
2022
import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
2123
import org.jetbrains.kotlinx.dataframe.columns.toColumnSet
@@ -37,19 +39,17 @@ import org.jetbrains.kotlinx.dataframe.path
3739
import java.math.BigDecimal
3840
import java.net.URL
3941
import java.time.LocalTime
40-
import java.util.*
42+
import java.util.Locale
4143
import kotlin.reflect.KProperty
4244
import kotlin.reflect.KType
4345
import kotlin.reflect.full.isSubtypeOf
4446
import kotlin.reflect.full.withNullability
4547
import kotlin.reflect.typeOf
4648

4749
@Interpretable("Convert0")
48-
public fun <T, C> DataFrame<T>.convert(columns: ColumnsSelector<T, C>): Convert<T, C> =
49-
Convert(this, columns)
50+
public fun <T, C> DataFrame<T>.convert(columns: ColumnsSelector<T, C>): Convert<T, C> = Convert(this, columns)
5051

51-
public fun <T, C> DataFrame<T>.convert(vararg columns: KProperty<C>): Convert<T, C> =
52-
convert { columns.toColumnSet() }
52+
public fun <T, C> DataFrame<T>.convert(vararg columns: KProperty<C>): Convert<T, C> = convert { columns.toColumnSet() }
5353

5454
@Interpretable("Convert2")
5555
public fun <T> DataFrame<T>.convert(vararg columns: String): Convert<T, Any?> = convert { columns.toColumnSet() }
@@ -62,30 +62,32 @@ public inline fun <T, C, reified R> DataFrame<T>.convert(
6262
vararg cols: ColumnReference<C>,
6363
infer: Infer = Infer.Nulls,
6464
noinline expression: RowValueExpression<T, C, R>,
65-
): DataFrame<T> =
66-
convert(*headPlusArray(firstCol, cols)).with(infer, expression)
65+
): DataFrame<T> = convert(*headPlusArray(firstCol, cols)).with(infer, expression)
6766

6867
public inline fun <T, C, reified R> DataFrame<T>.convert(
6968
firstCol: KProperty<C>,
7069
vararg cols: KProperty<C>,
7170
infer: Infer = Infer.Nulls,
7271
noinline expression: RowValueExpression<T, C, R>,
73-
): DataFrame<T> =
74-
convert(*headPlusArray(firstCol, cols)).with(infer, expression)
72+
): DataFrame<T> = convert(*headPlusArray(firstCol, cols)).with(infer, expression)
7573

7674
@Interpretable("Convert6")
7775
public inline fun <T, reified R> DataFrame<T>.convert(
7876
firstCol: String,
7977
vararg cols: String,
8078
infer: Infer = Infer.Nulls,
8179
noinline expression: RowValueExpression<T, Any?, R>,
82-
): DataFrame<T> =
83-
convert(*headPlusArray(firstCol, cols)).with(infer, expression)
80+
): DataFrame<T> = convert(*headPlusArray(firstCol, cols)).with(infer, expression)
8481

85-
public inline fun <T, C, reified R> Convert<T, C?>.notNull(crossinline expression: RowValueExpression<T, C, R>): DataFrame<T> =
82+
public inline fun <T, C, reified R> Convert<T, C?>.notNull(
83+
crossinline expression: RowValueExpression<T, C, R>,
84+
): DataFrame<T> =
8685
with {
87-
if (it == null) null
88-
else expression(this, it)
86+
if (it == null) {
87+
null
88+
} else {
89+
expression(this, it)
90+
}
8991
}
9092

9193
@HasSchema(schemaArg = 0)
@@ -105,29 +107,28 @@ public fun <T, C> Convert<T, C>.to(columnConverter: DataFrame<T>.(DataColumn<C>)
105107
public inline fun <T, C, reified R> Convert<T, C>.with(
106108
infer: Infer = Infer.Nulls,
107109
noinline rowConverter: RowValueExpression<T, C, R>,
108-
): DataFrame<T> =
109-
withRowCellImpl(typeOf<R>(), infer, rowConverter)
110+
): DataFrame<T> = withRowCellImpl(typeOf<R>(), infer, rowConverter)
110111

111112
@Refine
112113
@Interpretable("With0")
113114
public inline fun <T, C, reified R> Convert<T, C>.with(
114-
noinline rowConverter: RowValueExpression<T, C, R>
115+
noinline rowConverter: RowValueExpression<T, C, R>,
115116
): DataFrame<T> = with(Infer.Nulls, rowConverter)
116117

117-
public fun <T, C, R> Convert<T, DataRow<C>>.asFrame(body: ColumnsContainer<T>.(ColumnGroup<C>) -> DataFrame<R>): DataFrame<T> =
118-
to { body(this, it.asColumnGroup()).asColumnGroup(it.name()) }
118+
public fun <T, C, R> Convert<T, DataRow<C>>.asFrame(
119+
body: ColumnsContainer<T>.(ColumnGroup<C>) -> DataFrame<R>,
120+
): DataFrame<T> = to { body(this, it.asColumnGroup()).asColumnGroup(it.name()) }
119121

120122
public inline fun <T, C, reified R> Convert<T, C>.perRowCol(
121123
infer: Infer = Infer.Nulls,
122124
noinline expression: RowColumnExpression<T, C, R>,
123-
): DataFrame<T> =
124-
convertRowColumnImpl(typeOf<R>(), infer, expression)
125+
): DataFrame<T> = convertRowColumnImpl(typeOf<R>(), infer, expression)
125126

126127
public inline fun <reified C> AnyCol.convertTo(): DataColumn<C> = convertTo(typeOf<C>()) as DataColumn<C>
127128

128129
public fun AnyCol.convertTo(newType: KType): AnyCol {
129-
val isTypesAreCorrect = this.type().withNullability(true)
130-
.isSubtypeOf(typeOf<String?>()) && newType.withNullability(true) == typeOf<Double?>()
130+
val isTypesAreCorrect = this.type().withNullability(true).isSubtypeOf(typeOf<String?>()) &&
131+
newType.withNullability(true) == typeOf<Double?>()
131132

132133
if (isTypesAreCorrect) {
133134
return (this as DataColumn<String?>).convertToDouble().setNullable(newType.isMarkedNullable)
@@ -186,9 +187,8 @@ public fun <T : Any> DataColumn<T?>.convertToDouble(): DataColumn<Double?> = con
186187
* If [locale] parameter is null, the current system locale is used. If column can not be parsed, then POSIX format is used.
187188
*/
188189
@JvmName("convertToDoubleFromString")
189-
public fun DataColumn<String>.convertToDouble(locale: Locale? = null): DataColumn<Double> {
190-
return this.castToNullable().convertToDouble(locale).castToNotNullable()
191-
}
190+
public fun DataColumn<String>.convertToDouble(locale: Locale? = null): DataColumn<Double> =
191+
this.castToNullable().convertToDouble(locale).castToNotNullable()
192192

193193
/**
194194
* Parse String column to Double considering locale (number format).
@@ -207,7 +207,7 @@ public fun DataColumn<String?>.convertToDouble(locale: Locale? = null): DataColu
207207
value = value,
208208
from = typeOf<String>(),
209209
to = typeOf<Double>(),
210-
column = path
210+
column = path,
211211
)
212212
}
213213
}
@@ -260,29 +260,21 @@ public fun <T, R : URL?> Convert<T, R>.toImg(width: Int? = null, height: Int? =
260260

261261
// region toURL
262262

263-
public fun DataColumn<String>.convertToURL(): DataColumn<URL> {
264-
return map { URL(it) }
265-
}
263+
public fun DataColumn<String>.convertToURL(): DataColumn<URL> = map { URL(it) }
266264

267265
@JvmName("convertToURLFromStringNullable")
268-
public fun DataColumn<String?>.convertToURL(): DataColumn<URL?> {
269-
return map { it?.let { URL(it) } }
270-
}
266+
public fun DataColumn<String?>.convertToURL(): DataColumn<URL?> = map { it?.let { URL(it) } }
271267

272268
public fun <T, R : String?> Convert<T, R>.toURL(): DataFrame<T> = to { it.convertToURL() }
273269

274270
// endregion
275271

276272
// region toInstant
277273

278-
public fun DataColumn<String>.convertToInstant(): DataColumn<Instant> {
279-
return map { Instant.parse(it) }
280-
}
274+
public fun DataColumn<String>.convertToInstant(): DataColumn<Instant> = map { Instant.parse(it) }
281275

282276
@JvmName("convertToInstantFromStringNullable")
283-
public fun DataColumn<String?>.convertToInstant(): DataColumn<Instant?> {
284-
return map { it?.let { Instant.parse(it) } }
285-
}
277+
public fun DataColumn<String?>.convertToInstant(): DataColumn<Instant?> = map { it?.let { Instant.parse(it) } }
286278

287279
public fun <T, R : String?> Convert<T, R>.toInstant(): DataFrame<T> = to { it.convertToInstant() }
288280

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public inline fun <reified T : Any> AnyFrame.convertTo(
194194
public inline fun <reified T : Any> AnyFrame.convertTo(
195195
@Suppress("UNUSED_PARAMETER") schemaFrom: DataFrame<T>,
196196
excessiveColumnsBehavior: ExcessiveColumns = ExcessiveColumns.Keep,
197-
noinline body: ConvertSchemaDsl<T>.() -> Unit = {}
197+
noinline body: ConvertSchemaDsl<T>.() -> Unit = {},
198198
): DataFrame<T> = convertToImpl(typeOf<T>(), true, excessiveColumnsBehavior, body).cast()
199199

200200
/**

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

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,13 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
55
import org.jetbrains.kotlinx.dataframe.DataRow
66
import org.jetbrains.kotlinx.dataframe.Predicate
77
import org.jetbrains.kotlinx.dataframe.annotations.Interpretable
8-
import org.jetbrains.kotlinx.dataframe.api.FrameColsColumnsSelectionDsl.Grammar.ColumnGroupName
9-
import org.jetbrains.kotlinx.dataframe.api.FrameColsColumnsSelectionDsl.Grammar.ColumnSetName
10-
import org.jetbrains.kotlinx.dataframe.api.FrameColsColumnsSelectionDsl.Grammar.PlainDslName
118
import org.jetbrains.kotlinx.dataframe.columns.ColumnPath
129
import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1310
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
1411
import org.jetbrains.kotlinx.dataframe.columns.ColumnsResolver
1512
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
1613
import org.jetbrains.kotlinx.dataframe.columns.SingleColumn
1714
import org.jetbrains.kotlinx.dataframe.documentation.AccessApi
18-
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
19-
import org.jetbrains.kotlinx.dataframe.documentation.Indent
20-
import org.jetbrains.kotlinx.dataframe.documentation.LineBreak
2115
import org.jetbrains.kotlinx.dataframe.impl.columns.TransformableColumnSet
2216
import kotlin.reflect.KProperty
2317

@@ -41,11 +35,11 @@ public interface FrameColsColumnsSelectionDsl {
4135
*
4236
* ### Definitions:
4337
* `columnSet: `[`ColumnSet`][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]`<*>`
44-
*
38+
*
4539
* &nbsp;&nbsp;&nbsp;&nbsp;
4640
*
4741
* `columnGroup: `[`SingleColumn`][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`String`][String]` | `[`KProperty`][kotlin.reflect.KProperty]`<* | `[`DataRow`][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath]
48-
*
42+
*
4943
* &nbsp;&nbsp;&nbsp;&nbsp;
5044
*
5145
* `condition: `[`ColumnFilter`][org.jetbrains.kotlinx.dataframe.ColumnFilter]
@@ -54,7 +48,7 @@ public interface FrameColsColumnsSelectionDsl {
5448
*
5549
* ### What can be called directly in the [Columns Selection DSL][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl]:
5650
*
57-
*
51+
*
5852
* &nbsp;&nbsp;&nbsp;&nbsp;
5953
*
6054
* [**`frameCols`**][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl.colGroups]` [ `**`{ `**[`condition`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**` ]`
@@ -63,7 +57,7 @@ public interface FrameColsColumnsSelectionDsl {
6357
*
6458
* ### What can be called on a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]:
6559
*
66-
*
60+
*
6761
* &nbsp;&nbsp;&nbsp;&nbsp;
6862
*
6963
* [`columnSet`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnSetDef]
@@ -74,7 +68,7 @@ public interface FrameColsColumnsSelectionDsl {
7468
*
7569
* ### What can be called on a [Column Group (reference)][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnGroupDef]:
7670
*
77-
*
71+
*
7872
* &nbsp;&nbsp;&nbsp;&nbsp;
7973
*
8074
* [`columnGroup`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnGroupDef]
@@ -177,8 +171,9 @@ public interface FrameColsColumnsSelectionDsl {
177171
* @see [ColumnsSelectionDsl.cols]
178172
*/
179173
@Interpretable("FrameCols0")
180-
public fun ColumnSet<*>.frameCols(filter: Predicate<FrameColumn<*>> = { true }): TransformableColumnSet<DataFrame<*>> =
181-
frameColumnsInternal(filter)
174+
public fun ColumnSet<*>.frameCols(
175+
filter: Predicate<FrameColumn<*>> = { true },
176+
): TransformableColumnSet<DataFrame<*>> = frameColumnsInternal(filter)
182177

183178
/**
184179
* ## Frame Columns
@@ -212,8 +207,9 @@ public interface FrameColsColumnsSelectionDsl {
212207
* @see [ColumnsSelectionDsl.colGroups]
213208
* @see [ColumnsSelectionDsl.cols]
214209
*/
215-
public fun ColumnsSelectionDsl<*>.frameCols(filter: Predicate<FrameColumn<*>> = { true }): TransformableColumnSet<DataFrame<*>> =
216-
asSingleColumn().frameColumnsInternal(filter)
210+
public fun ColumnsSelectionDsl<*>.frameCols(
211+
filter: Predicate<FrameColumn<*>> = { true },
212+
): TransformableColumnSet<DataFrame<*>> = asSingleColumn().frameColumnsInternal(filter)
217213

218214
/**
219215
* ## Frame Columns
@@ -247,8 +243,9 @@ public interface FrameColsColumnsSelectionDsl {
247243
* @see [ColumnsSelectionDsl.colGroups]
248244
* @see [ColumnsSelectionDsl.cols]
249245
*/
250-
public fun SingleColumn<DataRow<*>>.frameCols(filter: Predicate<FrameColumn<*>> = { true }): TransformableColumnSet<DataFrame<*>> =
251-
this.ensureIsColumnGroup().frameColumnsInternal(filter)
246+
public fun SingleColumn<DataRow<*>>.frameCols(
247+
filter: Predicate<FrameColumn<*>> = { true },
248+
): TransformableColumnSet<DataFrame<*>> = this.ensureIsColumnGroup().frameColumnsInternal(filter)
252249

253250
/**
254251
* ## Frame Columns
@@ -319,8 +316,9 @@ public interface FrameColsColumnsSelectionDsl {
319316
* @see [ColumnsSelectionDsl.colGroups]
320317
* @see [ColumnsSelectionDsl.cols]
321318
*/
322-
public fun KProperty<*>.frameCols(filter: Predicate<FrameColumn<*>> = { true }): TransformableColumnSet<DataFrame<*>> =
323-
columnGroup(this).frameCols(filter)
319+
public fun KProperty<*>.frameCols(
320+
filter: Predicate<FrameColumn<*>> = { true },
321+
): TransformableColumnSet<DataFrame<*>> = columnGroup(this).frameCols(filter)
324322

325323
/**
326324
* ## Frame Columns
@@ -352,8 +350,9 @@ public interface FrameColsColumnsSelectionDsl {
352350
* @see [ColumnsSelectionDsl.colGroups]
353351
* @see [ColumnsSelectionDsl.cols]
354352
*/
355-
public fun ColumnPath.frameCols(filter: Predicate<FrameColumn<*>> = { true }): TransformableColumnSet<DataFrame<*>> =
356-
columnGroup(this).frameCols(filter)
353+
public fun ColumnPath.frameCols(
354+
filter: Predicate<FrameColumn<*>> = { true },
355+
): TransformableColumnSet<DataFrame<*>> = columnGroup(this).frameCols(filter)
357356
}
358357

359358
/**
@@ -363,7 +362,9 @@ public interface FrameColsColumnsSelectionDsl {
363362
* @return A [TransformableColumnSet] containing the frame columns that satisfy the filter.
364363
*/
365364
@Suppress("UNCHECKED_CAST")
366-
internal fun ColumnsResolver<*>.frameColumnsInternal(filter: (FrameColumn<*>) -> Boolean): TransformableColumnSet<AnyFrame> =
365+
internal fun ColumnsResolver<*>.frameColumnsInternal(
366+
filter: (FrameColumn<*>) -> Boolean,
367+
): TransformableColumnSet<AnyFrame> =
367368
colsInternal { it.isFrameColumn() && filter(it.asFrameColumn()) } as TransformableColumnSet<AnyFrame>
368369

369370
// endregion

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

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ public fun <T> DataFrame<T>.generateCode(
3131
).code.declarations.toCodeString()
3232
}
3333

34-
public inline fun <reified T> DataFrame<T>.generateInterfaces(): CodeString = generateCode(
35-
fields = true,
36-
extensionProperties = false
37-
)
34+
public inline fun <reified T> DataFrame<T>.generateInterfaces(): CodeString =
35+
generateCode(
36+
fields = true,
37+
extensionProperties = false,
38+
)
3839

3940
public inline fun <reified T> DataFrame<T>.generateDataClasses(
4041
markerName: String? = null,
@@ -53,20 +54,24 @@ public inline fun <reified T> DataFrame<T>.generateDataClasses(
5354
isOpen = false,
5455
visibility = visibility,
5556
asDataClass = true,
56-
fieldNameNormalizer = nameNormalizer
57+
fieldNameNormalizer = nameNormalizer,
5758
).code.declarations.toCodeString()
5859
}
5960

6061
@PublishedApi
61-
internal inline fun <reified T> markerName(): String = if (T::class.isAbstract) {
62-
T::class.simpleName!!
63-
} else "DataEntry"
62+
internal inline fun <reified T> markerName(): String =
63+
if (T::class.isAbstract) {
64+
T::class.simpleName!!
65+
} else {
66+
"DataEntry"
67+
}
6468

65-
public fun <T> DataFrame<T>.generateInterfaces(markerName: String): CodeString = generateCode(
66-
markerName = markerName,
67-
fields = true,
68-
extensionProperties = false
69-
)
69+
public fun <T> DataFrame<T>.generateInterfaces(markerName: String): CodeString =
70+
generateCode(
71+
markerName = markerName,
72+
fields = true,
73+
extensionProperties = false,
74+
)
7075

7176
/**
7277
* Converts delimited 'my_name', 'my name', etc., String to camelCase 'myName'

0 commit comments

Comments
 (0)