Skip to content

Commit f29f1c7

Browse files
JolanrensenJolanrensen
committed
linter fixes
1 parent 1552ad7 commit f29f1c7

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
359359
public fun KProperty<*>.first(condition: ColumnFilter<*> = { true }): SingleColumn<*> =
360360
colGroup(this).first(condition)
361361

362-
363362
/**
364363
* ## Last
365364
* Returns the last column in this [ColumnSet] or [ColumnGroup] that adheres to the given [condition\].
@@ -463,7 +462,6 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
463462
public fun KProperty<*>.last(condition: ColumnFilter<*> = { true }): SingleColumn<*> =
464463
colGroup(this).last(condition)
465464

466-
467465
/**
468466
* ## Single
469467
* Returns the single column in this [ColumnSet] or [ColumnGroup] that adheres to the given [condition\].
@@ -2002,7 +2000,6 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
20022000
predicate: ColumnFilter<*> = { true },
20032001
): ColumnSet<Any?> = cols(predicate)
20042002

2005-
20062003
/**
20072004
* ## Cols
20082005
* Creates a sub-[ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] from a parent [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] or [ColumnGroup][org.jetbrains.kotlinx.dataframe.columns.ColumnGroup]

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,12 @@ internal fun <A, B> ColumnSet<A>.transform(converter: (List<ColumnWithPath<A>>)
104104
override fun resolve(context: ColumnResolutionContext) = converter(this@transform.resolve(context))
105105
}
106106

107-
internal fun <A, B> ColumnSet<A>.transformWithContext(converter: ColumnResolutionContext.(List<ColumnWithPath<A>>) -> List<ColumnWithPath<B>>): ColumnSet<B> =
108-
object : ColumnSet<B> {
109-
override fun resolve(context: ColumnResolutionContext) = converter(context, this@transformWithContext.resolve(context))
110-
}
107+
internal fun <A, B> ColumnSet<A>.transformWithContext(
108+
converter: ColumnResolutionContext.(List<ColumnWithPath<A>>) -> List<ColumnWithPath<B>>,
109+
): ColumnSet<B> = object : ColumnSet<B> {
110+
override fun resolve(context: ColumnResolutionContext) =
111+
converter(context, this@transformWithContext.resolve(context))
112+
}
111113

112114
internal fun <T> ColumnSet<T>.singleImpl() = object : SingleColumn<T> {
113115
override fun resolveSingle(context: ColumnResolutionContext): ColumnWithPath<T>? {
@@ -121,13 +123,15 @@ internal fun <T> ColumnSet<T>.getAt(index: Int) = object : SingleColumn<T> {
121123
}
122124
}
123125

124-
internal fun <T> ColumnSet<T>.getChildrenAt(index: Int): ColumnSet<Any?> = transform { it.mapNotNull { it.getChild(index) } }
126+
internal fun <T> ColumnSet<T>.getChildrenAt(index: Int): ColumnSet<Any?> =
127+
transform { it.mapNotNull { it.getChild(index) } }
125128

126129
internal fun <C> ColumnsContainer<*>.getColumn(name: String, policy: UnresolvedColumnsPolicy) =
127130
getColumnOrNull(name)?.cast()
128131
?: when (policy) {
129132
UnresolvedColumnsPolicy.Fail ->
130133
error("Column not found: $name")
134+
131135
UnresolvedColumnsPolicy.Skip -> null
132136
UnresolvedColumnsPolicy.Create -> DataColumn.empty().cast<C>()
133137
}
@@ -137,6 +141,7 @@ internal fun <C> ColumnsContainer<*>.getColumn(path: ColumnPath, policy: Unresol
137141
?: when (policy) {
138142
UnresolvedColumnsPolicy.Fail ->
139143
error("Column not found: $path")
144+
140145
UnresolvedColumnsPolicy.Skip -> null
141146
UnresolvedColumnsPolicy.Create -> DataColumn.empty().cast<C>()
142147
}

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/ColumnsSelectionDsl.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
260260
public fun KProperty<*>.first(condition: ColumnFilter<*> = { true }): SingleColumn<*> =
261261
colGroup(this).first(condition)
262262

263-
264263
/**
265264
* ## Last
266265
* Returns the last column in this [ColumnSet] or [ColumnGroup] that adheres to the given [condition\].
@@ -324,7 +323,6 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
324323
public fun KProperty<*>.last(condition: ColumnFilter<*> = { true }): SingleColumn<*> =
325324
colGroup(this).last(condition)
326325

327-
328326
/**
329327
* ## Single
330328
* Returns the single column in this [ColumnSet] or [ColumnGroup] that adheres to the given [condition\].
@@ -990,7 +988,6 @@ public interface ColumnsSelectionDsl<out T> : ColumnSelectionDsl<T>, SingleColum
990988
predicate: ColumnFilter<*> = { true },
991989
): ColumnSet<Any?> = cols(predicate)
992990

993-
994991
/**
995992
* @include [CommonColsDocs.Predicate]
996993
* @arg [CommonColsDocs.Examples]

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/columns/Utils.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,12 @@ internal fun <A, B> ColumnSet<A>.transform(converter: (List<ColumnWithPath<A>>)
104104
override fun resolve(context: ColumnResolutionContext) = converter(this@transform.resolve(context))
105105
}
106106

107-
internal fun <A, B> ColumnSet<A>.transformWithContext(converter: ColumnResolutionContext.(List<ColumnWithPath<A>>) -> List<ColumnWithPath<B>>): ColumnSet<B> =
108-
object : ColumnSet<B> {
109-
override fun resolve(context: ColumnResolutionContext) = converter(context, this@transformWithContext.resolve(context))
110-
}
107+
internal fun <A, B> ColumnSet<A>.transformWithContext(
108+
converter: ColumnResolutionContext.(List<ColumnWithPath<A>>) -> List<ColumnWithPath<B>>,
109+
): ColumnSet<B> = object : ColumnSet<B> {
110+
override fun resolve(context: ColumnResolutionContext) =
111+
converter(context, this@transformWithContext.resolve(context))
112+
}
111113

112114
internal fun <T> ColumnSet<T>.singleImpl() = object : SingleColumn<T> {
113115
override fun resolveSingle(context: ColumnResolutionContext): ColumnWithPath<T>? {
@@ -121,13 +123,15 @@ internal fun <T> ColumnSet<T>.getAt(index: Int) = object : SingleColumn<T> {
121123
}
122124
}
123125

124-
internal fun <T> ColumnSet<T>.getChildrenAt(index: Int): ColumnSet<Any?> = transform { it.mapNotNull { it.getChild(index) } }
126+
internal fun <T> ColumnSet<T>.getChildrenAt(index: Int): ColumnSet<Any?> =
127+
transform { it.mapNotNull { it.getChild(index) } }
125128

126129
internal fun <C> ColumnsContainer<*>.getColumn(name: String, policy: UnresolvedColumnsPolicy) =
127130
getColumnOrNull(name)?.cast()
128131
?: when (policy) {
129132
UnresolvedColumnsPolicy.Fail ->
130133
error("Column not found: $name")
134+
131135
UnresolvedColumnsPolicy.Skip -> null
132136
UnresolvedColumnsPolicy.Create -> DataColumn.empty().cast<C>()
133137
}
@@ -137,6 +141,7 @@ internal fun <C> ColumnsContainer<*>.getColumn(path: ColumnPath, policy: Unresol
137141
?: when (policy) {
138142
UnresolvedColumnsPolicy.Fail ->
139143
error("Column not found: $path")
144+
140145
UnresolvedColumnsPolicy.Skip -> null
141146
UnresolvedColumnsPolicy.Create -> DataColumn.empty().cast<C>()
142147
}

0 commit comments

Comments
 (0)