Skip to content

Commit 140c353

Browse files
JolanrensenJolanrensen
committed
fixup! K2 compatibility: removed KProperty<DataRow<>>.func {} overloads from DSLs due to no viable workaround for https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument 
1 parent 460f1e6 commit 140c353

File tree

6 files changed

+0
-34
lines changed

6 files changed

+0
-34
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ class AllTests : ColumnsSelectionDslTests() {
183183
df.select { "name".allColsAfter(pathOf("firstName")) },
184184
df.select { "name".allColsAfter(pathOf("name", "firstName")) },
185185

186-
// df.select { Person::name.allColsAfter { firstName } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
187186
df.select { Person::name.allColsAfter { firstNameAccessor } },
188187
df.select { Person::name.allColsAfter(name.firstName) },
189188
df.select { Person::name.allColsAfter(firstNameAccessor) },
@@ -226,7 +225,6 @@ class AllTests : ColumnsSelectionDslTests() {
226225
df.select { "name".allColsFrom(pathOf("lastName")) },
227226
df.select { "name".allColsFrom(pathOf("name", "lastName")) },
228227

229-
// df.select { Person::name.allColsFrom { lastName } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
230228
df.select { Person::name.allColsFrom { lastNameAccessor } },
231229
df.select { Person::name.allColsFrom(name.lastName) },
232230
df.select { Person::name.allColsFrom(lastNameAccessor) },
@@ -280,7 +278,6 @@ class AllTests : ColumnsSelectionDslTests() {
280278
df.select { "name".allColsBefore(pathOf("lastName")) },
281279
df.select { "name".allColsBefore(pathOf("name", "lastName")) },
282280

283-
// df.select { Person::name.allColsBefore { lastName } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
284281
df.select { Person::name.allColsBefore { lastNameAccessor } },
285282
df.select { Person::name.allColsBefore(name.lastName) },
286283
df.select { Person::name.allColsBefore(lastNameAccessor) },
@@ -323,7 +320,6 @@ class AllTests : ColumnsSelectionDslTests() {
323320
df.select { "name".allColsUpTo(pathOf("firstName")) },
324321
df.select { "name".allColsUpTo(pathOf("name", "firstName")) },
325322

326-
// df.select { Person::name.allColsUpTo { firstName } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
327323
df.select { Person::name.allColsUpTo { firstNameAccessor } },
328324
df.select { Person::name.allColsUpTo(name.firstName) },
329325
df.select { Person::name.allColsUpTo(firstNameAccessor) },

‎core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,6 @@ class AllExceptTests : ColumnsSelectionDslTests() {
176176
// df.select { "name".allColsExcept(pathOf("name", "lastName")) }, // breaks
177177
df.select { "name".allColsExcept { cols { "last" in it.name } } },
178178

179-
// df.select { Person::name.allColsExcept { lastName } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
180-
// df.select { Person::name.allColsExcept { lastNameAccessor } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
181179
// df.select { Person::name.allColsExcept(name.lastName) }, // blocked
182180
// df.select { Person::name.allColsExcept(lastNameAccessor) }, // blocked
183181
df.select { Person::name.allColsExcept("lastName") },
@@ -336,13 +334,6 @@ class AllExceptTests : ColumnsSelectionDslTests() {
336334
df.select { "name".exceptNew(pathOf("firstName")) },
337335
df.select { "name".exceptNew(pathOf("firstName"), pathOf("firstName")) },
338336

339-
// https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
340-
// df.select { Person::name exceptNew { cols { "first" in it.name } } },
341-
// df.select { Person::name.exceptNew { cols { "first" in it.name } and cols { "first" in it.name } } },
342-
// df.select { Person::name exceptNew { firstName } },
343-
// df.select { Person::name.exceptNew { firstNameAccessor } },
344-
// df.select { Person::name exceptNew { firstName and firstName } },
345-
// df.select { Person::name.exceptNew { firstNameAccessor and firstNameAccessor } },
346337
// df.select { Person::name exceptNew name.firstName }, // not allowed
347338
// df.select { Person::name.exceptNew(name.firstName and name.firstName) }, // not allowed
348339
// df.select { Person::name exceptNew firstNameAccessor }, // not allowed

‎core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,8 @@ class SelectTests : ColumnsSelectionDslTests() {
3737
df.select { name { colsOf<String>() } },
3838
df.select { (it["name"].asColumnGroup()) { colsOf<String>() } },
3939

40-
// TODO: remove warning due to [KT-64092](https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument)
41-
// df.select { Person::name.select { firstName and lastName } },
4240
df.select { NonDataSchemaPerson::name.select { firstName and lastName } },
4341

44-
// TODO: remove warning due to [KT-64092](https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument)
45-
// df.select { Person::name { firstName and lastName } },
4642
df.select { NonDataSchemaPerson::name { firstName and lastName } },
4743

4844
df.select { "name"<DataRow<Name>>().select { colsOf<String>() } },

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ class AllTests : ColumnsSelectionDslTests() {
183183
df.select { "name".allColsAfter(pathOf("firstName")) },
184184
df.select { "name".allColsAfter(pathOf("name", "firstName")) },
185185

186-
// df.select { Person::name.allColsAfter { firstName } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
187186
df.select { Person::name.allColsAfter { firstNameAccessor } },
188187
df.select { Person::name.allColsAfter(name.firstName) },
189188
df.select { Person::name.allColsAfter(firstNameAccessor) },
@@ -226,7 +225,6 @@ class AllTests : ColumnsSelectionDslTests() {
226225
df.select { "name".allColsFrom(pathOf("lastName")) },
227226
df.select { "name".allColsFrom(pathOf("name", "lastName")) },
228227

229-
// df.select { Person::name.allColsFrom { lastName } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
230228
df.select { Person::name.allColsFrom { lastNameAccessor } },
231229
df.select { Person::name.allColsFrom(name.lastName) },
232230
df.select { Person::name.allColsFrom(lastNameAccessor) },
@@ -280,7 +278,6 @@ class AllTests : ColumnsSelectionDslTests() {
280278
df.select { "name".allColsBefore(pathOf("lastName")) },
281279
df.select { "name".allColsBefore(pathOf("name", "lastName")) },
282280

283-
// df.select { Person::name.allColsBefore { lastName } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
284281
df.select { Person::name.allColsBefore { lastNameAccessor } },
285282
df.select { Person::name.allColsBefore(name.lastName) },
286283
df.select { Person::name.allColsBefore(lastNameAccessor) },
@@ -323,7 +320,6 @@ class AllTests : ColumnsSelectionDslTests() {
323320
df.select { "name".allColsUpTo(pathOf("firstName")) },
324321
df.select { "name".allColsUpTo(pathOf("name", "firstName")) },
325322

326-
// df.select { Person::name.allColsUpTo { firstName } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
327323
df.select { Person::name.allColsUpTo { firstNameAccessor } },
328324
df.select { Person::name.allColsUpTo(name.firstName) },
329325
df.select { Person::name.allColsUpTo(firstNameAccessor) },

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/allExcept.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,6 @@ class AllExceptTests : ColumnsSelectionDslTests() {
176176
// df.select { "name".allColsExcept(pathOf("name", "lastName")) }, // breaks
177177
df.select { "name".allColsExcept { cols { "last" in it.name } } },
178178

179-
// df.select { Person::name.allColsExcept { lastName } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
180-
// df.select { Person::name.allColsExcept { lastNameAccessor } }, https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
181179
// df.select { Person::name.allColsExcept(name.lastName) }, // blocked
182180
// df.select { Person::name.allColsExcept(lastNameAccessor) }, // blocked
183181
df.select { Person::name.allColsExcept("lastName") },
@@ -336,13 +334,6 @@ class AllExceptTests : ColumnsSelectionDslTests() {
336334
df.select { "name".exceptNew(pathOf("firstName")) },
337335
df.select { "name".exceptNew(pathOf("firstName"), pathOf("firstName")) },
338336

339-
// https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument
340-
// df.select { Person::name exceptNew { cols { "first" in it.name } } },
341-
// df.select { Person::name.exceptNew { cols { "first" in it.name } and cols { "first" in it.name } } },
342-
// df.select { Person::name exceptNew { firstName } },
343-
// df.select { Person::name.exceptNew { firstNameAccessor } },
344-
// df.select { Person::name exceptNew { firstName and firstName } },
345-
// df.select { Person::name.exceptNew { firstNameAccessor and firstNameAccessor } },
346337
// df.select { Person::name exceptNew name.firstName }, // not allowed
347338
// df.select { Person::name.exceptNew(name.firstName and name.firstName) }, // not allowed
348339
// df.select { Person::name exceptNew firstNameAccessor }, // not allowed

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,8 @@ class SelectTests : ColumnsSelectionDslTests() {
3737
df.select { name { colsOf<String>() } },
3838
df.select { (it["name"].asColumnGroup()) { colsOf<String>() } },
3939

40-
// TODO: remove warning due to [KT-64092](https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument)
41-
// df.select { Person::name.select { firstName and lastName } },
4240
df.select { NonDataSchemaPerson::name.select { firstName and lastName } },
4341

44-
// TODO: remove warning due to [KT-64092](https://youtrack.jetbrains.com/issue/KT-64092/OVERLOADRESOLUTIONAMBIGUITY-caused-by-lambda-argument)
45-
// df.select { Person::name { firstName and lastName } },
4642
df.select { NonDataSchemaPerson::name { firstName and lastName } },
4743

4844
df.select { "name"<DataRow<Name>>().select { colsOf<String>() } },

0 commit comments

Comments
 (0)