azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch kotlin version to 1.8

Browse Source 
with appropriate fixes in testdata, tests and other
places.
This commit is contained in:
Ilya Chernikov
2022-06-09 17:07:50 +02:00
parent 7fa459044f
commit bb996c1b27
179 changed files with 1038 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inference/capturedTypes/kt46727.txt
Vendored
+1 -1
View File
@@ -55,7 +55,7 @@ public open class Foo2</*0*/ T : kotlin.Any!> {
public open class Foo3</*0*/ T : kotlin.Any!> {
public constructor Foo3</*0*/ T : kotlin.Any!>()
@org.jetbrains.annotations.NotNull public final var value: T
@org.jetbrains.annotations.NotNull public final var value: T & Any
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/inference/capturedTypes/kt46727Warnings.txt
Vendored
+1 -1
View File
@@ -55,7 +55,7 @@ public open class Foo2</*0*/ T : kotlin.Any!> {
public open class Foo3</*0*/ T : kotlin.Any!> {
public constructor Foo3</*0*/ T : kotlin.Any!>()
@org.jetbrains.annotations.NotNull public final var value: T
@org.jetbrains.annotations.NotNull public final var value: T & Any
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/inference/kt49658.kt
Vendored
+6 -6
View File
@@ -1,16 +1,16 @@
// WITH_STDLIB
fun doTheMapThing1(elements: List<CharSequence>): List<String> {
return elements.flatMap {
<!TYPE_MISMATCH_WARNING!>when (it) { // NullPointerException
return elements.<!CANDIDATE_CHOSEN_USING_OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION!>flatMap {
<!TYPE_MISMATCH!>when (it) { // NullPointerException
is String -> listOf("Yeah")
else -> null
}<!>
}
}<!>
}
fun doTheMapThing2(elements: List<CharSequence>): List<String> {
return elements.flatMap {
<!TYPE_MISMATCH, TYPE_MISMATCH, TYPE_MISMATCH_WARNING!>if (it is String) listOf("Yeah") else null<!> // it's OK with `if`
}
return elements.<!CANDIDATE_CHOSEN_USING_OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION!>flatMap {
<!TYPE_MISMATCH, TYPE_MISMATCH, TYPE_MISMATCH!>if (it is String) listOf("Yeah") else null<!> // it's OK with `if`
}<!>
}