diff --git a/compiler/testData/cli/js/compilationErrorK2.out b/compiler/testData/cli/js/compilationErrorK2.out index 65a4775c44d..1429a47e346 100644 --- a/compiler/testData/cli/js/compilationErrorK2.out +++ b/compiler/testData/cli/js/compilationErrorK2.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/js/compilationErrorK2.kt:9:13: error: cannot access 'companion object Test : Any': it is private in '/Foo'. Foo.Test ^ diff --git a/compiler/testData/cli/js/fir.out b/compiler/testData/cli/js/fir.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/js/fir.out +++ b/compiler/testData/cli/js/fir.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/js/firLightTreeOn.out b/compiler/testData/cli/js/firLightTreeOn.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/js/firLightTreeOn.out +++ b/compiler/testData/cli/js/firLightTreeOn.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/js/firMpp.out b/compiler/testData/cli/js/firMpp.out index 0afdba6a4b9..ad99c0407ca 100644 --- a/compiler/testData/cli/js/firMpp.out +++ b/compiler/testData/cli/js/firMpp.out @@ -7,5 +7,4 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/js/firMppWithKlib.out b/compiler/testData/cli/js/firMppWithKlib.out index 0afdba6a4b9..ad99c0407ca 100644 --- a/compiler/testData/cli/js/firMppWithKlib.out +++ b/compiler/testData/cli/js/firMppWithKlib.out @@ -7,5 +7,4 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/js/languageVersion.args b/compiler/testData/cli/js/languageVersion.args index d3887d33689..5f5c1605c56 100644 --- a/compiler/testData/cli/js/languageVersion.args +++ b/compiler/testData/cli/js/languageVersion.args @@ -6,6 +6,6 @@ $TEMP_DIR$ -ir-output-name out -language-version -1.4 +1.5 -libraries $STDLIB_JS$ diff --git a/compiler/testData/cli/js/languageVersion.kt b/compiler/testData/cli/js/languageVersion.kt index bf2d9e05294..c716d9c540a 100644 --- a/compiler/testData/cli/js/languageVersion.kt +++ b/compiler/testData/cli/js/languageVersion.kt @@ -1,4 +1,5 @@ package test -sealed interface Polygon +import kotlin.reflect.* +abstract class Some : KSuspendFunction0 diff --git a/compiler/testData/cli/js/languageVersion.out b/compiler/testData/cli/js/languageVersion.out index 446f2a77ebe..d63b6d94e83 100644 --- a/compiler/testData/cli/js/languageVersion.out +++ b/compiler/testData/cli/js/languageVersion.out @@ -1,5 +1,5 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/js/languageVersion.kt:3:1: error: the feature "sealed interfaces" is only available since language version 1.5 -sealed interface Polygon -^ +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin +compiler/testData/cli/js/languageVersion.kt:5:23: error: KSuspendFunctionN interfaces are not allowed as supertypes +abstract class Some : KSuspendFunction0 + ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/js/reifiedIntersectionType.out b/compiler/testData/cli/js/reifiedIntersectionType.out index 4a6e77c28a4..d86bac9de59 100644 --- a/compiler/testData/cli/js/reifiedIntersectionType.out +++ b/compiler/testData/cli/js/reifiedIntersectionType.out @@ -1,13 +1 @@ -compiler/testData/cli/js/reifiedIntersectionType.kt:2:9: warning: variable 'flow' is never used - val flow = combine( - ^ -compiler/testData/cli/js/reifiedIntersectionType.kt:11:12: warning: parameter 'flows' is never used - vararg flows: Flow, - ^ -compiler/testData/cli/js/reifiedIntersectionType.kt:12:17: warning: parameter 'transform' is never used - crossinline transform: suspend (Array) -> R - ^ -compiler/testData/cli/js/reifiedIntersectionType.kt:15:16: warning: parameter 'value' is never used -fun flowOf(value: T): Flow = TODO() - ^ OK diff --git a/compiler/testData/cli/js/successfulHmpp.out b/compiler/testData/cli/js/successfulHmpp.out index 0afdba6a4b9..ad99c0407ca 100644 --- a/compiler/testData/cli/js/successfulHmpp.out +++ b/compiler/testData/cli/js/successfulHmpp.out @@ -7,5 +7,4 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/apiVersion.out b/compiler/testData/cli/jvm/apiVersion.out index 554a1000728..5e8d0116b04 100644 --- a/compiler/testData/cli/jvm/apiVersion.out +++ b/compiler/testData/cli/jvm/apiVersion.out @@ -1,95 +1,2 @@ warning: API version 1.4 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/apiVersion.kt:4:5: warning: parameter 'p00' is never used - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:4:13: warning: parameter 'p01' is never used - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:4:21: warning: parameter 'p02' is never used - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:4:29: warning: parameter 'p03' is never used - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:4:37: warning: parameter 'p04' is never used - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:4:45: warning: parameter 'p05' is never used - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:4:53: warning: parameter 'p06' is never used - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:4:61: warning: parameter 'p07' is never used - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:4:69: warning: parameter 'p08' is never used - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:4:77: warning: parameter 'p09' is never used - p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:5:5: warning: parameter 'p10' is never used - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:5:13: warning: parameter 'p11' is never used - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:5:21: warning: parameter 'p12' is never used - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:5:29: warning: parameter 'p13' is never used - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:5:37: warning: parameter 'p14' is never used - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:5:45: warning: parameter 'p15' is never used - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:5:53: warning: parameter 'p16' is never used - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:5:61: warning: parameter 'p17' is never used - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:5:69: warning: parameter 'p18' is never used - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:5:77: warning: parameter 'p19' is never used - p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, - ^ -compiler/testData/cli/jvm/apiVersion.kt:6:5: warning: parameter 'p20' is never used - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A - ^ -compiler/testData/cli/jvm/apiVersion.kt:6:13: warning: parameter 'p21' is never used - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A - ^ -compiler/testData/cli/jvm/apiVersion.kt:6:21: warning: parameter 'p22' is never used - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A - ^ -compiler/testData/cli/jvm/apiVersion.kt:6:29: warning: parameter 'p23' is never used - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A - ^ -compiler/testData/cli/jvm/apiVersion.kt:6:37: warning: parameter 'p24' is never used - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A - ^ -compiler/testData/cli/jvm/apiVersion.kt:6:45: warning: parameter 'p25' is never used - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A - ^ -compiler/testData/cli/jvm/apiVersion.kt:6:53: warning: parameter 'p26' is never used - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A - ^ -compiler/testData/cli/jvm/apiVersion.kt:6:61: warning: parameter 'p27' is never used - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A - ^ -compiler/testData/cli/jvm/apiVersion.kt:6:69: warning: parameter 'p28' is never used - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A - ^ -compiler/testData/cli/jvm/apiVersion.kt:6:77: warning: parameter 'p29' is never used - p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A - ^ -compiler/testData/cli/jvm/apiVersion.kt:9:9: warning: parameter 'x' is never used -fun bar(x: Any) {} - ^ OK diff --git a/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.out b/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.out index 673c7b97b5e..b7b2a230c28 100644 --- a/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.out +++ b/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.out @@ -1,8 +1,8 @@ warning: API version 1.4 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.kt:1:1: warning: the version is greater than the specified API version 1.4 +compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.kt:1:14: warning: the version is greater than the specified API version 1.4 @SinceKotlin("1.5") -^ -compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.kt:4:1: warning: the version is greater than the specified API version 1.4 + ^ +compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.kt:4:14: warning: the version is greater than the specified API version 1.4 @SinceKotlin("1.6") -^ + ^ OK diff --git a/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.args b/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.args index d411b6e5d6d..d79857ef35c 100644 --- a/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.args +++ b/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.args @@ -2,6 +2,6 @@ $TESTDATA_DIR$/apiVersion.kt -d $TEMP_DIR$ -api-version -1.5 +1.6 -language-version -1.4 +1.5 diff --git a/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.out b/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.out index 139c6778188..c88d3f3e604 100644 --- a/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.out +++ b/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.out @@ -1,3 +1,3 @@ -error: -api-version (1.5) cannot be greater than -language-version (1.4) -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin +error: -api-version (1.6) cannot be greater than -language-version (1.5) +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/apiVersionInvalid.out b/compiler/testData/cli/jvm/apiVersionInvalid.out index c436c6f08ec..2c5b818a405 100644 --- a/compiler/testData/cli/jvm/apiVersionInvalid.out +++ b/compiler/testData/cli/jvm/apiVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown API version: 239.42 -Supported API versions: 1.4 (deprecated), 1.5 (deprecated), 1.6, 1.7, 1.8, 1.9, 2.0 (experimental), 2.1 (experimental) +Supported API versions: 1.4 (deprecated), 1.5 (deprecated), 1.6 (deprecated), 1.7, 1.8, 1.9, 2.0, 2.1 (experimental) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/builderInferenceByDefault.out b/compiler/testData/cli/jvm/builderInferenceByDefault.out index b70c533f321..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/builderInferenceByDefault.out +++ b/compiler/testData/cli/jvm/builderInferenceByDefault.out @@ -1,7 +1 @@ -compiler/testData/cli/jvm/builderInferenceByDefault.kt:1:21: warning: parameter 'builderAction' is never used -fun buildMap(builderAction: MutableMap.() -> Unit): Map = mapOf() - ^ -compiler/testData/cli/jvm/builderInferenceByDefault.kt:4:9: warning: variable 'x' is never used - val x = buildMap { - ^ OK diff --git a/compiler/testData/cli/jvm/builderInferenceErrors.out b/compiler/testData/cli/jvm/builderInferenceErrors.out index 7bae50a2842..1fbd7504fb0 100644 --- a/compiler/testData/cli/jvm/builderInferenceErrors.out +++ b/compiler/testData/cli/jvm/builderInferenceErrors.out @@ -1,20 +1,4 @@ -compiler/testData/cli/jvm/builderInferenceErrors.kt:6:9: error: overload resolution ambiguity: -public inline fun println(message: Any?): Unit defined in kotlin.io -public inline fun println(message: Boolean): Unit defined in kotlin.io -public inline fun println(message: Byte): Unit defined in kotlin.io -public inline fun println(message: Char): Unit defined in kotlin.io -public inline fun println(message: CharArray): Unit defined in kotlin.io -public inline fun println(message: Double): Unit defined in kotlin.io -public inline fun println(message: Float): Unit defined in kotlin.io -public inline fun println(message: Int): Unit defined in kotlin.io -public inline fun println(message: Long): Unit defined in kotlin.io -public inline fun println(message: Short): Unit defined in kotlin.io +compiler/testData/cli/jvm/builderInferenceErrors.kt:6:9: error: overload resolution ambiguity between candidates: [@InlineOnly() fun println(message: Any?): Unit, @InlineOnly() fun println(message: Boolean): Unit, @InlineOnly() fun println(message: Byte): Unit, ...] println(secondParameter) ^ -compiler/testData/cli/jvm/builderInferenceErrors.kt:6:9: error: no type argument for type parameter(s) `E` of the `buildList` builder specified. Cannot choose which overloaded function `println` to call. To disambiguate this call, either use an explicit type cast for a parameter or a receiver (see specific errors on them) or specify the type `E` explicitly. - println(secondParameter) - ^ -compiler/testData/cli/jvm/builderInferenceErrors.kt:6:17: error: the type of an argument hasn't been inferred yet. To disambiguate this call, explicitly cast it to `String` if you want the builder's type parameter(s) `E` to be inferred to `String`. - println(secondParameter) - ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/classpath.out b/compiler/testData/cli/jvm/classpath.out index bcc3e56e22e..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/classpath.out +++ b/compiler/testData/cli/jvm/classpath.out @@ -1,16 +1 @@ -compiler/testData/cli/jvm/classpath.kt:8:9: warning: variable 'a' is never used - val a = Big5() // charsets.jar - ^ -compiler/testData/cli/jvm/classpath.kt:9:9: warning: variable 'c' is never used - val c = DNSNameService() // dnsns.ajr - ^ -compiler/testData/cli/jvm/classpath.kt:10:9: warning: variable 'e' is never used - val e : Cipher? = null // jce.jar - ^ -compiler/testData/cli/jvm/classpath.kt:11:9: warning: variable 'f' is never used - val f : SunJCE? = null // sunjce_provider.jar - ^ -compiler/testData/cli/jvm/classpath.kt:12:9: warning: variable 'j' is never used - val j : ByteBuffered? = null // rt.jar - ^ OK diff --git a/compiler/testData/cli/jvm/compatqualDefault.out b/compiler/testData/cli/jvm/compatqualDefault.out index 48dec5699f9..c89d9db971d 100644 --- a/compiler/testData/cli/jvm/compatqualDefault.out +++ b/compiler/testData/cli/jvm/compatqualDefault.out @@ -1,4 +1,4 @@ -compiler/testData/cli/jvm/compatqualUsage.kt:2:11: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/compatqualUsage.kt:2:11: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' b.foo(null) ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/compatqualEnable.out b/compiler/testData/cli/jvm/compatqualEnable.out index 48dec5699f9..c89d9db971d 100644 --- a/compiler/testData/cli/jvm/compatqualEnable.out +++ b/compiler/testData/cli/jvm/compatqualEnable.out @@ -1,4 +1,4 @@ -compiler/testData/cli/jvm/compatqualUsage.kt:2:11: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/compatqualUsage.kt:2:11: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' b.foo(null) ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/conflictingJvmDeclarations.out b/compiler/testData/cli/jvm/conflictingJvmDeclarations.out index 11eb79613bc..eab9856de5e 100644 --- a/compiler/testData/cli/jvm/conflictingJvmDeclarations.out +++ b/compiler/testData/cli/jvm/conflictingJvmDeclarations.out @@ -1,13 +1,13 @@ -compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:3:9: error: platform declaration clash: The following declarations have the same JVM signature (getX()I): +compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:2:5: error: platform declaration clash: The following declarations have the same JVM signature (getX()I): fun ``(): Int defined in Foo fun getX(): Int defined in Foo fun getY(): Int defined in Foo - get() = 42 - ^ -compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:9:5: error: platform declaration clash: The following declarations have the same JVM signature (getX()I): + val x: Int + ^ +compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:8:5: error: platform declaration clash: The following declarations have the same JVM signature (getX()I): fun ``(): Int defined in Foo fun getX(): Int defined in Foo fun getY(): Int defined in Foo - fun getY() = 42 + @JvmName("getX") ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/conflictingJvmDeclarationsK2.out b/compiler/testData/cli/jvm/conflictingJvmDeclarationsK2.out index 5ad9917f9e8..eab9856de5e 100644 --- a/compiler/testData/cli/jvm/conflictingJvmDeclarationsK2.out +++ b/compiler/testData/cli/jvm/conflictingJvmDeclarationsK2.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:2:5: error: platform declaration clash: The following declarations have the same JVM signature (getX()I): fun ``(): Int defined in Foo fun getX(): Int defined in Foo diff --git a/compiler/testData/cli/jvm/conflictingOverloads.out b/compiler/testData/cli/jvm/conflictingOverloads.out index e2e7d4aa321..8c0748b8a67 100644 --- a/compiler/testData/cli/jvm/conflictingOverloads.out +++ b/compiler/testData/cli/jvm/conflictingOverloads.out @@ -1,7 +1,7 @@ -compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: conflicting overloads: public fun a(): List defined in root package in file conflictingOverloads.kt, public fun a(): List defined in root package in file conflictingOverloads.kt +compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: conflicting overloads: [fun a(): List] fun a(): List = null!! ^ -compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: conflicting overloads: public fun a(): List defined in root package in file conflictingOverloads.kt, public fun a(): List defined in root package in file conflictingOverloads.kt +compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: conflicting overloads: [fun a(): List] fun a(): List = null!! ^ -COMPILATION_ERROR \ No newline at end of file +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/conflictingProjection.out b/compiler/testData/cli/jvm/conflictingProjection.out index cb6d27d371b..bb345ed7026 100644 --- a/compiler/testData/cli/jvm/conflictingProjection.out +++ b/compiler/testData/cli/jvm/conflictingProjection.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/conflictingProjection.kt:10:19: error: projection is conflicting with variance of the corresponding type parameter of 'Out'. Remove the projection or replace it with '*'. fun a8(value: Out) {} ^ diff --git a/compiler/testData/cli/jvm/deprecatedLanguageVersion.args b/compiler/testData/cli/jvm/deprecatedLanguageVersion.args index 37176830028..5fe4db7c924 100644 --- a/compiler/testData/cli/jvm/deprecatedLanguageVersion.args +++ b/compiler/testData/cli/jvm/deprecatedLanguageVersion.args @@ -2,4 +2,4 @@ $TESTDATA_DIR$/simple.kt -d $TEMP_DIR$ -language-version -1.4 +1.5 diff --git a/compiler/testData/cli/jvm/deprecatedLanguageVersion.out b/compiler/testData/cli/jvm/deprecatedLanguageVersion.out index 856bf234263..be580538bbd 100644 --- a/compiler/testData/cli/jvm/deprecatedLanguageVersion.out +++ b/compiler/testData/cli/jvm/deprecatedLanguageVersion.out @@ -1,2 +1,2 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/diagnosticsOrder.out b/compiler/testData/cli/jvm/diagnosticsOrder.out index b522604e189..9c3beee652d 100644 --- a/compiler/testData/cli/jvm/diagnosticsOrder.out +++ b/compiler/testData/cli/jvm/diagnosticsOrder.out @@ -1,28 +1,28 @@ -compiler/testData/cli/jvm/diagnosticsOrder1.kt:1:5: error: conflicting declarations: public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int +compiler/testData/cli/jvm/diagnosticsOrder1.kt:1:5: error: conflicting declarations: [val x: Int, val x: Int, val x: Int, ...] val x = 5 ^ -compiler/testData/cli/jvm/diagnosticsOrder1.kt:2:5: error: conflicting declarations: public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int +compiler/testData/cli/jvm/diagnosticsOrder1.kt:2:5: error: conflicting declarations: [val x: Int, val x: Int, val x: Int, ...] val x = 5 ^ -compiler/testData/cli/jvm/diagnosticsOrder1.kt:3:5: error: conflicting declarations: public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int +compiler/testData/cli/jvm/diagnosticsOrder1.kt:3:5: error: conflicting declarations: [val x: Int, val x: Int, val x: Int, ...] val x = 5 ^ -compiler/testData/cli/jvm/diagnosticsOrder1.kt:4:5: error: conflicting declarations: public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int +compiler/testData/cli/jvm/diagnosticsOrder1.kt:4:5: error: conflicting declarations: [val x: Int, val x: Int, val x: Int, ...] val x = 5 ^ -compiler/testData/cli/jvm/diagnosticsOrder1.kt:5:5: error: conflicting declarations: public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int +compiler/testData/cli/jvm/diagnosticsOrder1.kt:5:5: error: conflicting declarations: [val x: Int, val x: Int, val x: Int, ...] val x = 5 ^ -compiler/testData/cli/jvm/diagnosticsOrder1.kt:6:5: error: conflicting declarations: public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int +compiler/testData/cli/jvm/diagnosticsOrder1.kt:6:5: error: conflicting declarations: [val x: Int, val x: Int, val x: Int, ...] val x = 5 ^ -compiler/testData/cli/jvm/diagnosticsOrder1.kt:7:5: error: conflicting declarations: public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int, public val x: Int +compiler/testData/cli/jvm/diagnosticsOrder1.kt:7:5: error: conflicting declarations: [val x: Int, val x: Int, val x: Int, ...] val x = 5 ^ -compiler/testData/cli/jvm/diagnosticsOrder2.kt:1:5: error: conflicting declarations: public val y: Int, public val y: Int +compiler/testData/cli/jvm/diagnosticsOrder2.kt:1:5: error: conflicting declarations: [val y: Int] val y = 5 ^ -compiler/testData/cli/jvm/diagnosticsOrder2.kt:2:5: error: conflicting declarations: public val y: Int, public val y: Int +compiler/testData/cli/jvm/diagnosticsOrder2.kt:2:5: error: conflicting declarations: [val y: Int] val y = 5 ^ COMPILATION_ERROR \ No newline at end of file diff --git a/compiler/testData/cli/jvm/experimentalDeprecated.out b/compiler/testData/cli/jvm/experimentalDeprecated.out index 4998a33ff73..00da2d0dd88 100644 --- a/compiler/testData/cli/jvm/experimentalDeprecated.out +++ b/compiler/testData/cli/jvm/experimentalDeprecated.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: opt-in requirement marker org.test.Error is deprecated error: opt-in requirement marker org.test.Hidden is deprecated COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/experimentalDeprecatedWarning.out b/compiler/testData/cli/jvm/experimentalDeprecatedWarning.out index 8348a16c0a9..886f17b862a 100644 --- a/compiler/testData/cli/jvm/experimentalDeprecatedWarning.out +++ b/compiler/testData/cli/jvm/experimentalDeprecatedWarning.out @@ -1,4 +1,3 @@ warning: argument -Xopt-in is deprecated. Please use -opt-in instead -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features warning: opt-in requirement marker org.test.Warning is deprecated OK diff --git a/compiler/testData/cli/jvm/experimentalIsNotAnnotation.out b/compiler/testData/cli/jvm/experimentalIsNotAnnotation.out index 095c4f4a608..d6e2b0c05b2 100644 --- a/compiler/testData/cli/jvm/experimentalIsNotAnnotation.out +++ b/compiler/testData/cli/jvm/experimentalIsNotAnnotation.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features warning: class org.test.NotAnAnnotation1 is not an opt-in requirement marker warning: class org.test.NotAnAnnotation2 is not an opt-in requirement marker OK diff --git a/compiler/testData/cli/jvm/experimentalIsNotMarker.out b/compiler/testData/cli/jvm/experimentalIsNotMarker.out index 4927ebcbdf3..e48b1d5ebe8 100644 --- a/compiler/testData/cli/jvm/experimentalIsNotMarker.out +++ b/compiler/testData/cli/jvm/experimentalIsNotMarker.out @@ -1,3 +1,2 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features warning: class org.test.NotAMarker is not an opt-in requirement marker OK diff --git a/compiler/testData/cli/jvm/experimentalNested.out b/compiler/testData/cli/jvm/experimentalNested.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/experimentalNested.out +++ b/compiler/testData/cli/jvm/experimentalNested.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/experimentalUnresolved.out b/compiler/testData/cli/jvm/experimentalUnresolved.out index 9528b4a8583..a7636802d5d 100644 --- a/compiler/testData/cli/jvm/experimentalUnresolved.out +++ b/compiler/testData/cli/jvm/experimentalUnresolved.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features warning: opt-in requirement marker org.test.Unresolved1 is unresolved. Please make sure it's present in the module dependencies warning: opt-in requirement marker org.test.Unresolved2 is unresolved. Please make sure it's present in the module dependencies OK diff --git a/compiler/testData/cli/jvm/explicitlyDisableSamConversionsWithOldFlag.args b/compiler/testData/cli/jvm/explicitlyDisableSamConversionsWithOldFlag.args index e6bebb65ac8..bb290fd546f 100644 --- a/compiler/testData/cli/jvm/explicitlyDisableSamConversionsWithOldFlag.args +++ b/compiler/testData/cli/jvm/explicitlyDisableSamConversionsWithOldFlag.args @@ -1,5 +1,7 @@ $TESTDATA_DIR$/newInferenceImpliesSamConversions.kt +-language-version +1.9 -d $TEMP_DIR$ -Xnew-inference --XXLanguage\:-SamConversionForKotlinFunctions \ No newline at end of file +-XXLanguage\:-SamConversionForKotlinFunctions diff --git a/compiler/testData/cli/jvm/explicitlyDisabledSamConversions.args b/compiler/testData/cli/jvm/explicitlyDisabledSamConversions.args index 1a96173d6ff..34b8cdb598c 100644 --- a/compiler/testData/cli/jvm/explicitlyDisabledSamConversions.args +++ b/compiler/testData/cli/jvm/explicitlyDisabledSamConversions.args @@ -1,4 +1,6 @@ $TESTDATA_DIR$/newInferenceImpliesSamConversions.kt +-language-version +1.9 -d $TEMP_DIR$ --XXLanguage\:-SamConversionForKotlinFunctions \ No newline at end of file +-XXLanguage\:-SamConversionForKotlinFunctions diff --git a/compiler/testData/cli/jvm/extendedCheckers.out b/compiler/testData/cli/jvm/extendedCheckers.out index 2e7da464cd0..a463e8f6ab6 100644 --- a/compiler/testData/cli/jvm/extendedCheckers.out +++ b/compiler/testData/cli/jvm/extendedCheckers.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/extendedCheckers.kt:2:12: warning: redundant explicit type. val i: Int = 1 ^ diff --git a/compiler/testData/cli/jvm/extendedCheckersNoWarning.out b/compiler/testData/cli/jvm/extendedCheckersNoWarning.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/extendedCheckersNoWarning.out +++ b/compiler/testData/cli/jvm/extendedCheckersNoWarning.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/firDeprecationJava.out b/compiler/testData/cli/jvm/firDeprecationJava.out index 32398173aa7..1ad1fcd5439 100644 --- a/compiler/testData/cli/jvm/firDeprecationJava.out +++ b/compiler/testData/cli/jvm/firDeprecationJava.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firDeprecationJava.kt:3:12: warning: '@Deprecated(...) fun stop(): Unit' is deprecated. Deprecated in Java. thread.stop() ^ diff --git a/compiler/testData/cli/jvm/firDfa.out b/compiler/testData/cli/jvm/firDfa.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/firDfa.out +++ b/compiler/testData/cli/jvm/firDfa.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/firError.out b/compiler/testData/cli/jvm/firError.out index c3e85b3cbe0..198e01ef64d 100644 --- a/compiler/testData/cli/jvm/firError.out +++ b/compiler/testData/cli/jvm/firError.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firError.kt:1:13: error: 'val' on function parameter is prohibited. fun println(val x: Int) {} ^ diff --git a/compiler/testData/cli/jvm/firErrorOnLastLine.out b/compiler/testData/cli/jvm/firErrorOnLastLine.out index bc9ef983cbe..3aeda3da7ed 100644 --- a/compiler/testData/cli/jvm/firErrorOnLastLine.out +++ b/compiler/testData/cli/jvm/firErrorOnLastLine.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firErrorOnLastLine.kt:1:9: error: 'this' is not defined in this context. val x = this ^ diff --git a/compiler/testData/cli/jvm/firErrorOnLastLineNoEol.out b/compiler/testData/cli/jvm/firErrorOnLastLineNoEol.out index c473fb9eb30..49a8bd6fd9c 100644 --- a/compiler/testData/cli/jvm/firErrorOnLastLineNoEol.out +++ b/compiler/testData/cli/jvm/firErrorOnLastLineNoEol.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firErrorOnLastLineNoEol.kt:1:9: error: 'this' is not defined in this context. val x = this ^ diff --git a/compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.out b/compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.out index d42dc2ab5aa..1da827adae0 100644 --- a/compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.out +++ b/compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.kt:2:11: error: unresolved reference 'NullPointerException'. throw NullPointerException() ^ diff --git a/compiler/testData/cli/jvm/firHello.out b/compiler/testData/cli/jvm/firHello.out index 52c758d7734..01587e29e8e 100644 --- a/compiler/testData/cli/jvm/firHello.out +++ b/compiler/testData/cli/jvm/firHello.out @@ -1,3 +1,2 @@ warning: compiler flag -Xuse-k2 is deprecated; please use "-language-version 2.0" instead -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/firHello20.out b/compiler/testData/cli/jvm/firHello20.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/firHello20.out +++ b/compiler/testData/cli/jvm/firHello20.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/firHello20WithFlag.out b/compiler/testData/cli/jvm/firHello20WithFlag.out index b233bd36d45..426e84db76e 100644 --- a/compiler/testData/cli/jvm/firHello20WithFlag.out +++ b/compiler/testData/cli/jvm/firHello20WithFlag.out @@ -1,3 +1,2 @@ warning: deprecated compiler flag -Xuse-k2 is redundant because of "-language-version 2.0" and should be removed -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/firHello20WithOldLV.out b/compiler/testData/cli/jvm/firHello20WithOldLV.out index 321bc7468f3..894027819d3 100644 --- a/compiler/testData/cli/jvm/firHello20WithOldLV.out +++ b/compiler/testData/cli/jvm/firHello20WithOldLV.out @@ -1,3 +1,2 @@ warning: deprecated compiler flag -Xuse-k2 overrides "-language-version 1.5" to 2.0; please remove -Xuse-k2 and use -language-version to select either 1.5 or 2.0 -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/firLightTreeOff.out b/compiler/testData/cli/jvm/firLightTreeOff.out index 074f486d1e0..43aea46c2fe 100644 --- a/compiler/testData/cli/jvm/firLightTreeOff.out +++ b/compiler/testData/cli/jvm/firLightTreeOff.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firLightTree.kt:2:5: error: variable expected. this += "Alpha" ^ diff --git a/compiler/testData/cli/jvm/firLightTreeOn.out b/compiler/testData/cli/jvm/firLightTreeOn.out index 074f486d1e0..43aea46c2fe 100644 --- a/compiler/testData/cli/jvm/firLightTreeOn.out +++ b/compiler/testData/cli/jvm/firLightTreeOn.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firLightTree.kt:2:5: error: variable expected. this += "Alpha" ^ diff --git a/compiler/testData/cli/jvm/firMultiplatformCompilationWithError.out b/compiler/testData/cli/jvm/firMultiplatformCompilationWithError.out index 4a79fe7d260..e67be93cabb 100644 --- a/compiler/testData/cli/jvm/firMultiplatformCompilationWithError.out +++ b/compiler/testData/cli/jvm/firMultiplatformCompilationWithError.out @@ -8,7 +8,6 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firMultiplatformCompilationWithError/jvm.kt:1:18: error: actual class 'actual interface A : Any' has no corresponding members for expected class members: expect fun foo(): Unit diff --git a/compiler/testData/cli/jvm/firMultiplatformCompilationWithPsiWithoutErrors.out b/compiler/testData/cli/jvm/firMultiplatformCompilationWithPsiWithoutErrors.out index 6fc1c90dca3..77f0bfee80c 100644 --- a/compiler/testData/cli/jvm/firMultiplatformCompilationWithPsiWithoutErrors.out +++ b/compiler/testData/cli/jvm/firMultiplatformCompilationWithPsiWithoutErrors.out @@ -8,7 +8,6 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firMultiplatformCompilationWithoutErrors/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 expect interface A { ^ diff --git a/compiler/testData/cli/jvm/firMultiplatformCompilationWithoutErrors.out b/compiler/testData/cli/jvm/firMultiplatformCompilationWithoutErrors.out index 6fc1c90dca3..77f0bfee80c 100644 --- a/compiler/testData/cli/jvm/firMultiplatformCompilationWithoutErrors.out +++ b/compiler/testData/cli/jvm/firMultiplatformCompilationWithoutErrors.out @@ -8,7 +8,6 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firMultiplatformCompilationWithoutErrors/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 expect interface A { ^ diff --git a/compiler/testData/cli/jvm/firStdlibDependency.out b/compiler/testData/cli/jvm/firStdlibDependency.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/firStdlibDependency.out +++ b/compiler/testData/cli/jvm/firStdlibDependency.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/firSyntaxError.out b/compiler/testData/cli/jvm/firSyntaxError.out index 32d5c1e36e0..8729fab9546 100644 --- a/compiler/testData/cli/jvm/firSyntaxError.out +++ b/compiler/testData/cli/jvm/firSyntaxError.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/firSyntaxError.kt:1:10: error: syntax error: Expecting '}'. fun a() { ^ diff --git a/compiler/testData/cli/jvm/firVsClassicAnnotation.out b/compiler/testData/cli/jvm/firVsClassicAnnotation.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/firVsClassicAnnotation.out +++ b/compiler/testData/cli/jvm/firVsClassicAnnotation.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/forbidKotlinPackageK2.out b/compiler/testData/cli/jvm/forbidKotlinPackageK2.out index 13971df39bd..05d8a508785 100644 --- a/compiler/testData/cli/jvm/forbidKotlinPackageK2.out +++ b/compiler/testData/cli/jvm/forbidKotlinPackageK2.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/forbidKotlinPackage.kt:4:1: error: only the Kotlin standard library is allowed to use the 'kotlin' package package kotlin.internal ^ diff --git a/compiler/testData/cli/jvm/hmpp/cycleInDependencies.out b/compiler/testData/cli/jvm/hmpp/cycleInDependencies.out index a603138dba8..821f83d35bc 100644 --- a/compiler/testData/cli/jvm/hmpp/cycleInDependencies.out +++ b/compiler/testData/cli/jvm/hmpp/cycleInDependencies.out @@ -7,6 +7,5 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: there is a cycle in dependencies of module `b` COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/hmpp/duplicatedFragments.out b/compiler/testData/cli/jvm/hmpp/duplicatedFragments.out index 013e3ae12c6..2408210d312 100644 --- a/compiler/testData/cli/jvm/hmpp/duplicatedFragments.out +++ b/compiler/testData/cli/jvm/hmpp/duplicatedFragments.out @@ -7,7 +7,6 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: source '$TESTDATA_DIR$/src/a.kt' does not belong to any module error: source '$TESTDATA_DIR$/src/b.kt' does not belong to any module COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/hmpp/fragmentSourcesIncorrectSyntax.out b/compiler/testData/cli/jvm/hmpp/fragmentSourcesIncorrectSyntax.out index fb3022797ee..189273a7451 100644 --- a/compiler/testData/cli/jvm/hmpp/fragmentSourcesIncorrectSyntax.out +++ b/compiler/testData/cli/jvm/hmpp/fragmentSourcesIncorrectSyntax.out @@ -7,7 +7,6 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: incorrect syntax for -Xfragment-sources argument. `:` expected but got `a;a.kt;` error: source '$TESTDATA_DIR$/src/a.kt' does not belong to any module error: source '$TESTDATA_DIR$/src/b.kt' does not belong to any module diff --git a/compiler/testData/cli/jvm/hmpp/fragmentWithoutSources.out b/compiler/testData/cli/jvm/hmpp/fragmentWithoutSources.out index f902bfda9fd..dca51cc9a32 100644 --- a/compiler/testData/cli/jvm/hmpp/fragmentWithoutSources.out +++ b/compiler/testData/cli/jvm/hmpp/fragmentWithoutSources.out @@ -7,6 +7,5 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: source '$TESTDATA_DIR$/src/a.kt' does not belong to any module COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/hmpp/missingFragment.out b/compiler/testData/cli/jvm/hmpp/missingFragment.out index b37f23fb68f..43ee4aed40f 100644 --- a/compiler/testData/cli/jvm/hmpp/missingFragment.out +++ b/compiler/testData/cli/jvm/hmpp/missingFragment.out @@ -7,6 +7,5 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: `-Xfragment-refines=c:a` Fragment `c` not found in -Xfragments arguments COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/hmpp/refinesSingleModule.out b/compiler/testData/cli/jvm/hmpp/refinesSingleModule.out index 63292d96b33..064539beb61 100644 --- a/compiler/testData/cli/jvm/hmpp/refinesSingleModule.out +++ b/compiler/testData/cli/jvm/hmpp/refinesSingleModule.out @@ -7,6 +7,5 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: -Xfragment-refines flag is specified but there is only one module declared COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/hmpp/refinesWithoutFragments.out b/compiler/testData/cli/jvm/hmpp/refinesWithoutFragments.out index c70f305b2fc..9d6ebfdd805 100644 --- a/compiler/testData/cli/jvm/hmpp/refinesWithoutFragments.out +++ b/compiler/testData/cli/jvm/hmpp/refinesWithoutFragments.out @@ -7,6 +7,5 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: -Xfragment-refines flag can not be used without -Xfragments COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/hmpp/sameSourceInDifferentFragments.out b/compiler/testData/cli/jvm/hmpp/sameSourceInDifferentFragments.out index 42ef08d4992..60a5bd09884 100644 --- a/compiler/testData/cli/jvm/hmpp/sameSourceInDifferentFragments.out +++ b/compiler/testData/cli/jvm/hmpp/sameSourceInDifferentFragments.out @@ -7,6 +7,5 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: file '$TESTDATA_DIR$/src/a.kt' can be a part of only one module, but is listed as a source for both `a` and `b`, please check you -Xfragment-sources options. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/hmpp/sourceNotInAnyFragment.out b/compiler/testData/cli/jvm/hmpp/sourceNotInAnyFragment.out index 60d704c7b6d..fc0e762a54d 100644 --- a/compiler/testData/cli/jvm/hmpp/sourceNotInAnyFragment.out +++ b/compiler/testData/cli/jvm/hmpp/sourceNotInAnyFragment.out @@ -7,6 +7,5 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: source '$TESTDATA_DIR$/src/b.kt' does not belong to any module COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/hmpp/successfulCompilation.out b/compiler/testData/cli/jvm/hmpp/successfulCompilation.out index 546d3d7b5e1..ed6e18e23dd 100644 --- a/compiler/testData/cli/jvm/hmpp/successfulCompilation.out +++ b/compiler/testData/cli/jvm/hmpp/successfulCompilation.out @@ -7,7 +7,6 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/hmpp/src/a.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 expect class A { ^ diff --git a/compiler/testData/cli/jvm/hmpp/successfulCompilation2.out b/compiler/testData/cli/jvm/hmpp/successfulCompilation2.out index 546d3d7b5e1..ed6e18e23dd 100644 --- a/compiler/testData/cli/jvm/hmpp/successfulCompilation2.out +++ b/compiler/testData/cli/jvm/hmpp/successfulCompilation2.out @@ -7,7 +7,6 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/hmpp/src/a.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 expect class A { ^ diff --git a/compiler/testData/cli/jvm/inapplicableLateinitModifier.out b/compiler/testData/cli/jvm/inapplicableLateinitModifier.out index ec39ef5b524..6960871cc27 100644 --- a/compiler/testData/cli/jvm/inapplicableLateinitModifier.out +++ b/compiler/testData/cli/jvm/inapplicableLateinitModifier.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:6:1: error: 'lateinit' modifier 'is not allowed on delegated properties'. lateinit var kest by Delegate ^ diff --git a/compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.out b/compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.out index 7cdf644c23f..2703bd0a738 100644 --- a/compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.out +++ b/compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:2:26: error: cannot access '' before the instance has been initialized. constructor(x: Int = getSomeInt(), other: A = this, header: String = keker) {} ^ diff --git a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args index 5c91abf4594..f5e15bbc41a 100644 --- a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args +++ b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args @@ -1,4 +1,6 @@ $TESTDATA_DIR$/internalArgDisableLanguageFeature.kt -d $TEMP_DIR$ +-language-version +1.9 -XXLanguage\:-SealedInterfaces diff --git a/compiler/testData/cli/jvm/internalArgEmptyFeatureName.out b/compiler/testData/cli/jvm/internalArgEmptyFeatureName.out index 1436a5b3b5d..3c1d1058551 100644 --- a/compiler/testData/cli/jvm/internalArgEmptyFeatureName.out +++ b/compiler/testData/cli/jvm/internalArgEmptyFeatureName.out @@ -1,5 +1,2 @@ warning: empty language feature name for internal argument '-XXLanguage:+' -compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:8:9: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? - some.length - ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args index e98cb219d37..9560291bfd9 100644 --- a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args +++ b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args @@ -1,6 +1,6 @@ -$TESTDATA_DIR$/variableInWhenSubject.kt +$TESTDATA_DIR$/internalArgEnableLanguageFeature.kt -d $TEMP_DIR$ -language-version -1.4 --XXLanguage\:+VariableDeclarationInWhenSubject +2.0 +-XXLanguage\:+ProhibitImplementingVarByInheritedVal diff --git a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.kt b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.kt new file mode 100644 index 00000000000..ab7e84e0f0d --- /dev/null +++ b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.kt @@ -0,0 +1,9 @@ +interface Interface { + var a: String +} + +open class Open { + val a: String = "default" +} + +class Impl : Open(), Interface diff --git a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out index 45fabdd0ddc..21380366520 100644 --- a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out +++ b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out @@ -1,11 +1,5 @@ -warning: ATTENTION! -This build uses unsafe internal compiler arguments: - --XXLanguage:+VariableDeclarationInWhenSubject - -This mode is not recommended for production use, -as no stability/compatibility guarantees are given on -compiler or generated code. Use it at your own risk! - -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin -OK +compiler/testData/cli/jvm/internalArgEnableLanguageFeature.kt:9:1: error: 'Class Impl' overrides 'var' property 'a' with inherited 'val' property 'public final val /Open.a: kotlin/String + public get(): kotlin/String'. +class Impl : Open(), Interface +^ +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/internalArgMissingModificator.out b/compiler/testData/cli/jvm/internalArgMissingModificator.out index 3aa7bfac819..db2bbb6232c 100644 --- a/compiler/testData/cli/jvm/internalArgMissingModificator.out +++ b/compiler/testData/cli/jvm/internalArgMissingModificator.out @@ -1,5 +1,2 @@ warning: incorrect internal argument syntax, missing modificator: -XXLanguage:SoundSmartCastAfterTry -compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:8:9: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? - some.length - ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.args b/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.args index 1f9022a3250..386989b8bb2 100644 --- a/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.args +++ b/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.args @@ -2,5 +2,5 @@ $TESTDATA_DIR$/simple.kt -d $TEMP_DIR$ -language-version -1.4 +1.5 -XXLanguage\:+RestrictReturnStatementTarget diff --git a/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.out b/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.out index 856bf234263..be580538bbd 100644 --- a/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.out +++ b/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.out @@ -1,2 +1,2 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.args b/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.args index 48437c7f784..7d02a87849b 100644 --- a/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.args +++ b/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.args @@ -1,5 +1,5 @@ -$TESTDATA_DIR$/inlineClass.kt +$TESTDATA_DIR$/languageVersion.kt -d $TEMP_DIR$ --XXLanguage\:-InlineClasses --XXLanguage\:+InlineClasses +-XXLanguage\:-SuspendFunctionAsSupertype +-XXLanguage\:+SuspendFunctionAsSupertype diff --git a/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.out b/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.out index 2e9ccc07676..6039a44b8ea 100644 --- a/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.out +++ b/compiler/testData/cli/jvm/internalArgOverrideLanguageFeature.out @@ -1,13 +1,10 @@ warning: ATTENTION! This build uses unsafe internal compiler arguments: --XXLanguage:+InlineClasses +-XXLanguage:+SuspendFunctionAsSupertype This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -compiler/testData/cli/jvm/inlineClass.kt:1:1: warning: 'inline' modifier is deprecated. Use 'value' instead -inline class Foo(val x: Int) -^ OK diff --git a/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.args b/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.args index 329c416a3bd..5432bab4a74 100644 --- a/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.args +++ b/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.args @@ -1,5 +1,7 @@ $TESTDATA_DIR$/languageVersion.kt -d $TEMP_DIR$ --XXLanguage\:+SealedInterfaces --XXLanguage\:-SealedInterfaces +-language-version +1.9 +-XXLanguage\:+SuspendFunctionAsSupertype +-XXLanguage\:-SuspendFunctionAsSupertype diff --git a/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.out b/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.out index f431af63963..6bf30614cbd 100644 --- a/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.out +++ b/compiler/testData/cli/jvm/internalArgOverrideOffLanguageFeature.out @@ -1,13 +1,13 @@ warning: ATTENTION! This build uses unsafe internal compiler arguments: --XXLanguage:-SealedInterfaces +-XXLanguage:-SuspendFunctionAsSupertype This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -compiler/testData/cli/jvm/languageVersion.kt:3:1: error: the feature "sealed interfaces" is disabled -sealed interface Polygon -^ +compiler/testData/cli/jvm/languageVersion.kt:5:23: error: KSuspendFunctionN interfaces are not allowed as supertypes +abstract class Some : KSuspendFunction0 + ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.out b/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.out index df9f2de7850..bc7f8ecb151 100644 --- a/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.out +++ b/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.out @@ -1,5 +1,2 @@ warning: unknown language feature 'UnknownFeature' in passed internal argument '-XXLanguage:+UnknownFeature' -compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:8:9: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? - some.length - ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/internalArgWrongPrefix.out b/compiler/testData/cli/jvm/internalArgWrongPrefix.out index fe778e3a634..6600f7cca3c 100644 --- a/compiler/testData/cli/jvm/internalArgWrongPrefix.out +++ b/compiler/testData/cli/jvm/internalArgWrongPrefix.out @@ -1,5 +1,2 @@ warning: flag is not supported by this version of the compiler: -XX:+SoundSmartCastAfterTry -compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:8:9: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? - some.length - ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.out b/compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.out index 7eeb0db523f..1f3a36d07e5 100644 --- a/compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.out +++ b/compiler/testData/cli/jvm/internalArgumentOverrideExtraArgument.out @@ -7,7 +7,4 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:8:9: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? - some.length - ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/javaSealedClass.out b/compiler/testData/cli/jvm/javaSealedClass.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/javaSealedClass.out +++ b/compiler/testData/cli/jvm/javaSealedClass.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/javaSrcWrongPackage.out b/compiler/testData/cli/jvm/javaSrcWrongPackage.out index 4964af100c6..12f1051b67b 100644 --- a/compiler/testData/cli/jvm/javaSrcWrongPackage.out +++ b/compiler/testData/cli/jvm/javaSrcWrongPackage.out @@ -1,4 +1,4 @@ -compiler/testData/cli/jvm/javaSrcWrongPackage.kt:1:13: error: unresolved reference: A +compiler/testData/cli/jvm/javaSrcWrongPackage.kt:1:13: error: unresolved reference: A.Nested fun test(): A.Nested = A().nested() ^ compiler/testData/cli/jvm/javaSrcWrongPackage.kt:1:24: error: unresolved reference: A diff --git a/compiler/testData/cli/jvm/javacKotlinJavaInterdependency.args b/compiler/testData/cli/jvm/javacKotlinJavaInterdependency.args index ae6eeb51b30..f07ce3c8b14 100644 --- a/compiler/testData/cli/jvm/javacKotlinJavaInterdependency.args +++ b/compiler/testData/cli/jvm/javacKotlinJavaInterdependency.args @@ -4,3 +4,5 @@ $TESTDATA_DIR$/javacKotlinJavaInterdependency/test/ClassWithTypeParameter.java -Xcompile-java -d $TEMP_DIR$ +-language-version +1.9 diff --git a/compiler/testData/cli/jvm/jspecifyByLv16.out b/compiler/testData/cli/jvm/jspecifyByLv16.out index 7c2a6d77f6e..718a8e34509 100644 --- a/compiler/testData/cli/jvm/jspecifyByLv16.out +++ b/compiler/testData/cli/jvm/jspecifyByLv16.out @@ -1,3 +1,4 @@ +warning: language version 1.6 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: warning: type mismatch: inferred type is Nothing? but String was expected a.foo(null) ^ diff --git a/compiler/testData/cli/jvm/jspecifyDefault.out b/compiler/testData/cli/jvm/jspecifyDefault.out index 7c2a6d77f6e..9f5010c4ab7 100644 --- a/compiler/testData/cli/jvm/jspecifyDefault.out +++ b/compiler/testData/cli/jvm/jspecifyDefault.out @@ -1,7 +1,4 @@ -compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: warning: type mismatch: inferred type is Nothing? but String was expected +compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' a.foo(null) ^ -compiler/testData/cli/jvm/jspecifyUsage.kt:3:5: warning: unsafe use of a nullable receiver of type String? - a.bar().hashCode() - ^ -OK +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/jspecifyStrict.out b/compiler/testData/cli/jvm/jspecifyStrict.out index 2a911ebf791..9f5010c4ab7 100644 --- a/compiler/testData/cli/jvm/jspecifyStrict.out +++ b/compiler/testData/cli/jvm/jspecifyStrict.out @@ -1,4 +1,4 @@ -compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' a.foo(null) ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/jsr305DefaultMigration.out b/compiler/testData/cli/jvm/jsr305DefaultMigration.out index dfc596b5951..bf1f828f73d 100644 --- a/compiler/testData/cli/jvm/jsr305DefaultMigration.out +++ b/compiler/testData/cli/jvm/jsr305DefaultMigration.out @@ -1,4 +1,4 @@ -compiler/testData/cli/jvm/jsr305DefaultMigration.kt:2:19: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/jsr305DefaultMigration.kt:2:19: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' annotated.foo(null) ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/jsr305DeprecatedEnable.out b/compiler/testData/cli/jvm/jsr305DeprecatedEnable.out index 92e0065ef5b..dbc7b85103a 100644 --- a/compiler/testData/cli/jvm/jsr305DeprecatedEnable.out +++ b/compiler/testData/cli/jvm/jsr305DeprecatedEnable.out @@ -1,6 +1,6 @@ warning: argument -Xjsr305-annotations is deprecated. Please use -Xjsr305 instead warning: option 'enable' for -Xjsr305 flag is deprecated. Please use 'strict' instead -compiler/testData/cli/jvm/jsr305Usage.kt:2:11: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/jsr305Usage.kt:2:11: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' a.foo(null) ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/jsr305FqNameIgnore.out b/compiler/testData/cli/jvm/jsr305FqNameIgnore.out index f64ed0aa7f6..9bd4aa61487 100644 --- a/compiler/testData/cli/jvm/jsr305FqNameIgnore.out +++ b/compiler/testData/cli/jvm/jsr305FqNameIgnore.out @@ -1,4 +1,4 @@ -compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' annotated.bar(null) ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/jsr305FqNameStrict.out b/compiler/testData/cli/jvm/jsr305FqNameStrict.out index d3a633a1fe1..7107d62d998 100644 --- a/compiler/testData/cli/jvm/jsr305FqNameStrict.out +++ b/compiler/testData/cli/jvm/jsr305FqNameStrict.out @@ -1,7 +1,7 @@ -compiler/testData/cli/jvm/jsr305Migration.kt:2:19: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/jsr305Migration.kt:2:19: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' annotated.foo(null) ^ -compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' annotated.bar(null) ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/jsr305MigrationDefault.out b/compiler/testData/cli/jvm/jsr305MigrationDefault.out index f64ed0aa7f6..9bd4aa61487 100644 --- a/compiler/testData/cli/jvm/jsr305MigrationDefault.out +++ b/compiler/testData/cli/jvm/jsr305MigrationDefault.out @@ -1,4 +1,4 @@ -compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' annotated.bar(null) ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/jsr305Strict.out b/compiler/testData/cli/jvm/jsr305Strict.out index ddbd4018555..bcae60e7b5b 100644 --- a/compiler/testData/cli/jvm/jsr305Strict.out +++ b/compiler/testData/cli/jvm/jsr305Strict.out @@ -1,4 +1,4 @@ -compiler/testData/cli/jvm/jsr305Usage.kt:2:11: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/jsr305Usage.kt:2:11: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' a.foo(null) ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/k2SimpleMultiplatformGenericClass.out b/compiler/testData/cli/jvm/k2SimpleMultiplatformGenericClass.out index 36b4e51c2ca..4d9ce19111e 100644 --- a/compiler/testData/cli/jvm/k2SimpleMultiplatformGenericClass.out +++ b/compiler/testData/cli/jvm/k2SimpleMultiplatformGenericClass.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/k2SimpleMultiplatformGenericClass/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 expect class AtomicRef { ^ diff --git a/compiler/testData/cli/jvm/kt19628_13.args b/compiler/testData/cli/jvm/kt19628_13.args index 58b953e52f2..d7b633ae5f1 100644 --- a/compiler/testData/cli/jvm/kt19628_13.args +++ b/compiler/testData/cli/jvm/kt19628_13.args @@ -1,5 +1,5 @@ $TESTDATA_DIR$/kt19628_13.kt -language-version -1.4 +1.5 -d $TEMP_DIR$ \ No newline at end of file diff --git a/compiler/testData/cli/jvm/kt19628_13.out b/compiler/testData/cli/jvm/kt19628_13.out index 8b6df252700..3bbd6268fbd 100644 --- a/compiler/testData/cli/jvm/kt19628_13.out +++ b/compiler/testData/cli/jvm/kt19628_13.out @@ -1,4 +1,4 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/kt19628_13.kt:5:29: error: unresolved reference: CollapsedStringAdapter @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class) ^ diff --git a/compiler/testData/cli/jvm/languageVersion.args b/compiler/testData/cli/jvm/languageVersion.args index fdffb1d1e7b..560de9f7962 100644 --- a/compiler/testData/cli/jvm/languageVersion.args +++ b/compiler/testData/cli/jvm/languageVersion.args @@ -2,4 +2,4 @@ $TESTDATA_DIR$/languageVersion.kt -d $TEMP_DIR$ -language-version -1.4 +1.5 diff --git a/compiler/testData/cli/jvm/languageVersion.kt b/compiler/testData/cli/jvm/languageVersion.kt index 8f6a0243f5a..c716d9c540a 100644 --- a/compiler/testData/cli/jvm/languageVersion.kt +++ b/compiler/testData/cli/jvm/languageVersion.kt @@ -1,3 +1,5 @@ package test -sealed interface Polygon \ No newline at end of file +import kotlin.reflect.* + +abstract class Some : KSuspendFunction0 diff --git a/compiler/testData/cli/jvm/languageVersion.out b/compiler/testData/cli/jvm/languageVersion.out index 3583dda099f..59d93377973 100644 --- a/compiler/testData/cli/jvm/languageVersion.out +++ b/compiler/testData/cli/jvm/languageVersion.out @@ -1,5 +1,5 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/languageVersion.kt:3:1: error: the feature "sealed interfaces" is only available since language version 1.5 -sealed interface Polygon -^ +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin +compiler/testData/cli/jvm/languageVersion.kt:5:23: error: KSuspendFunctionN interfaces are not allowed as supertypes +abstract class Some : KSuspendFunction0 + ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out index c80d02ed482..9a5d6bf3037 100644 --- a/compiler/testData/cli/jvm/languageVersionInvalid.out +++ b/compiler/testData/cli/jvm/languageVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown language version: 239.42 -Supported language versions: 1.4 (deprecated), 1.5 (deprecated), 1.6, 1.7, 1.8, 1.9, 2.0 (experimental), 2.1 (experimental) +Supported language versions: 1.4 (deprecated), 1.5 (deprecated), 1.6 (deprecated), 1.7, 1.8, 1.9, 2.0, 2.1 (experimental) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/legacySmartCastsAfterTry.out b/compiler/testData/cli/jvm/legacySmartCastsAfterTry.out index 909579400f6..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/legacySmartCastsAfterTry.out +++ b/compiler/testData/cli/jvm/legacySmartCastsAfterTry.out @@ -1,4 +1 @@ -compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:2:25: warning: variable 'some' initializer is redundant - var some: String? = null - ^ OK diff --git a/compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.out b/compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.out index 52aee497d75..1963c813fbe 100644 --- a/compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.out +++ b/compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.out @@ -1,7 +1,10 @@ compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:5: error: modifier 'override' is incompatible with 'private' override protected private val c: Int ^ -compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:14: error: cannot weaken access privilege 'public' for 'c' in 'A' +compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:14: error: cannot weaken access privilege 'private' for 'accessor' in 'A' + override protected private val c: Int + ^ +compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:14: error: abstract property in an interface cannot be private override protected private val c: Int ^ compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:14: error: modifier 'protected' is not applicable inside 'interface' @@ -10,7 +13,4 @@ compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:14: error: m compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:24: error: modifier 'private' is incompatible with 'override' override protected private val c: Int ^ -compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.kt:6:24: error: abstract property in an interface cannot be private - override protected private val c: Int - ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.out b/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.out index 08da22c81b8..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.out +++ b/compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.out @@ -1,11 +1 @@ -compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.kt:6:13: warning: parameter 'x' is never used - fun bar(x: Int = 0): String = "" - ^ -compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.kt:9:13: warning: variable 'r1' is never used - val r1 = foo(::bar) - ^ -compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.kt:9:22: warning: candidate resolution will be changed soon, please use fully qualified name to invoke the following closer candidate explicitly ' -public final fun bar(x: Int = ...): String defined in Scope' - val r1 = foo(::bar) - ^ OK diff --git a/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out b/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out index 45e1b102f14..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out +++ b/compiler/testData/cli/jvm/newInferenceImpliesSamConversions.out @@ -1,4 +1 @@ -compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt:1:9: warning: parameter 'r' is never used -fun foo(r: Runnable) {} - ^ OK diff --git a/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out b/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out index 45e1b102f14..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out +++ b/compiler/testData/cli/jvm/newInferenceWithOldFlagImpliesSamConversions.out @@ -1,4 +1 @@ -compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt:1:9: warning: parameter 'r' is never used -fun foo(r: Runnable) {} - ^ OK diff --git a/compiler/testData/cli/jvm/nonExistingSourcePath.args b/compiler/testData/cli/jvm/nonExistingSourcePath.args index 6508f5f88cd..b0815b00cbd 100644 --- a/compiler/testData/cli/jvm/nonExistingSourcePath.args +++ b/compiler/testData/cli/jvm/nonExistingSourcePath.args @@ -1,3 +1,6 @@ not/existing/path -d $TEMP_DIR$ +-language-version +1.9 + diff --git a/compiler/testData/cli/jvm/nullabilityAnnotations.out b/compiler/testData/cli/jvm/nullabilityAnnotations.out index 9c4f1d64e19..e84a751c20b 100644 --- a/compiler/testData/cli/jvm/nullabilityAnnotations.out +++ b/compiler/testData/cli/jvm/nullabilityAnnotations.out @@ -1,4 +1,4 @@ -compiler/testData/cli/jvm/severalAnnotations.kt:2:11: error: null can not be a value of a non-null type String +compiler/testData/cli/jvm/severalAnnotations.kt:2:11: error: null can not be a value of a non-null type '@EnhancedNullability kotlin/String' a.foo(null) ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/optInEmptyMessageFir.out b/compiler/testData/cli/jvm/optInEmptyMessageFir.out index 8ee8a5ab253..5de583535fe 100644 --- a/compiler/testData/cli/jvm/optInEmptyMessageFir.out +++ b/compiler/testData/cli/jvm/optInEmptyMessageFir.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/optInEmptyMessageFir.kt:8:5: error: this declaration needs opt-in. Its usage must be marked with '@EmptyMarker' or '@OptIn(EmptyMarker::class)' foo() ^ diff --git a/compiler/testData/cli/jvm/optInOverrideMessageFir.out b/compiler/testData/cli/jvm/optInOverrideMessageFir.out index 28850d8e4eb..c50eb6ec6e2 100644 --- a/compiler/testData/cli/jvm/optInOverrideMessageFir.out +++ b/compiler/testData/cli/jvm/optInOverrideMessageFir.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/optInOverrideMessageFir.kt:16:18: error: base declaration of supertype 'Base' needs opt-in. This API is experimental and can change at any time, please use with care. The declaration override must be annotated with '@Marker' or '@OptIn(Marker::class)' override fun foo() {} ^ diff --git a/compiler/testData/cli/jvm/plugins/firAllOpenPlugin_modern.out b/compiler/testData/cli/jvm/plugins/firAllOpenPlugin_modern.out index da6976fde70..0455a429805 100644 --- a/compiler/testData/cli/jvm/plugins/firAllOpenPlugin_modern.out +++ b/compiler/testData/cli/jvm/plugins/firAllOpenPlugin_modern.out @@ -1,3 +1,2 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features warning: argument -Xcompiler-plugin is experimental OK diff --git a/compiler/testData/cli/jvm/plugins/mixingModernAndLegacyArgs.out b/compiler/testData/cli/jvm/plugins/mixingModernAndLegacyArgs.out index 63260576829..efbebc110cb 100644 --- a/compiler/testData/cli/jvm/plugins/mixingModernAndLegacyArgs.out +++ b/compiler/testData/cli/jvm/plugins/mixingModernAndLegacyArgs.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: mixing legacy and modern plugin arguments is prohibited. Please use only one syntax Legacy arguments: -Xplugin=dist/kotlinc/lib/allopen-compiler-plugin.jar diff --git a/compiler/testData/cli/jvm/plugins/multipleOptionsForOnePlugin.out b/compiler/testData/cli/jvm/plugins/multipleOptionsForOnePlugin.out index da6976fde70..0455a429805 100644 --- a/compiler/testData/cli/jvm/plugins/multipleOptionsForOnePlugin.out +++ b/compiler/testData/cli/jvm/plugins/multipleOptionsForOnePlugin.out @@ -1,3 +1,2 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features warning: argument -Xcompiler-plugin is experimental OK diff --git a/compiler/testData/cli/jvm/plugins/multiplePlugins.out b/compiler/testData/cli/jvm/plugins/multiplePlugins.out index d8468799bc2..acb5e5fa45e 100644 --- a/compiler/testData/cli/jvm/plugins/multiplePlugins.out +++ b/compiler/testData/cli/jvm/plugins/multiplePlugins.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/plugins/multiplePlugins.kt:11:17: error: inner class Inner(val s: String) ^ diff --git a/compiler/testData/cli/jvm/plugins/multiplePluginsInSameArg.out b/compiler/testData/cli/jvm/plugins/multiplePluginsInSameArg.out index a6c63c43dfb..5bcca76f71e 100644 --- a/compiler/testData/cli/jvm/plugins/multiplePluginsInSameArg.out +++ b/compiler/testData/cli/jvm/plugins/multiplePluginsInSameArg.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: multiple plugins found in given classpath: org.jetbrains.kotlin.allopen.AllOpenComponentRegistrar, org.jetbrains.kotlin.noarg.NoArgComponentRegistrar Plugin configuration is: dist/kotlinc/lib/allopen-compiler-plugin.jar,dist/kotlinc/lib/noarg-compiler-plugin.jar=annotation=foo.AllOpen COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/plugins/noPluginInClasspath.out b/compiler/testData/cli/jvm/plugins/noPluginInClasspath.out index 10e04ec9f6d..20625348796 100644 --- a/compiler/testData/cli/jvm/plugins/noPluginInClasspath.out +++ b/compiler/testData/cli/jvm/plugins/noPluginInClasspath.out @@ -1,3 +1,2 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: no plugins found in given classpath: dist/kotlinc/lib/kotlin-reflect.jar COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/readingConfigFromEnvironment/appendingArgs.out b/compiler/testData/cli/jvm/readingConfigFromEnvironment/appendingArgs.out index a7d5594a706..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/readingConfigFromEnvironment/appendingArgs.out +++ b/compiler/testData/cli/jvm/readingConfigFromEnvironment/appendingArgs.out @@ -1,7 +1 @@ -compiler/testData/cli/jvm/readingConfigFromEnvironment/appendingArgs.kt:4:9: warning: [UNUSED_VARIABLE] Variable 'x' is never used - val x = 1?.dec() - ^ -compiler/testData/cli/jvm/readingConfigFromEnvironment/appendingArgs.kt:4:14: warning: [UNNECESSARY_SAFE_CALL] Unnecessary safe call on a non-null receiver of type Int - val x = 1?.dec() - ^ OK diff --git a/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingXx.args b/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingXx.args index 909d29ca6be..6db583375b5 100644 --- a/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingXx.args +++ b/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingXx.args @@ -1,4 +1,6 @@ $TESTDATA_DIR$/overridingXx.kt -d $TEMP_DIR$ +-language-version +1.9 -XXLanguage\:+RangeUntilOperator diff --git a/compiler/testData/cli/jvm/readingConfigFromEnvironment/simple.out b/compiler/testData/cli/jvm/readingConfigFromEnvironment/simple.out index 6689ccfe65b..e6421f9ed33 100644 --- a/compiler/testData/cli/jvm/readingConfigFromEnvironment/simple.out +++ b/compiler/testData/cli/jvm/readingConfigFromEnvironment/simple.out @@ -1,10 +1,4 @@ -compiler/testData/cli/jvm/readingConfigFromEnvironment/simple.kt:2:15: error: [NONE_APPLICABLE] None of the following functions can be called with the arguments supplied: -public final operator fun plus(other: Byte): Int defined in kotlin.Int -public final operator fun plus(other: Double): Double defined in kotlin.Int -public final operator fun plus(other: Float): Float defined in kotlin.Int -public final operator fun plus(other: Int): Int defined in kotlin.Int -public final operator fun plus(other: Long): Long defined in kotlin.Int -public final operator fun plus(other: Short): Int defined in kotlin.Int +compiler/testData/cli/jvm/readingConfigFromEnvironment/simple.kt:2:15: error: [NONE_APPLICABLE] None of the following functions are applicable: [@IntrinsicConstEvaluation() fun plus(other: Int): Int, @IntrinsicConstEvaluation() fun plus(other: Byte): Int, @IntrinsicConstEvaluation() fun plus(other: Double): Double, ...] val x = 1 + "" ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/reportInternalDiagnosticNames.out b/compiler/testData/cli/jvm/reportInternalDiagnosticNames.out index d9b74370f08..3b16ccbc425 100644 --- a/compiler/testData/cli/jvm/reportInternalDiagnosticNames.out +++ b/compiler/testData/cli/jvm/reportInternalDiagnosticNames.out @@ -1,7 +1,7 @@ -compiler/testData/cli/jvm/reportInternalDiagnosticNames.kt:2:21: error: [CONSTANT_EXPECTED_TYPE_MISMATCH] The integer literal does not conform to the expected type String +compiler/testData/cli/jvm/reportInternalDiagnosticNames.kt:2:21: error: [INITIALIZER_TYPE_MISMATCH] Initializer type mismatch: expected 'kotlin/String', actual 'kotlin/Int' val x: String = 1 ^ -compiler/testData/cli/jvm/reportInternalDiagnosticNames.kt:3:1: error: [NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY] A 'return' expression required in a function with a block body ('{...}') +compiler/testData/cli/jvm/reportInternalDiagnosticNames.kt:3:1: error: [NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY] A 'return' expression is required in a function with a block body ('{...}') } ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/resultInReturnTypeUnsupportedByDefault14.args b/compiler/testData/cli/jvm/resultInReturnTypeUnsupportedByDefault14.args deleted file mode 100644 index 8983249ed93..00000000000 --- a/compiler/testData/cli/jvm/resultInReturnTypeUnsupportedByDefault14.args +++ /dev/null @@ -1,5 +0,0 @@ -$TESTDATA_DIR$/resultInReturnType.kt --d -$TEMP_DIR$ --language-version -1.4 \ No newline at end of file diff --git a/compiler/testData/cli/jvm/resultInReturnTypeUnsupportedByDefault14.out b/compiler/testData/cli/jvm/resultInReturnTypeUnsupportedByDefault14.out deleted file mode 100644 index 23801f7c17d..00000000000 --- a/compiler/testData/cli/jvm/resultInReturnTypeUnsupportedByDefault14.out +++ /dev/null @@ -1,5 +0,0 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/resultInReturnType.kt:1:5: error: 'kotlin.Result' cannot be used as a return type -fun foo() = Result.success(42) - ^ -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClasses.args b/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClasses.args deleted file mode 100644 index 8c63a31550c..00000000000 --- a/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClasses.args +++ /dev/null @@ -1,6 +0,0 @@ -$TESTDATA_DIR$/resultInReturnType.kt --d -$TEMP_DIR$ --Xinline-classes --language-version -1.4 diff --git a/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClasses.out b/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClasses.out deleted file mode 100644 index 23801f7c17d..00000000000 --- a/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClasses.out +++ /dev/null @@ -1,5 +0,0 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/resultInReturnType.kt:1:5: error: 'kotlin.Result' cannot be used as a return type -fun foo() = Result.success(42) - ^ -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClassesXX.args b/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClassesXX.args deleted file mode 100644 index 0ff2605546d..00000000000 --- a/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClassesXX.args +++ /dev/null @@ -1,6 +0,0 @@ -$TESTDATA_DIR$/resultInReturnType.kt --d -$TEMP_DIR$ --XXLanguage\:+InlineClasses --language-version -1.4 diff --git a/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClassesXX.out b/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClassesXX.out deleted file mode 100644 index c2802368d2d..00000000000 --- a/compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClassesXX.out +++ /dev/null @@ -1,14 +0,0 @@ -warning: ATTENTION! -This build uses unsafe internal compiler arguments: - --XXLanguage:+InlineClasses - -This mode is not recommended for production use, -as no stability/compatibility guarantees are given on -compiler or generated code. Use it at your own risk! - -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/resultInReturnType.kt:1:5: error: 'kotlin.Result' cannot be used as a return type -fun foo() = Result.success(42) - ^ -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/returnAsWhenKey.out b/compiler/testData/cli/jvm/returnAsWhenKey.out index eb51fd96dcd..c61a4f2d5fc 100644 --- a/compiler/testData/cli/jvm/returnAsWhenKey.out +++ b/compiler/testData/cli/jvm/returnAsWhenKey.out @@ -1,7 +1,4 @@ -compiler/testData/cli/jvm/returnAsWhenKey.kt:5:17: warning: unreachable code - return 0 -> return 1 - ^ -compiler/testData/cli/jvm/returnAsWhenKey.kt:5:21: warning: unreachable code - return 0 -> return 1 - ^ -OK \ No newline at end of file +compiler/testData/cli/jvm/returnAsWhenKey.kt:4:5: error: 'when' expression must be exhaustive, add necessary 'true', 'false' branches or 'else' branch instead + when (true) { + ^ +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/singleJavaFileRoots.out b/compiler/testData/cli/jvm/singleJavaFileRoots.out index 94eb38b7eef..4a6d1c282ce 100644 --- a/compiler/testData/cli/jvm/singleJavaFileRoots.out +++ b/compiler/testData/cli/jvm/singleJavaFileRoots.out @@ -1,13 +1,10 @@ -compiler/testData/cli/jvm/singleJavaFileRoots/test.kt:7:9: error: cannot access class 'C'. Check your module classpath for missing or conflicting dependencies - B().c() - ^ compiler/testData/cli/jvm/singleJavaFileRoots/test.kt:8:5: error: unresolved reference: C C().a() ^ -compiler/testData/cli/jvm/singleJavaFileRoots/test.kt:12:5: error: cannot access '': it is package-private in 'PackageLocal1' +compiler/testData/cli/jvm/singleJavaFileRoots/test.kt:12:5: error: cannot access 'constructor(): PackageLocal1': it is package-private in 'lib/ext/PackageLocal1' PackageLocal1() ^ -compiler/testData/cli/jvm/singleJavaFileRoots/test.kt:13:5: error: cannot access '': it is package-private in 'PackageLocal2' +compiler/testData/cli/jvm/singleJavaFileRoots/test.kt:13:5: error: cannot access 'constructor(): PackageLocal2': it is package-private in 'lib/ext/PackageLocal2' PackageLocal2() ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/suspensionPointInMonitor.out b/compiler/testData/cli/jvm/suspensionPointInMonitor.out index 9e41b5fc51d..41e76c7cfd1 100644 --- a/compiler/testData/cli/jvm/suspensionPointInMonitor.out +++ b/compiler/testData/cli/jvm/suspensionPointInMonitor.out @@ -1,7 +1,7 @@ -compiler/testData/cli/jvm/suspensionPointInMonitor.kt:26:13: error: the 'suspensionPoint' suspension point is inside a critical section +compiler/testData/cli/jvm/suspensionPointInMonitor.kt:26:13: error: the 'suspend fun suspensionPoint(): Unit' suspension point is inside a critical section suspensionPoint() ^ -compiler/testData/cli/jvm/suspensionPointInMonitor.kt:60:17: error: the 'suspensionPoint' suspension point is inside a critical section +compiler/testData/cli/jvm/suspensionPointInMonitor.kt:60:17: error: the 'suspend fun suspensionPoint(): Unit' suspension point is inside a critical section suspensionPoint() ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/twoDiagnosticsOnSingleElement.out b/compiler/testData/cli/jvm/twoDiagnosticsOnSingleElement.out index 3f9d5dc0e25..0974c1d9f9e 100644 --- a/compiler/testData/cli/jvm/twoDiagnosticsOnSingleElement.out +++ b/compiler/testData/cli/jvm/twoDiagnosticsOnSingleElement.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/twoDiagnosticsOnSingleElement.kt:11:1: error: 'Class C' is not abstract and does not implement abstract member 'foo'. class C : I1, I2 ^ diff --git a/compiler/testData/cli/jvm/unrestrictedBuilderInference.out b/compiler/testData/cli/jvm/unrestrictedBuilderInference.out index a2803e584f6..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/unrestrictedBuilderInference.out +++ b/compiler/testData/cli/jvm/unrestrictedBuilderInference.out @@ -1,7 +1 @@ -compiler/testData/cli/jvm/unrestrictedBuilderInference.kt:3:9: warning: variable 'x' is never used - val x = buildMap { - ^ -compiler/testData/cli/jvm/unrestrictedBuilderInference.kt:4:13: warning: variable 'y' is never used - val y = put(1, "") - ^ OK diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.args b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.args index b986a034de0..833aa60f88a 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.args +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.args @@ -2,4 +2,4 @@ $TESTDATA_DIR$/useDeclarationThatWasExperimentalWithoutExplicitImport.kt -d $TEMP_DIR$ -language-version -1.4 \ No newline at end of file +1.5 \ No newline at end of file diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.out b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.out index 856bf234263..be580538bbd 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.out +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.out @@ -1,2 +1,2 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.args b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.args index d60caf91b1d..240dfe12bf2 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.args +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.args @@ -2,6 +2,6 @@ $TESTDATA_DIR$/useDeclarationThatWasExperimentalWithoutMarker.kt -d $TEMP_DIR$ -language-version -1.4 +1.5 -opt-in kotlin.ExperimentalStdlibApi \ No newline at end of file diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.out b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.out index 856bf234263..be580538bbd 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.out +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.out @@ -1,2 +1,2 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.args b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.args index 09809021bda..1a5573ca2dc 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.args +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.args @@ -1,5 +1,5 @@ $TESTDATA_DIR$/useDeclarationThatWasExperimentalWithoutMarker.kt -d $TEMP_DIR$ --language-version -1.4 \ No newline at end of file +-api-version +1.6 \ No newline at end of file diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.kt b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.kt index 687a8a4f253..d31c8091bdf 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.kt +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.kt @@ -1,4 +1,3 @@ fun test() { - "".lowercase() - 1.digitToChar() + Regex("").matchAt("123", 0) } \ No newline at end of file diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.out b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.out index d51e36c17fb..fad479d396a 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.out +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.out @@ -1,8 +1,5 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.kt:2:8: error: unresolved reference: lowercase - "".lowercase() - ^ -compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.kt:3:7: error: unresolved reference: digitToChar - 1.digitToChar() - ^ +warning: API version 1.6 is deprecated and its support will be removed in a future version of Kotlin +compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.kt:2:15: error: this declaration needs opt-in. Its usage must be marked with '@kotlin.ExperimentalStdlibApi' or '@OptIn(kotlin.ExperimentalStdlibApi::class)' + Regex("").matchAt("123", 0) + ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.args b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.args index 5caae3c6215..07ff501dad7 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.args +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.args @@ -1,5 +1,5 @@ $TESTDATA_DIR$/useDeclarationThatWasExperimentalWithoutMarker2.kt -d $TEMP_DIR$ --language-version -1.4 \ No newline at end of file +-api-version +1.7 \ No newline at end of file diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.kt b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.kt index 43d79d4fb26..916307084f3 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.kt +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.kt @@ -1,5 +1,9 @@ -//This test is extracted from useDeclarationThatWasExperimentalWithoutMarker.kt to check warnings in ouput +//This test is extracted from useDeclarationThatWasExperimentalWithoutMarker.kt to check warnings in output + +import kotlin.math.* + fun test(p: ULong) { val z: ULong = p z.inv() -} \ No newline at end of file + cbrt(z.toDouble()) +} diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.out b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.out index e982387af1f..4f5b1a050f6 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.out +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.out @@ -1,17 +1,4 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.kt:2:13: warning: this declaration needs opt-in. Its usage should be marked with '@kotlin.ExperimentalUnsignedTypes' or '@OptIn(kotlin.ExperimentalUnsignedTypes::class)' -fun test(p: ULong) { - ^ -compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.kt:3:12: warning: this declaration needs opt-in. Its usage should be marked with '@kotlin.ExperimentalUnsignedTypes' or '@OptIn(kotlin.ExperimentalUnsignedTypes::class)' - val z: ULong = p - ^ -compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.kt:3:20: warning: this declaration needs opt-in. Its usage should be marked with '@kotlin.ExperimentalUnsignedTypes' or '@OptIn(kotlin.ExperimentalUnsignedTypes::class)' - val z: ULong = p - ^ -compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.kt:4:5: warning: this declaration needs opt-in. Its usage should be marked with '@kotlin.ExperimentalUnsignedTypes' or '@OptIn(kotlin.ExperimentalUnsignedTypes::class)' - z.inv() +compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.kt:8:5: error: this declaration needs opt-in. Its usage must be marked with '@kotlin.ExperimentalStdlibApi' or '@OptIn(kotlin.ExperimentalStdlibApi::class)' + cbrt(z.toDouble()) ^ -compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker2.kt:4:7: warning: this declaration needs opt-in. Its usage should be marked with '@kotlin.ExperimentalUnsignedTypes' or '@OptIn(kotlin.ExperimentalUnsignedTypes::class)' - z.inv() - ^ -OK +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/variableInWhenSubject.args b/compiler/testData/cli/jvm/variableInWhenSubject.args deleted file mode 100644 index e98cb219d37..00000000000 --- a/compiler/testData/cli/jvm/variableInWhenSubject.args +++ /dev/null @@ -1,6 +0,0 @@ -$TESTDATA_DIR$/variableInWhenSubject.kt --d -$TEMP_DIR$ --language-version -1.4 --XXLanguage\:+VariableDeclarationInWhenSubject diff --git a/compiler/testData/cli/jvm/variableInWhenSubject.kt b/compiler/testData/cli/jvm/variableInWhenSubject.kt deleted file mode 100644 index 3923c4d8d34..00000000000 --- a/compiler/testData/cli/jvm/variableInWhenSubject.kt +++ /dev/null @@ -1,5 +0,0 @@ -fun test(s: String?) = - when (val v = s) { - null -> "" - else -> v - } diff --git a/compiler/testData/cli/jvm/variableInWhenSubject.out b/compiler/testData/cli/jvm/variableInWhenSubject.out deleted file mode 100644 index 45fabdd0ddc..00000000000 --- a/compiler/testData/cli/jvm/variableInWhenSubject.out +++ /dev/null @@ -1,11 +0,0 @@ -warning: ATTENTION! -This build uses unsafe internal compiler arguments: - --XXLanguage:+VariableDeclarationInWhenSubject - -This mode is not recommended for production use, -as no stability/compatibility guarantees are given on -compiler or generated code. Use it at your own risk! - -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin -OK diff --git a/compiler/testData/cli/jvm/werror.args b/compiler/testData/cli/jvm/werror.args index 52c71c79b17..83b70de8f40 100644 --- a/compiler/testData/cli/jvm/werror.args +++ b/compiler/testData/cli/jvm/werror.args @@ -1,4 +1,5 @@ $TESTDATA_DIR$/werror.kt -d $TEMP_DIR$ +-XXLanguage\:+EnableDfaWarningsInK2 -Werror diff --git a/compiler/testData/cli/jvm/werror.out b/compiler/testData/cli/jvm/werror.out index 9f5f8640bf4..d1ccfb23246 100644 --- a/compiler/testData/cli/jvm/werror.out +++ b/compiler/testData/cli/jvm/werror.out @@ -1,5 +1,14 @@ +warning: ATTENTION! +This build uses unsafe internal compiler arguments: + +-XXLanguage:+EnableDfaWarningsInK2 + +This mode is not recommended for production use, +as no stability/compatibility guarantees are given on +compiler or generated code. Use it at your own risk! + error: warnings found and -Werror specified -compiler/testData/cli/jvm/werror.kt:2:6: warning: unnecessary non-null assertion (!!) on a non-null receiver of type String +compiler/testData/cli/jvm/werror.kt:2:6: warning: unnecessary non-null assertion (!!) on a non-null receiver of type 'kotlin/String' s!! ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/werrorWithExplicitError.out b/compiler/testData/cli/jvm/werrorWithExplicitError.out index f6697cb02ef..25566a63e69 100644 --- a/compiler/testData/cli/jvm/werrorWithExplicitError.out +++ b/compiler/testData/cli/jvm/werrorWithExplicitError.out @@ -1,4 +1,4 @@ -compiler/testData/cli/jvm/werrorWithExplicitError.kt:4:6: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +compiler/testData/cli/jvm/werrorWithExplicitError.kt:4:6: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin/String?'. t.length ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/werrorWithNoWarn.args b/compiler/testData/cli/jvm/werrorWithNoWarn.args index 470522b9102..487ca9c4483 100644 --- a/compiler/testData/cli/jvm/werrorWithNoWarn.args +++ b/compiler/testData/cli/jvm/werrorWithNoWarn.args @@ -1,5 +1,6 @@ $TESTDATA_DIR$/werrorWithNoWarn.kt -d $TEMP_DIR$ +-XXLanguage\:+EnableDfaWarningsInK2 -Werror -nowarn diff --git a/compiler/testData/cli/jvm/werrorWithNoWarn.out b/compiler/testData/cli/jvm/werrorWithNoWarn.out index 6f4af1f1ec7..f0c11157d05 100644 --- a/compiler/testData/cli/jvm/werrorWithNoWarn.out +++ b/compiler/testData/cli/jvm/werrorWithNoWarn.out @@ -1,5 +1,14 @@ +warning: ATTENTION! +This build uses unsafe internal compiler arguments: + +-XXLanguage:+EnableDfaWarningsInK2 + +This mode is not recommended for production use, +as no stability/compatibility guarantees are given on +compiler or generated code. Use it at your own risk! + error: warnings found and -Werror specified -compiler/testData/cli/jvm/werrorWithNoWarn.kt:2:6: warning: unnecessary non-null assertion (!!) on a non-null receiver of type String +compiler/testData/cli/jvm/werrorWithNoWarn.kt:2:6: warning: unnecessary non-null assertion (!!) on a non-null receiver of type 'kotlin/String' s!! ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/wrongAnnotationArgumentInCtor.out b/compiler/testData/cli/jvm/wrongAnnotationArgumentInCtor.out index d6c03010c83..ad61fbe0b03 100644 --- a/compiler/testData/cli/jvm/wrongAnnotationArgumentInCtor.out +++ b/compiler/testData/cli/jvm/wrongAnnotationArgumentInCtor.out @@ -1,10 +1,10 @@ -compiler/testData/cli/jvm/wrongAnnotationArgumentInCtor.kt:4:32: error: too many arguments for public constructor Anno() defined in Anno +compiler/testData/cli/jvm/wrongAnnotationArgumentInCtor.kt:4:32: error: too many arguments for public constructor(): Anno class UnresolvedArgument(@Anno(BLA) val s: Int) ^ compiler/testData/cli/jvm/wrongAnnotationArgumentInCtor.kt:4:32: error: unresolved reference: BLA class UnresolvedArgument(@Anno(BLA) val s: Int) ^ -compiler/testData/cli/jvm/wrongAnnotationArgumentInCtor.kt:6:25: error: no value passed for parameter 'message' +compiler/testData/cli/jvm/wrongAnnotationArgumentInCtor.kt:6:24: error: no value passed for parameter 'message' class WithoutArguments(@Deprecated val s: Int) - ^ + ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/metadata/anonymousObjectTypeWithFir.out b/compiler/testData/cli/metadata/anonymousObjectTypeWithFir.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/metadata/anonymousObjectTypeWithFir.out +++ b/compiler/testData/cli/metadata/anonymousObjectTypeWithFir.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/metadata/hmppModules.out b/compiler/testData/cli/metadata/hmppModules.out index 2e4ada349a5..6d33a51c221 100644 --- a/compiler/testData/cli/metadata/hmppModules.out +++ b/compiler/testData/cli/metadata/hmppModules.out @@ -1,3 +1,2 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: HMPP module structure should not be passed during metadata compilation. Please remove `-Xfragments` and related flags COMPILATION_ERROR diff --git a/compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.out b/compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.out index 2e4ada349a5..6d33a51c221 100644 --- a/compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.out +++ b/compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.out @@ -1,3 +1,2 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features error: HMPP module structure should not be passed during metadata compilation. Please remove `-Xfragments` and related flags COMPILATION_ERROR diff --git a/compiler/testData/cli/metadata/kotlinPackageWithFir.out b/compiler/testData/cli/metadata/kotlinPackageWithFir.out index 889c70030e5..806c7c329f3 100644 --- a/compiler/testData/cli/metadata/kotlinPackageWithFir.out +++ b/compiler/testData/cli/metadata/kotlinPackageWithFir.out @@ -1,4 +1,3 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/kotlinPackage.kt:1:1: error: only the Kotlin standard library is allowed to use the 'kotlin' package package kotlin.mylibrary ^ diff --git a/compiler/testData/cli/metadata/kt58139.out b/compiler/testData/cli/metadata/kt58139.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/metadata/kt58139.out +++ b/compiler/testData/cli/metadata/kt58139.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/metadata/lambdaWithReceiver.out b/compiler/testData/cli/metadata/lambdaWithReceiver.out index 1e1da220cbf..d86bac9de59 100644 --- a/compiler/testData/cli/metadata/lambdaWithReceiver.out +++ b/compiler/testData/cli/metadata/lambdaWithReceiver.out @@ -1,4 +1 @@ -compiler/testData/cli/metadata/lambdaWithReceiver.kt:2:18: warning: the expression is unused - "OK".apply { this } - ^ OK diff --git a/compiler/testData/cli/metadata/lambdaWithReceiverWithFir.out b/compiler/testData/cli/metadata/lambdaWithReceiverWithFir.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/metadata/lambdaWithReceiverWithFir.out +++ b/compiler/testData/cli/metadata/lambdaWithReceiverWithFir.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/metadata/moduleName.args b/compiler/testData/cli/metadata/moduleName.args index 66d2212609c..d1eb433ec59 100644 --- a/compiler/testData/cli/metadata/moduleName.args +++ b/compiler/testData/cli/metadata/moduleName.args @@ -3,3 +3,5 @@ $TESTDATA_DIR$/moduleName.kt $TEMP_DIR$ -module-name foo +-language-version +1.9 diff --git a/compiler/testData/cli/metadata/moduleNameWithFir.out b/compiler/testData/cli/metadata/moduleNameWithFir.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/metadata/moduleNameWithFir.out +++ b/compiler/testData/cli/metadata/moduleNameWithFir.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/metadata/noVirtualFileHiddenForMemberWithPlatformDependentAnnotation.out b/compiler/testData/cli/metadata/noVirtualFileHiddenForMemberWithPlatformDependentAnnotation.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/metadata/noVirtualFileHiddenForMemberWithPlatformDependentAnnotation.out +++ b/compiler/testData/cli/metadata/noVirtualFileHiddenForMemberWithPlatformDependentAnnotation.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.out b/compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.out +++ b/compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/metadata/optionalExpectationUsage.out b/compiler/testData/cli/metadata/optionalExpectationUsage.out index 3eff6a331e8..d86bac9de59 100644 --- a/compiler/testData/cli/metadata/optionalExpectationUsage.out +++ b/compiler/testData/cli/metadata/optionalExpectationUsage.out @@ -1,4 +1 @@ -compiler/testData/cli/metadata/optionalExpectationUsage.kt:3:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect annotation class Ann() -^ OK diff --git a/compiler/testData/cli/metadata/optionalExpectationUsageWithFir.out b/compiler/testData/cli/metadata/optionalExpectationUsageWithFir.out index 86ca0241885..d86bac9de59 100644 --- a/compiler/testData/cli/metadata/optionalExpectationUsageWithFir.out +++ b/compiler/testData/cli/metadata/optionalExpectationUsageWithFir.out @@ -1,2 +1 @@ -warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/againstFir/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/againstFir/output.txt index e4a064110a6..0bb485238a7 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/againstFir/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/againstFir/output.txt @@ -1,8 +1,8 @@ -error: pre-release classes were found in dependencies. Remove them from the classpath, recompile with a release compiler or use '-Xskip-prerelease-check' to suppress errors -compiler/testData/compileKotlinAgainstCustomBinaries/againstFir/source.kt:4:5: error: class 'lib.AKt' is compiled by a pre-release version of Kotlin and cannot be loaded by this version of the compiler +error: classes compiled by the new Kotlin compiler frontend were found in dependencies. Remove them from the classpath or use '-Xallow-unstable-dependencies' to suppress errors +compiler/testData/compileKotlinAgainstCustomBinaries/againstFir/source.kt:4:5: error: class 'lib.AKt' is compiled by the new Kotlin compiler frontend and cannot be loaded by the old compiler get { Box("OK").value } ^ -compiler/testData/compileKotlinAgainstCustomBinaries/againstFir/source.kt:4:11: error: class 'lib.Box' is compiled by a pre-release version of Kotlin and cannot be loaded by this version of the compiler +compiler/testData/compileKotlinAgainstCustomBinaries/againstFir/source.kt:4:11: error: class 'lib.Box' is compiled by the new Kotlin compiler frontend and cannot be loaded by the old compiler get { Box("OK").value } ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithStableAbi/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithStableAbi/output.txt index 462bd9a21af..d86bac9de59 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithStableAbi/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithStableAbi/output.txt @@ -1,8 +1 @@ -error: pre-release classes were found in dependencies. Remove them from the classpath, recompile with a release compiler or use '-Xskip-prerelease-check' to suppress errors -compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithStableAbi/source.kt:4:5: error: class 'lib.AKt' is compiled by a pre-release version of Kotlin and cannot be loaded by this version of the compiler - get { Box("OK").value } - ^ -compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithStableAbi/source.kt:4:11: error: class 'lib.Box' is compiled by a pre-release version of Kotlin and cannot be loaded by this version of the compiler - get { Box("OK").value } - ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithUnstableAbi/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithUnstableAbi/output.txt index 6495b48fe88..675e7533238 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithUnstableAbi/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithUnstableAbi/output.txt @@ -1,8 +1,8 @@ -error: pre-release classes were found in dependencies. Remove them from the classpath, recompile with a release compiler or use '-Xskip-prerelease-check' to suppress errors -compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithUnstableAbi/source.kt:4:5: error: class 'lib.AKt' is compiled by a pre-release version of Kotlin and cannot be loaded by this version of the compiler +error: classes compiled by the new Kotlin compiler frontend were found in dependencies. Remove them from the classpath or use '-Xallow-unstable-dependencies' to suppress errors +compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithUnstableAbi/source.kt:4:5: error: class 'lib.AKt' is compiled by the new Kotlin compiler frontend and cannot be loaded by the old compiler get { Box("OK").value } ^ -compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithUnstableAbi/source.kt:4:11: error: class 'lib.Box' is compiled by a pre-release version of Kotlin and cannot be loaded by this version of the compiler +compiler/testData/compileKotlinAgainstCustomBinaries/againstFirWithUnstableAbi/source.kt:4:11: error: class 'lib.Box' is compiled by the new Kotlin compiler frontend and cannot be loaded by the old compiler get { Box("OK").value } ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/library/a.kt index ec17d72359e..82465504c0e 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/library/a.kt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/library/a.kt @@ -4,9 +4,9 @@ package a import kotlin.internal.RequireKotlin class Outer { - @RequireKotlin("1.44") + @RequireKotlin("2.44") class Nested { - @RequireKotlin("1.88") + @RequireKotlin("2.88") fun f() {} } } diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/library/a.kt index ec17d72359e..82465504c0e 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/library/a.kt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/library/a.kt @@ -4,9 +4,9 @@ package a import kotlin.internal.RequireKotlin class Outer { - @RequireKotlin("1.44") + @RequireKotlin("2.44") class Nested { - @RequireKotlin("1.88") + @RequireKotlin("2.88") fun f() {} } } diff --git a/compiler/testData/integration/smoke/syntaxErrors/test.compile.expected b/compiler/testData/integration/smoke/syntaxErrors/test.compile.expected index 4fcc3d503ff..7ebddd55eeb 100644 --- a/compiler/testData/integration/smoke/syntaxErrors/test.compile.expected +++ b/compiler/testData/integration/smoke/syntaxErrors/test.compile.expected @@ -1,6 +1,9 @@ ERR: -test.kt:4:20: error: expecting an element +test.kt:4:13: error: classifier 'class System : Any' does not have a companion object, and thus must be initialized here + val s = System.in + ^ +test.kt:4:20: error: syntax error: Expecting an element val s = System.in ^ diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt index 01aef89670f..6af4582fbba 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt @@ -12,10 +12,10 @@ public/*package*/ open class A3() } -public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B & Any> { +public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B & Any> { public constructor BaseClassTypeArguments() - public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public/*package*/ constructor BaseClassTypeArguments2() } @@ -27,10 +27,10 @@ public open class BaseClassTypeArguments : test.A3 /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { + public/*package*/ open inner class ImplementedInterfacesTypeArguments /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { public/*package*/ constructor ImplementedInterfacesTypeArguments() - public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public constructor BaseClassTypeArguments1() } } diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt index c8d9cf09dd1..3a3c527bd7c 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt @@ -6,13 +6,13 @@ public open class ClassTypeParameterBounds { public/*package*/ interface G1 { } - public/*package*/ interface G10!> where _A : test.ClassTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { + public/*package*/ interface G10!> where _A : test.ClassTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { } public/*package*/ interface G11..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!> where _A : test.ClassTypeParameterBounds.I2!>!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>!>)>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { } - public/*package*/ interface G12?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!> where _A : test.ClassTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { + public/*package*/ interface G12?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!> where _A : test.ClassTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { } public/*package*/ open inner class G2 { diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt index f6747b84bcf..e48fcbbaffc 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt @@ -5,9 +5,9 @@ public/*package*/ abstract class MethodTypeParameterBounds { public/*package*/ open fun f1(/*0*/ p0: T): kotlin.Unit public/*package*/ open fun f10(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ open fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f11(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>? - public/*package*/ open fun !> f12(/*0*/ p0: _A & Any): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 + public/*package*/ open fun !> f12(/*0*/ p0: _A & Any): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 public/*package*/ open fun ?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!> f13(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>!>!>?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? - public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? + public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ open fun !> f15(/*0*/ p0: _A!): kotlin.Unit where B : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I2<_A!> public/*package*/ open fun f2(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit public/*package*/ open fun f3(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit where B : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I1? diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ReturnType.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ReturnType.txt index e4c18a96607..da8dc1ece74 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ReturnType.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ReturnType.txt @@ -14,41 +14,41 @@ public/*package*/ interface ReturnType { public abstract fun f1(): test.G1!>!>!>! public abstract fun f11(): test.G2, in @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! public abstract fun f13(): (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array) - public abstract fun f14(): @org.jetbrains.annotations.NotNull kotlin.IntArray! + public abstract fun f14(): @org.jetbrains.annotations.NotNull kotlin.IntArray @org.jetbrains.annotations.NotNull public abstract fun f15(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>! @org.jetbrains.annotations.NotNull public abstract fun f16(): kotlin.IntArray! @org.jetbrains.annotations.NotNull public abstract fun f17(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Int>..@org.jetbrains.annotations.NotNull kotlin.Array) public abstract fun f19(): (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>) public abstract fun f2(): test.G1<@org.jetbrains.annotations.NotNull kotlin.String>! - public abstract fun f20(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) - @org.jetbrains.annotations.NotNull public abstract fun f22(): (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>) + public abstract fun f20(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public abstract fun f22(): (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>) @org.jetbrains.annotations.NotNull public abstract fun f23(): (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>) - public abstract fun f25(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! + public abstract fun f25(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! public abstract fun f26(): kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>! @org.jetbrains.annotations.NotNull public abstract fun f27(): kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>! public abstract fun f28(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>! - public abstract fun f29(): test.G2! + public abstract fun f29(): test.G2! public abstract fun f3(): test.G2<@org.jetbrains.annotations.NotNull kotlin.String, test.G2<@org.jetbrains.annotations.NotNull kotlin.Int, test.G2<@org.jetbrains.annotations.NotNull test.G2, @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! public abstract fun f30(): test.G1!>! public abstract fun f31(): test.G1!>! - public abstract fun f32(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>! - public abstract fun f33(): test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>! + public abstract fun f32(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>! + public abstract fun f33(): test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>! public abstract fun f34(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! public abstract fun f36(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>! public abstract fun f37(): test.G1!>!>!>! - public abstract fun f38(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>! + public abstract fun f38(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>! public abstract fun f39(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>! public abstract fun f40(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>! - public abstract fun f41(): test.G2! + public abstract fun f41(): test.G2! public abstract fun f42(): test.G1!>! public abstract fun f43(): test.G1!>! - public abstract fun f44(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public abstract fun f46(): test.G1! + public abstract fun f44(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public abstract fun f46(): test.G1! public abstract fun f47(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! public abstract fun f49(): test.G1!>!>!>!>!>! public abstract fun f5(): test.G1!>!>!>! public abstract fun f50(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! - public abstract fun f51(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>! + public abstract fun f51(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>! public abstract fun f53(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>! public abstract fun f6(): test.G1! public abstract fun f7(): test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! @@ -63,25 +63,25 @@ public/*package*/ interface ReturnType { @org.jetbrains.annotations.NotNull public/*package*/ final var f182: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Int>..@org.jetbrains.annotations.NotNull kotlin.Array) public/*package*/ final var f183: test.G1<@org.jetbrains.annotations.NotNull kotlin.Int>! @org.jetbrains.annotations.NotNull public/*package*/ final var f21: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! - @org.jetbrains.annotations.NotNull public/*package*/ final var f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public/*package*/ final var f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) public/*package*/ final var f35: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>! public/*package*/ final var f4: test.G1! - public/*package*/ final var f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public/*package*/ final var f48: test.G2!>!>! - public/*package*/ final var f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! + public/*package*/ final var f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public/*package*/ final var f48: test.G2!>!>! + public/*package*/ final var f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! } // Static members public final val f10: test.G1! public final val f12: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! @org.jetbrains.annotations.NotNull public final val f161: kotlin.IntArray! - @org.jetbrains.annotations.NotNull public final val f18: @org.jetbrains.annotations.NotNull kotlin.IntArray! + @org.jetbrains.annotations.NotNull public final val f18: @org.jetbrains.annotations.NotNull kotlin.IntArray @org.jetbrains.annotations.NotNull public final val f21: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! - @org.jetbrains.annotations.NotNull public final val f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public final val f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) @org.jetbrains.annotations.NotNull public final val f271: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>! public final val f35: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>! public final val f4: test.G1! - public final val f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public final val f48: test.G2!>!>! - public final val f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! + public final val f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public final val f48: test.G2!>!>! + public final val f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! } diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ValueArguments.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ValueArguments.txt index 99fac565481..4f37e86fb27 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ValueArguments.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ValueArguments.txt @@ -16,56 +16,56 @@ public/*package*/ interface ValueArguments { public abstract fun f11(/*0*/ p0: test.G2?, in @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f12(/*0*/ p0: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f13(/*0*/ p0: (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit - public abstract fun f14(/*0*/ p0: @org.jetbrains.annotations.NotNull kotlin.IntArray!): kotlin.Unit + public abstract fun f14(/*0*/ p0: @org.jetbrains.annotations.NotNull kotlin.IntArray): kotlin.Unit public abstract fun f15(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!): kotlin.Unit public abstract fun f16(/*0*/ @org.jetbrains.annotations.Nullable p0: kotlin.IntArray!): kotlin.Unit public abstract fun f17(/*0*/ @org.jetbrains.annotations.Nullable p0: (@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.Int?>?..@org.jetbrains.annotations.Nullable kotlin.Array?)): kotlin.Unit - public abstract fun f18(/*0*/ @org.jetbrains.annotations.Nullable p0: @org.jetbrains.annotations.Nullable kotlin.IntArray!, /*1*/ p1: (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?), /*2*/ @org.jetbrains.annotations.Nullable p2: kotlin.IntArray!): kotlin.Unit + public abstract fun f18(/*0*/ @org.jetbrains.annotations.Nullable p0: @org.jetbrains.annotations.Nullable kotlin.IntArray?, /*1*/ p1: (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?), /*2*/ @org.jetbrains.annotations.Nullable p2: kotlin.IntArray!): kotlin.Unit public abstract fun f19(/*0*/ p0: (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)): kotlin.Unit public abstract fun f2(/*0*/ p0: test.G1<@org.jetbrains.annotations.NotNull kotlin.String>!): kotlin.Unit - public abstract fun f20(/*0*/ p0: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit + public abstract fun f20(/*0*/ p0: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit public abstract fun f21(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit - public abstract fun f22(/*0*/ @org.jetbrains.annotations.NotNull p0: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>)): kotlin.Unit + public abstract fun f22(/*0*/ @org.jetbrains.annotations.NotNull p0: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>)): kotlin.Unit public abstract fun f23(/*0*/ @org.jetbrains.annotations.NotNull p0: (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>)): kotlin.Unit - public abstract fun f24(/*0*/ @org.jetbrains.annotations.NotNull p0: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit - public abstract fun f25(/*0*/ p0: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray!>!): kotlin.Unit - public abstract fun f26(/*0*/ p0: kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, /*1*/ p1: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray!>!, /*2*/ @org.jetbrains.annotations.Nullable p2: (@org.jetbrains.annotations.Nullable kotlin.Array<(@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?)): kotlin.Unit + public abstract fun f24(/*0*/ @org.jetbrains.annotations.NotNull p0: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit + public abstract fun f25(/*0*/ p0: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray?>!): kotlin.Unit + public abstract fun f26(/*0*/ p0: kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, /*1*/ p1: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray?>!, /*2*/ @org.jetbrains.annotations.Nullable p2: (@org.jetbrains.annotations.Nullable kotlin.Array<(@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?)): kotlin.Unit public abstract fun f27(/*0*/ @org.jetbrains.annotations.Nullable p0: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.Any?>?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!>!): kotlin.Unit public abstract fun f28(/*0*/ p0: test.G1<(@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!): kotlin.Unit - public abstract fun f29(/*0*/ p0: test.G2!): kotlin.Unit + public abstract fun f29(/*0*/ p0: test.G2!): kotlin.Unit public abstract fun f3(/*0*/ p0: test.G2<@org.jetbrains.annotations.NotNull kotlin.String, test.G2<@org.jetbrains.annotations.NotNull kotlin.Int, test.G2<@org.jetbrains.annotations.NotNull test.G2, @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f30(/*0*/ p0: test.G1!>!): kotlin.Unit public abstract fun f31(/*0*/ p0: test.G1!>!): kotlin.Unit - public abstract fun f32(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>!): kotlin.Unit - public abstract fun f33(/*0*/ p0: test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!): kotlin.Unit + public abstract fun f32(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>!): kotlin.Unit + public abstract fun f33(/*0*/ p0: test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!): kotlin.Unit public abstract fun f34(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit public abstract fun f35(/*0*/ p0: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*1*/ p1: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!, /*2*/ p2: test.G1!>!): kotlin.Unit public abstract fun f36(/*0*/ p0: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!): kotlin.Unit public abstract fun f37(/*0*/ p0: test.G1!>!>!>!): kotlin.Unit - public abstract fun f38(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>!): kotlin.Unit + public abstract fun f38(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>!): kotlin.Unit public abstract fun f39(/*0*/ p0: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!): kotlin.Unit public abstract fun f4(/*0*/ p0: test.G1!): kotlin.Unit public abstract fun f40(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!): kotlin.Unit - public abstract fun f41(/*0*/ p0: test.G2!): kotlin.Unit + public abstract fun f41(/*0*/ p0: test.G2!): kotlin.Unit public abstract fun f42(/*0*/ p0: test.G1!>!): kotlin.Unit public abstract fun f43(/*0*/ p0: test.G1!>!): kotlin.Unit - public abstract fun f44(/*0*/ p0: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit - public abstract fun f45(/*0*/ p0: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit - public abstract fun f46(/*0*/ p0: test.G1!): kotlin.Unit + public abstract fun f44(/*0*/ p0: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit + public abstract fun f45(/*0*/ p0: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit + public abstract fun f46(/*0*/ p0: test.G1!): kotlin.Unit public abstract fun f47(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit - public abstract fun f48(/*0*/ p0: test.G2!>!>!): kotlin.Unit - public abstract fun f49(/*0*/ p0: test.G1!>!>!>!>!>!, /*1*/ p1: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, /*2*/ p2: test.G2!>!>!): kotlin.Unit + public abstract fun f48(/*0*/ p0: test.G2!>!>!): kotlin.Unit + public abstract fun f49(/*0*/ p0: test.G1!>!>!>!>!>!, /*1*/ p1: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, /*2*/ p2: test.G2!>!>!): kotlin.Unit public abstract fun f5(/*0*/ p0: test.G1!>!>!>!): kotlin.Unit public abstract fun f50(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit - public abstract fun f51(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>!): kotlin.Unit - public abstract fun f52(/*0*/ p0: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!): kotlin.Unit + public abstract fun f51(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>!): kotlin.Unit + public abstract fun f52(/*0*/ p0: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!): kotlin.Unit public abstract fun f53(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!): kotlin.Unit - public abstract fun f54(/*0*/ p0: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!, /*1*/ p1: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!, /*2*/ @org.jetbrains.annotations.NotNull p2: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>!, /*3*/ @org.jetbrains.annotations.NotNull p3: @org.jetbrains.annotations.NotNull kotlin.IntArray!, /*4*/ p4: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit + public abstract fun f54(/*0*/ p0: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!, /*1*/ p1: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!, /*2*/ @org.jetbrains.annotations.NotNull p2: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>!, /*3*/ @org.jetbrains.annotations.NotNull p3: @org.jetbrains.annotations.NotNull kotlin.IntArray, /*4*/ p4: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f55(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: @org.jetbrains.annotations.NotNull kotlin.String /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!*/): kotlin.Unit public abstract fun f56(/*0*/ vararg p0: kotlin.String! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f57(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: @org.jetbrains.annotations.NotNull kotlin.String /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f58(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.Int /*kotlin.IntArray!*/): kotlin.Unit - public abstract fun f59(/*0*/ vararg p0: kotlin.Int /*@org.jetbrains.annotations.NotNull kotlin.IntArray!*/): kotlin.Unit + public abstract fun f59(/*0*/ vararg p0: kotlin.Int /*@org.jetbrains.annotations.NotNull kotlin.IntArray*/): kotlin.Unit public abstract fun f6(/*0*/ p0: test.G1!, /*1*/ p1: test.G1!>!>!>!): kotlin.Unit public abstract fun f60(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.Int /*@org.jetbrains.annotations.Nullable kotlin.IntArray!*/): kotlin.Unit public abstract fun f61(/*0*/ @org.jetbrains.annotations.Nullable vararg p0: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.String?>! /*kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.String?>!>!*/): kotlin.Unit @@ -74,8 +74,8 @@ public/*package*/ interface ValueArguments { public abstract fun f64(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array) /*(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)*/): kotlin.Unit public abstract fun f65(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.IntArray! /*kotlin.Array<(out) kotlin.IntArray!>!*/): kotlin.Unit public abstract fun f66(/*0*/ vararg p0: kotlin.IntArray! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit - public abstract fun f67(/*0*/ vararg p0: @org.jetbrains.annotations.NotNull kotlin.IntArray! /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!*/): kotlin.Unit - public abstract fun f68(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: @org.jetbrains.annotations.NotNull kotlin.IntArray! /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit + public abstract fun f67(/*0*/ vararg p0: @org.jetbrains.annotations.NotNull kotlin.IntArray /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!*/): kotlin.Unit + public abstract fun f68(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: @org.jetbrains.annotations.NotNull kotlin.IntArray /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f69(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!>!>!*/): kotlin.Unit public abstract fun f7(/*0*/ p0: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f70(/*0*/ vararg p0: (@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?) /*kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>!*/): kotlin.Unit @@ -83,12 +83,12 @@ public/*package*/ interface ValueArguments { public abstract fun f72(/*0*/ @org.jetbrains.annotations.Nullable vararg p0: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.String?>..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>! /*(@org.jetbrains.annotations.Nullable kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>..@org.jetbrains.annotations.Nullable kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>?)*/): kotlin.Unit public abstract fun f73(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array) /*kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!*/): kotlin.Unit public abstract fun f74(/*0*/ vararg p0: kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>)*/): kotlin.Unit - public abstract fun f75(/*0*/ vararg p0: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>!*/): kotlin.Unit - public abstract fun f76(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/): kotlin.Unit + public abstract fun f75(/*0*/ vararg p0: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>!*/): kotlin.Unit + public abstract fun f76(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/): kotlin.Unit public abstract fun f8(/*0*/ p0: test.G1!): kotlin.Unit public abstract fun f9(/*0*/ p0: test.G1!>!>!>!): kotlin.Unit public open class Test { - public constructor Test(/*0*/ p0: test.G2?, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!, /*1*/ p1: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*2*/ p2: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!, /*3*/ @org.jetbrains.annotations.NotNull p3: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>), /*4*/ @org.jetbrains.annotations.NotNull vararg p4: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/) + public constructor Test(/*0*/ p0: test.G2?, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!, /*1*/ p1: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*2*/ p2: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!, /*3*/ @org.jetbrains.annotations.NotNull p3: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>), /*4*/ @org.jetbrains.annotations.NotNull vararg p4: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/) } } diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt index e3701ec78f2..125a3d207a5 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt @@ -1,9 +1,9 @@ package test -public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B & Any> { +public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B & Any> { public constructor BaseClassTypeArguments() - public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public/*package*/ constructor BaseClassTypeArguments2() } @@ -15,10 +15,10 @@ public open class BaseClassTypeArguments : test.A3 /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { + public/*package*/ open inner class ImplementedInterfacesTypeArguments /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { public/*package*/ constructor ImplementedInterfacesTypeArguments() - public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public constructor BaseClassTypeArguments1() } } diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt index c8d9cf09dd1..3a3c527bd7c 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt @@ -6,13 +6,13 @@ public open class ClassTypeParameterBounds { public/*package*/ interface G1 { } - public/*package*/ interface G10!> where _A : test.ClassTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { + public/*package*/ interface G10!> where _A : test.ClassTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { } public/*package*/ interface G11..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!> where _A : test.ClassTypeParameterBounds.I2!>!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>!>)>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { } - public/*package*/ interface G12?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!> where _A : test.ClassTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { + public/*package*/ interface G12?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!> where _A : test.ClassTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { } public/*package*/ open inner class G2 { diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt index adbc810b645..5a652574e44 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt @@ -5,9 +5,9 @@ public/*package*/ abstract class MethodTypeParameterBounds { public/*package*/ open fun f1(/*0*/ x: T): kotlin.Unit public/*package*/ open fun f10(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ open fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f11(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>? - public/*package*/ open fun !> f12(/*0*/ x: _A & Any): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 + public/*package*/ open fun !> f12(/*0*/ x: _A & Any): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 public/*package*/ open fun ?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!> f13(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>!>!>?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? - public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? + public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ open fun !> f15(/*0*/ x: _A!): kotlin.Unit where B : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I2<_A!> public/*package*/ open fun f2(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit public/*package*/ open fun f3(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit where B : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I1? diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ReturnType.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ReturnType.txt index dbfb19c32bf..3127994d1a8 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ReturnType.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ReturnType.txt @@ -5,41 +5,41 @@ public/*package*/ interface ReturnType { public abstract fun f1(): test.G1!>!>!>! public abstract fun f11(): test.G2, in @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! public abstract fun f13(): (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array) - public abstract fun f14(): @org.jetbrains.annotations.NotNull kotlin.IntArray! + public abstract fun f14(): @org.jetbrains.annotations.NotNull kotlin.IntArray @org.jetbrains.annotations.NotNull public abstract fun f15(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>! @org.jetbrains.annotations.NotNull public abstract fun f16(): kotlin.IntArray! @org.jetbrains.annotations.NotNull public abstract fun f17(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Int>..@org.jetbrains.annotations.NotNull kotlin.Array) public abstract fun f19(): (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>) public abstract fun f2(): test.G1<@org.jetbrains.annotations.NotNull kotlin.String>! - public abstract fun f20(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) - @org.jetbrains.annotations.NotNull public abstract fun f22(): (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>) + public abstract fun f20(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public abstract fun f22(): (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>) @org.jetbrains.annotations.NotNull public abstract fun f23(): (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>) - public abstract fun f25(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! + public abstract fun f25(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! public abstract fun f26(): kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>! @org.jetbrains.annotations.NotNull public abstract fun f27(): kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>! public abstract fun f28(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>! - public abstract fun f29(): test.G2! + public abstract fun f29(): test.G2! public abstract fun f3(): test.G2<@org.jetbrains.annotations.NotNull kotlin.String, test.G2<@org.jetbrains.annotations.NotNull kotlin.Int, test.G2<@org.jetbrains.annotations.NotNull test.G2, @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! public abstract fun f30(): test.G1!>! public abstract fun f31(): test.G1!>! - public abstract fun f32(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>! - public abstract fun f33(): test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>! + public abstract fun f32(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>! + public abstract fun f33(): test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>! public abstract fun f34(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! public abstract fun f36(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>! public abstract fun f37(): test.G1!>!>!>! - public abstract fun f38(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>! + public abstract fun f38(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>! public abstract fun f39(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>! public abstract fun f40(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>! - public abstract fun f41(): test.G2! + public abstract fun f41(): test.G2! public abstract fun f42(): test.G1!>! public abstract fun f43(): test.G1!>! - public abstract fun f44(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public abstract fun f46(): test.G1! + public abstract fun f44(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public abstract fun f46(): test.G1! public abstract fun f47(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! public abstract fun f49(): test.G1!>!>!>!>!>! public abstract fun f5(): test.G1!>!>!>! public abstract fun f50(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! - public abstract fun f51(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>! + public abstract fun f51(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>! public abstract fun f53(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>! public abstract fun f6(): test.G1! public abstract fun f7(): test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! @@ -54,25 +54,25 @@ public/*package*/ interface ReturnType { @org.jetbrains.annotations.NotNull public/*package*/ final var f182: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Int>..@org.jetbrains.annotations.NotNull kotlin.Array) public/*package*/ final var f183: test.G1<@org.jetbrains.annotations.NotNull kotlin.Int>! @org.jetbrains.annotations.NotNull public/*package*/ final var f21: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! - @org.jetbrains.annotations.NotNull public/*package*/ final var f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public/*package*/ final var f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) public/*package*/ final var f35: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>! public/*package*/ final var f4: test.G1! - public/*package*/ final var f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public/*package*/ final var f48: test.G2!>!>! - public/*package*/ final var f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! + public/*package*/ final var f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public/*package*/ final var f48: test.G2!>!>! + public/*package*/ final var f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! } // Static members public final val f10: test.G1! public final val f12: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! @org.jetbrains.annotations.NotNull public final val f161: kotlin.IntArray! - @org.jetbrains.annotations.NotNull public final val f18: @org.jetbrains.annotations.NotNull kotlin.IntArray! + @org.jetbrains.annotations.NotNull public final val f18: @org.jetbrains.annotations.NotNull kotlin.IntArray @org.jetbrains.annotations.NotNull public final val f21: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! - @org.jetbrains.annotations.NotNull public final val f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public final val f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) @org.jetbrains.annotations.NotNull public final val f271: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>! public final val f35: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>! public final val f4: test.G1! - public final val f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public final val f48: test.G2!>!>! - public final val f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! + public final val f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public final val f48: test.G2!>!>! + public final val f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! } diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ValueArguments.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ValueArguments.txt index 4c52542bfef..246fa6419a5 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ValueArguments.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ValueArguments.txt @@ -7,56 +7,56 @@ public/*package*/ interface ValueArguments { public abstract fun f11(/*0*/ p: test.G2?, in @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f12(/*0*/ p: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f13(/*0*/ p: (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit - public abstract fun f14(/*0*/ p: @org.jetbrains.annotations.NotNull kotlin.IntArray!): kotlin.Unit + public abstract fun f14(/*0*/ p: @org.jetbrains.annotations.NotNull kotlin.IntArray): kotlin.Unit public abstract fun f15(/*0*/ @org.jetbrains.annotations.NotNull p: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!): kotlin.Unit public abstract fun f16(/*0*/ @org.jetbrains.annotations.Nullable p: kotlin.IntArray!): kotlin.Unit public abstract fun f17(/*0*/ @org.jetbrains.annotations.Nullable p: (@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.Int?>?..@org.jetbrains.annotations.Nullable kotlin.Array?)): kotlin.Unit - public abstract fun f18(/*0*/ @org.jetbrains.annotations.Nullable p1: @org.jetbrains.annotations.Nullable kotlin.IntArray!, /*1*/ p2: (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?), /*2*/ @org.jetbrains.annotations.Nullable p3: kotlin.IntArray!): kotlin.Unit + public abstract fun f18(/*0*/ @org.jetbrains.annotations.Nullable p1: @org.jetbrains.annotations.Nullable kotlin.IntArray?, /*1*/ p2: (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?), /*2*/ @org.jetbrains.annotations.Nullable p3: kotlin.IntArray!): kotlin.Unit public abstract fun f19(/*0*/ p: (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)): kotlin.Unit public abstract fun f2(/*0*/ p: test.G1<@org.jetbrains.annotations.NotNull kotlin.String>!): kotlin.Unit - public abstract fun f20(/*0*/ p: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit + public abstract fun f20(/*0*/ p: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit public abstract fun f21(/*0*/ @org.jetbrains.annotations.NotNull p: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit - public abstract fun f22(/*0*/ @org.jetbrains.annotations.NotNull p: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>)): kotlin.Unit + public abstract fun f22(/*0*/ @org.jetbrains.annotations.NotNull p: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>)): kotlin.Unit public abstract fun f23(/*0*/ @org.jetbrains.annotations.NotNull p: (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>)): kotlin.Unit - public abstract fun f24(/*0*/ @org.jetbrains.annotations.NotNull p: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit - public abstract fun f25(/*0*/ p: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray!>!): kotlin.Unit - public abstract fun f26(/*0*/ p1: kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, /*1*/ p2: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray!>!, /*2*/ @org.jetbrains.annotations.Nullable p3: (@org.jetbrains.annotations.Nullable kotlin.Array<(@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?)): kotlin.Unit + public abstract fun f24(/*0*/ @org.jetbrains.annotations.NotNull p: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit + public abstract fun f25(/*0*/ p: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray?>!): kotlin.Unit + public abstract fun f26(/*0*/ p1: kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, /*1*/ p2: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray?>!, /*2*/ @org.jetbrains.annotations.Nullable p3: (@org.jetbrains.annotations.Nullable kotlin.Array<(@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?)): kotlin.Unit public abstract fun f27(/*0*/ @org.jetbrains.annotations.Nullable p: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.Any?>?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!>!): kotlin.Unit public abstract fun f28(/*0*/ p: test.G1<(@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!): kotlin.Unit - public abstract fun f29(/*0*/ p: test.G2!): kotlin.Unit + public abstract fun f29(/*0*/ p: test.G2!): kotlin.Unit public abstract fun f3(/*0*/ p: test.G2<@org.jetbrains.annotations.NotNull kotlin.String, test.G2<@org.jetbrains.annotations.NotNull kotlin.Int, test.G2<@org.jetbrains.annotations.NotNull test.G2, @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f30(/*0*/ p: test.G1!>!): kotlin.Unit public abstract fun f31(/*0*/ p: test.G1!>!): kotlin.Unit - public abstract fun f32(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>!): kotlin.Unit - public abstract fun f33(/*0*/ p: test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!): kotlin.Unit + public abstract fun f32(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>!): kotlin.Unit + public abstract fun f33(/*0*/ p: test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!): kotlin.Unit public abstract fun f34(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit public abstract fun f35(/*0*/ p1: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*1*/ p2: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!, /*2*/ p3: test.G1!>!): kotlin.Unit public abstract fun f36(/*0*/ p: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!): kotlin.Unit public abstract fun f37(/*0*/ p: test.G1!>!>!>!): kotlin.Unit - public abstract fun f38(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>!): kotlin.Unit + public abstract fun f38(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>!): kotlin.Unit public abstract fun f39(/*0*/ p: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!): kotlin.Unit public abstract fun f4(/*0*/ p: test.G1!): kotlin.Unit public abstract fun f40(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!): kotlin.Unit - public abstract fun f41(/*0*/ p: test.G2!): kotlin.Unit + public abstract fun f41(/*0*/ p: test.G2!): kotlin.Unit public abstract fun f42(/*0*/ p: test.G1!>!): kotlin.Unit public abstract fun f43(/*0*/ p: test.G1!>!): kotlin.Unit - public abstract fun f44(/*0*/ p: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit - public abstract fun f45(/*0*/ p: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit - public abstract fun f46(/*0*/ p: test.G1!): kotlin.Unit + public abstract fun f44(/*0*/ p: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit + public abstract fun f45(/*0*/ p: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit + public abstract fun f46(/*0*/ p: test.G1!): kotlin.Unit public abstract fun f47(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit - public abstract fun f48(/*0*/ p: test.G2!>!>!): kotlin.Unit - public abstract fun f49(/*0*/ p1: test.G1!>!>!>!>!>!, /*1*/ p2: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, /*2*/ p3: test.G2!>!>!): kotlin.Unit + public abstract fun f48(/*0*/ p: test.G2!>!>!): kotlin.Unit + public abstract fun f49(/*0*/ p1: test.G1!>!>!>!>!>!, /*1*/ p2: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, /*2*/ p3: test.G2!>!>!): kotlin.Unit public abstract fun f5(/*0*/ p: test.G1!>!>!>!): kotlin.Unit public abstract fun f50(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit - public abstract fun f51(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>!): kotlin.Unit - public abstract fun f52(/*0*/ p: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!): kotlin.Unit + public abstract fun f51(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>!): kotlin.Unit + public abstract fun f52(/*0*/ p: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!): kotlin.Unit public abstract fun f53(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!): kotlin.Unit - public abstract fun f54(/*0*/ p1: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!, /*1*/ p2: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!, /*2*/ @org.jetbrains.annotations.NotNull p3: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>!, /*3*/ @org.jetbrains.annotations.NotNull p4: @org.jetbrains.annotations.NotNull kotlin.IntArray!, /*4*/ p5: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit + public abstract fun f54(/*0*/ p1: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!, /*1*/ p2: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!, /*2*/ @org.jetbrains.annotations.NotNull p3: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>!, /*3*/ @org.jetbrains.annotations.NotNull p4: @org.jetbrains.annotations.NotNull kotlin.IntArray, /*4*/ p5: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f55(/*0*/ @org.jetbrains.annotations.NotNull vararg x: @org.jetbrains.annotations.NotNull kotlin.String /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!*/): kotlin.Unit public abstract fun f56(/*0*/ vararg x: kotlin.String! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f57(/*0*/ @org.jetbrains.annotations.NotNull vararg x: @org.jetbrains.annotations.NotNull kotlin.String /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f58(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.Int /*kotlin.IntArray!*/): kotlin.Unit - public abstract fun f59(/*0*/ vararg x: kotlin.Int /*@org.jetbrains.annotations.NotNull kotlin.IntArray!*/): kotlin.Unit + public abstract fun f59(/*0*/ vararg x: kotlin.Int /*@org.jetbrains.annotations.NotNull kotlin.IntArray*/): kotlin.Unit public abstract fun f6(/*0*/ p1: test.G1!, /*1*/ p2: test.G1!>!>!>!): kotlin.Unit public abstract fun f60(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.Int /*@org.jetbrains.annotations.Nullable kotlin.IntArray!*/): kotlin.Unit public abstract fun f61(/*0*/ @org.jetbrains.annotations.Nullable vararg x: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.String?>! /*kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.String?>!>!*/): kotlin.Unit @@ -65,8 +65,8 @@ public/*package*/ interface ValueArguments { public abstract fun f64(/*0*/ @org.jetbrains.annotations.NotNull vararg x: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array) /*(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)*/): kotlin.Unit public abstract fun f65(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.IntArray! /*kotlin.Array<(out) kotlin.IntArray!>!*/): kotlin.Unit public abstract fun f66(/*0*/ vararg x: kotlin.IntArray! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit - public abstract fun f67(/*0*/ vararg x: @org.jetbrains.annotations.NotNull kotlin.IntArray! /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!*/): kotlin.Unit - public abstract fun f68(/*0*/ @org.jetbrains.annotations.NotNull vararg x: @org.jetbrains.annotations.NotNull kotlin.IntArray! /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit + public abstract fun f67(/*0*/ vararg x: @org.jetbrains.annotations.NotNull kotlin.IntArray /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!*/): kotlin.Unit + public abstract fun f68(/*0*/ @org.jetbrains.annotations.NotNull vararg x: @org.jetbrains.annotations.NotNull kotlin.IntArray /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f69(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!>!>!*/): kotlin.Unit public abstract fun f7(/*0*/ p: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f70(/*0*/ vararg x: (@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?) /*kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>!*/): kotlin.Unit @@ -74,12 +74,12 @@ public/*package*/ interface ValueArguments { public abstract fun f72(/*0*/ @org.jetbrains.annotations.Nullable vararg x: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.String?>..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>! /*(@org.jetbrains.annotations.Nullable kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>..@org.jetbrains.annotations.Nullable kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>?)*/): kotlin.Unit public abstract fun f73(/*0*/ @org.jetbrains.annotations.NotNull vararg x: (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array) /*kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!*/): kotlin.Unit public abstract fun f74(/*0*/ vararg x: kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>)*/): kotlin.Unit - public abstract fun f75(/*0*/ vararg x: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>!*/): kotlin.Unit - public abstract fun f76(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/): kotlin.Unit + public abstract fun f75(/*0*/ vararg x: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>!*/): kotlin.Unit + public abstract fun f76(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/): kotlin.Unit public abstract fun f8(/*0*/ p: test.G1!): kotlin.Unit public abstract fun f9(/*0*/ p: test.G1!>!>!>!): kotlin.Unit public open class Test { - public constructor Test(/*0*/ p1: test.G2?, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!, /*1*/ p2: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*2*/ p3: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!, /*3*/ @org.jetbrains.annotations.NotNull p4: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>), /*4*/ @org.jetbrains.annotations.NotNull vararg p5: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/) + public constructor Test(/*0*/ p1: test.G2?, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!, /*1*/ p2: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*2*/ p3: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!, /*3*/ @org.jetbrains.annotations.NotNull p4: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>), /*4*/ @org.jetbrains.annotations.NotNull vararg p5: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/) } } diff --git a/compiler/testData/multiplatform/classScopes/constructorIncorrectSignature/output.txt b/compiler/testData/multiplatform/classScopes/constructorIncorrectSignature/output.txt index 6e011ce3f71..44f62f394ad 100644 --- a/compiler/testData/multiplatform/classScopes/constructorIncorrectSignature/output.txt +++ b/compiler/testData/multiplatform/classScopes/constructorIncorrectSignature/output.txt @@ -1,25 +1,22 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/classScopes/constructorIncorrectSignature/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo { -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/classScopes/constructorIncorrectSignature/jvm.kt:1:14: error: actual class 'Foo' has no corresponding members for expected class members: +compiler/testData/multiplatform/classScopes/constructorIncorrectSignature/jvm.kt:1:14: error: actual class 'actual class Foo : Any' has no corresponding members for expected class members: - public constructor Foo(s: String) + expect constructor(s: String): Foo The following declaration is incompatible because parameter types are different: - public constructor Foo(s: Array) + actual constructor(s: Array): Foo actual class Foo { ^ -compiler/testData/multiplatform/classScopes/constructorIncorrectSignature/jvm.kt:2:23: error: actual constructor of 'Foo' has no corresponding expected declaration +compiler/testData/multiplatform/classScopes/constructorIncorrectSignature/jvm.kt:2:5: error: 'actual constructor(s: Array): Foo' has no corresponding expected declaration The following declaration is incompatible because parameter types are different: - public constructor Foo(s: String) + expect constructor(s: String): Foo actual constructor(s: Array) - ^ + ^ diff --git a/compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/output.txt b/compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/output.txt index 3c4bd799116..5817f0895ea 100644 --- a/compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/output.txt +++ b/compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/output.txt @@ -1,37 +1,19 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect enum class AB { A, B } -^ -compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/common.kt:1:24: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect enum class AB { A, B } - ^ -compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/common.kt:1:27: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect enum class AB { A, B } - ^ -compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/common.kt:3:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect enum class CD { C, D } -^ -compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/common.kt:3:24: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect enum class CD { C, D } - ^ -compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/common.kt:3:27: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect enum class CD { C, D } - ^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/jvm.kt:1:19: error: actual enum class 'AB' has no corresponding expected declaration +compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/jvm.kt:1:19: error: 'actual enum class AB : Enum' has no corresponding expected declaration The following declaration is incompatible because some entries from expected enum are missing in the actual enum: - public final expect enum class AB : Enum + expect enum class AB : Enum actual enum class AB { A, C } ^ -compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/jvm.kt:3:19: error: actual enum class 'CD' has no corresponding expected declaration +compiler/testData/multiplatform/classScopes/enumsWithDifferentEntries/jvm.kt:3:19: error: 'actual enum class CD : Enum' has no corresponding expected declaration The following declaration is incompatible because some entries from expected enum are missing in the actual enum: - public final expect enum class CD : Enum + expect enum class CD : Enum actual enum class CD { C } ^ diff --git a/compiler/testData/multiplatform/classScopes/fakeOverrides/output.txt b/compiler/testData/multiplatform/classScopes/fakeOverrides/output.txt index 05be6779c10..a05b038471d 100644 --- a/compiler/testData/multiplatform/classScopes/fakeOverrides/output.txt +++ b/compiler/testData/multiplatform/classScopes/fakeOverrides/output.txt @@ -1,12 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/classScopes/fakeOverrides/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect open class Base { -^ -compiler/testData/multiplatform/classScopes/fakeOverrides/common.kt:5:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Derived : Base { -^ -- JVM -- Exit code: OK diff --git a/compiler/testData/multiplatform/classScopes/functionAndPropertyWithSameName/output.txt b/compiler/testData/multiplatform/classScopes/functionAndPropertyWithSameName/output.txt index 7dd101ffa6e..01f9f64f8b9 100644 --- a/compiler/testData/multiplatform/classScopes/functionAndPropertyWithSameName/output.txt +++ b/compiler/testData/multiplatform/classScopes/functionAndPropertyWithSameName/output.txt @@ -1,25 +1,22 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/classScopes/functionAndPropertyWithSameName/common.kt:3:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo { -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/classScopes/functionAndPropertyWithSameName/jvm.kt:3:14: error: actual class 'Foo' has no corresponding members for expected class members: +compiler/testData/multiplatform/classScopes/functionAndPropertyWithSameName/jvm.kt:3:14: error: actual class 'actual class Foo : Any' has no corresponding members for expected class members: - public expect final val bar: String + expect val bar: String The following declaration is incompatible because callable kinds are different (function vs property): - public final actual fun bar(): String + actual fun bar(): String actual class Foo { ^ -compiler/testData/multiplatform/classScopes/functionAndPropertyWithSameName/jvm.kt:4:12: error: actual function 'bar' has no corresponding expected declaration +compiler/testData/multiplatform/classScopes/functionAndPropertyWithSameName/jvm.kt:4:16: error: 'actual fun bar(): String' has no corresponding expected declaration The following declaration is incompatible because callable kinds are different (function vs property): - public expect final val bar: String + expect val bar: String actual fun bar(): String = "" - ^ + ^ diff --git a/compiler/testData/multiplatform/classScopes/functionIncorrectSignature/output.txt b/compiler/testData/multiplatform/classScopes/functionIncorrectSignature/output.txt index 89442d57fd4..7bd91571d6b 100644 --- a/compiler/testData/multiplatform/classScopes/functionIncorrectSignature/output.txt +++ b/compiler/testData/multiplatform/classScopes/functionIncorrectSignature/output.txt @@ -1,25 +1,13 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/classScopes/functionIncorrectSignature/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo { -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/classScopes/functionIncorrectSignature/jvm.kt:1:14: error: actual class 'Foo' has no corresponding members for expected class members: - - public final expect fun function(b: ByteArray): Int - - The following declaration is incompatible because return type is different: - public final actual fun function(b: ByteArray): Long - -actual class Foo { - ^ -compiler/testData/multiplatform/classScopes/functionIncorrectSignature/jvm.kt:2:40: error: actual function 'function' has no corresponding expected declaration -The following declaration is incompatible because return type is different: - public final expect fun function(b: ByteArray): Int +compiler/testData/multiplatform/classScopes/functionIncorrectSignature/jvm.kt:2:16: error: 'actual fun function(b: ByteArray): Long' has no corresponding expected declaration +The following declaration is incompatible: + expect fun function(b: ByteArray): Int actual fun function(b: ByteArray): Long = b.size.toLong() - ^ + ^ diff --git a/compiler/testData/multiplatform/classScopes/functionIncorrectSignatureFromSuperclass/output.txt b/compiler/testData/multiplatform/classScopes/functionIncorrectSignatureFromSuperclass/output.txt index 7da01c11389..e0977091f21 100644 --- a/compiler/testData/multiplatform/classScopes/functionIncorrectSignatureFromSuperclass/output.txt +++ b/compiler/testData/multiplatform/classScopes/functionIncorrectSignatureFromSuperclass/output.txt @@ -1,19 +1,13 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/classScopes/functionIncorrectSignatureFromSuperclass/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo { -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/classScopes/functionIncorrectSignatureFromSuperclass/jvm.kt:5:14: error: actual class 'Foo' has no corresponding members for expected class members: - - public final expect fun function(b: ByteArray): Int - - The following declaration is incompatible because return type is different: - public final fun function(b: ByteArray): Long - -actual class Foo : Base() - ^ +compiler/testData/multiplatform/classScopes/functionIncorrectSignatureFromSuperclass/common.kt:1:1: error: expect declaration `Foo` doesn't match actual `Foo` because some expected members have no actual ones +expect class Foo { +^ +compiler/testData/multiplatform/classScopes/functionIncorrectSignatureFromSuperclass/common.kt:2:5: error: expect declaration `function` doesn't match actual `function` because return type is different + fun function(b: ByteArray): Int + ^ diff --git a/compiler/testData/multiplatform/classScopes/missingConstructor/output.txt b/compiler/testData/multiplatform/classScopes/missingConstructor/output.txt index 9d68fad98f4..b92bbfe2e3a 100644 --- a/compiler/testData/multiplatform/classScopes/missingConstructor/output.txt +++ b/compiler/testData/multiplatform/classScopes/missingConstructor/output.txt @@ -1,19 +1,16 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/classScopes/missingConstructor/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo { -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/classScopes/missingConstructor/jvm.kt:1:14: error: actual class 'Foo' has no corresponding members for expected class members: +compiler/testData/multiplatform/classScopes/missingConstructor/jvm.kt:1:14: error: actual class 'actual class Foo : Any' has no corresponding members for expected class members: - public constructor Foo(s: String) + expect constructor(s: String): Foo The following declaration is incompatible because number of value parameters is different: - public constructor Foo() + constructor(): Foo actual class Foo ^ diff --git a/compiler/testData/multiplatform/classScopes/missingFunction/output.txt b/compiler/testData/multiplatform/classScopes/missingFunction/output.txt index 7ba31138ccb..fa4fbc48a16 100644 --- a/compiler/testData/multiplatform/classScopes/missingFunction/output.txt +++ b/compiler/testData/multiplatform/classScopes/missingFunction/output.txt @@ -1,16 +1,13 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/classScopes/missingFunction/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo { -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/classScopes/missingFunction/jvm.kt:1:14: error: actual class 'Foo' has no corresponding members for expected class members: +compiler/testData/multiplatform/classScopes/missingFunction/jvm.kt:1:14: error: actual class 'actual class Foo : Any' has no corresponding members for expected class members: - public final expect fun function(s: String): Unit + expect fun function(s: String): Unit actual class Foo ^ diff --git a/compiler/testData/multiplatform/classScopes/simple/output.txt b/compiler/testData/multiplatform/classScopes/simple/output.txt index 128b4580d32..a6ab5bce142 100644 --- a/compiler/testData/multiplatform/classScopes/simple/output.txt +++ b/compiler/testData/multiplatform/classScopes/simple/output.txt @@ -1,9 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/classScopes/simple/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo(param: String) { -^ -- JVM -- Exit code: OK diff --git a/compiler/testData/multiplatform/createImplClassInPlatformModule/output.txt b/compiler/testData/multiplatform/createImplClassInPlatformModule/output.txt index 2e7973c1788..d8d5225572b 100644 --- a/compiler/testData/multiplatform/createImplClassInPlatformModule/output.txt +++ b/compiler/testData/multiplatform/createImplClassInPlatformModule/output.txt @@ -1,9 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/createImplClassInPlatformModule/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo -^ -- JVM -- Exit code: OK diff --git a/compiler/testData/multiplatform/defaultArguments/methodDefaultArgsViaTypealias/output.txt b/compiler/testData/multiplatform/defaultArguments/methodDefaultArgsViaTypealias/output.txt index 300b1248a82..4c3b3a97436 100644 --- a/compiler/testData/multiplatform/defaultArguments/methodDefaultArgsViaTypealias/output.txt +++ b/compiler/testData/multiplatform/defaultArguments/methodDefaultArgsViaTypealias/output.txt @@ -1,17 +1,14 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/defaultArguments/methodDefaultArgsViaTypealias/common.kt:3:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class A(p: String = "constructor") { -^ -- JVM -- Exit code: COMPILATION_ERROR Output: compiler/testData/multiplatform/defaultArguments/methodDefaultArgsViaTypealias/jvm.kt:8:1: error: default argument values inside expect declaration 'A' are not allowed if it is actualized via typealias. Possible fix is to remove default argument values in members: - public constructor A(p: String = ...) + expect fun foo(p: String = ...): Unit - public final expect fun foo(p: String = ...): Unit + expect constructor(p: String = ...): A actual typealias A = AImpl ^ diff --git a/compiler/testData/multiplatform/defaultArguments/useDefaultArgumentsInDependency/output.txt b/compiler/testData/multiplatform/defaultArguments/useDefaultArgumentsInDependency/output.txt index b847dbd2103..f747931bcd2 100644 --- a/compiler/testData/multiplatform/defaultArguments/useDefaultArgumentsInDependency/output.txt +++ b/compiler/testData/multiplatform/defaultArguments/useDefaultArgumentsInDependency/output.txt @@ -1,15 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/defaultArguments/useDefaultArgumentsInDependency/common.kt:5:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class C(x: Int, y: String = "OK") -^ -compiler/testData/multiplatform/defaultArguments/useDefaultArgumentsInDependency/common.kt:7:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect annotation class Anno1(val x: Int, val y: String = "OK") -^ -compiler/testData/multiplatform/defaultArguments/useDefaultArgumentsInDependency/common.kt:9:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect annotation class Anno2(val x: Int, val y: String = "OK") -^ -- JVM -- Exit code: OK diff --git a/compiler/testData/multiplatform/explicitActualOnOverrideOfAbstractMethod/output.txt b/compiler/testData/multiplatform/explicitActualOnOverrideOfAbstractMethod/output.txt index 80643be8dab..69716533974 100644 --- a/compiler/testData/multiplatform/explicitActualOnOverrideOfAbstractMethod/output.txt +++ b/compiler/testData/multiplatform/explicitActualOnOverrideOfAbstractMethod/output.txt @@ -1,12 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/explicitActualOnOverrideOfAbstractMethod/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect abstract class Base { -^ -compiler/testData/multiplatform/explicitActualOnOverrideOfAbstractMethod/common.kt:5:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class DerivedImplicit : Base { -^ -- JVM -- Exit code: OK diff --git a/compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNothing/output.txt b/compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNothing/output.txt index 69a094d3d97..83f63c3f35d 100644 --- a/compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNothing/output.txt +++ b/compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNothing/output.txt @@ -1,12 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNothing/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class E01 -^ -compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNothing/common.kt:2:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class E02 -^ -- JVM -- Exit code: COMPILATION_ERROR @@ -14,6 +8,6 @@ Output: compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNothing/jvm.kt:3:1: error: right-hand side of actual type alias cannot be of type kotlin.Nothing actual typealias E01 = Nothing ^ -compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNothing/jvm.kt:4:1: error: right-hand side of actual type alias should be a class, not another type alias +compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNothing/jvm.kt:4:1: error: right-hand side of actual type alias should be a class, not another type alias. actual typealias E02 = MyNothing ^ diff --git a/compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNullableType/output.txt b/compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNullableType/output.txt index 36749d03451..dffc0bd1b34 100644 --- a/compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNullableType/output.txt +++ b/compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNullableType/output.txt @@ -1,12 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNullableType/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class E01 -^ -compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNullableType/common.kt:2:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class E02 -^ -- JVM -- Exit code: COMPILATION_ERROR @@ -14,6 +8,6 @@ Output: compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNullableType/jvm.kt:3:1: error: right-hand side of actual type alias cannot be a nullable type actual typealias E01 = String? ^ -compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNullableType/jvm.kt:4:1: error: right-hand side of actual type alias should be a class, not another type alias +compiler/testData/multiplatform/implTypeAlias/actualTypealiasToNullableType/jvm.kt:4:1: error: right-hand side of actual type alias should be a class, not another type alias. actual typealias E02 = MyNullable ^ diff --git a/compiler/testData/multiplatform/implTypeAlias/discriminateHeaderClassInFavorOfTypeAlias/output.txt b/compiler/testData/multiplatform/implTypeAlias/discriminateHeaderClassInFavorOfTypeAlias/output.txt index c10818da18f..4eaaad2194b 100644 --- a/compiler/testData/multiplatform/implTypeAlias/discriminateHeaderClassInFavorOfTypeAlias/output.txt +++ b/compiler/testData/multiplatform/implTypeAlias/discriminateHeaderClassInFavorOfTypeAlias/output.txt @@ -1,9 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/implTypeAlias/discriminateHeaderClassInFavorOfTypeAlias/common.kt:3:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class A -^ -- JVM -- Exit code: OK diff --git a/compiler/testData/multiplatform/implTypeAlias/generic/output.txt b/compiler/testData/multiplatform/implTypeAlias/generic/output.txt index 71f605ddd83..ba367459c72 100644 --- a/compiler/testData/multiplatform/implTypeAlias/generic/output.txt +++ b/compiler/testData/multiplatform/implTypeAlias/generic/output.txt @@ -1,9 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/implTypeAlias/generic/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class C1 { -^ -- JVM -- Exit code: OK @@ -14,6 +11,3 @@ expect class C1 { compiler/testData/multiplatform/implTypeAlias/generic/jvm.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 actual typealias C1 = C1Impl ^ -compiler/testData/multiplatform/implTypeAlias/generic/jvm.kt:3:13: warning: parameter 'a' is never used - fun foo(a: A): List? = null - ^ diff --git a/compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/output.txt b/compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/output.txt index 058fb54b495..d34b638d8c4 100644 --- a/compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/output.txt +++ b/compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/output.txt @@ -1,12 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class ByTypeAlias { -^ -compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/common.kt:2:15: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 - interface Nested - ^ -- JVM -- Exit code: OK diff --git a/compiler/testData/multiplatform/incompatibleCallables/output.txt b/compiler/testData/multiplatform/incompatibleCallables/output.txt index bc2f1439727..c251dda5e82 100644 --- a/compiler/testData/multiplatform/incompatibleCallables/output.txt +++ b/compiler/testData/multiplatform/incompatibleCallables/output.txt @@ -5,192 +5,120 @@ Output: -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/incompatibleCallables/common.kt:1:12: error: expected function 'f1' has no actual declaration in module
for JVM -The following declaration is incompatible because return type is different: - public actual fun f1(): String - -expect fun f1() - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:5:14: error: expected function 'f3' has no actual declaration in module
for JVM -The following declaration is incompatible because parameter types are different: - public actual fun f3(name: Double): Unit - -expect fun f3(name: String) - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:6:24: error: expected function 'f3ext' has no actual declaration in module
for JVM -The following declaration is incompatible because parameter types are different: - public actual fun Double.f3ext(): Unit - -expect fun String.f3ext() - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:8:14: error: expected function 'f4' has no actual declaration in module
for JVM -The following declaration is incompatible because parameter shapes are different (extension vs non-extension): - public actual fun String.f4(): Unit - -expect fun f4(name: String) - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:10:12: error: expected function 'f5' has no actual declaration in module
for JVM -The following declaration is incompatible because parameter shapes are different (extension vs non-extension): - public actual fun f5(name: String): Unit - -expect fun String.f5() - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:12:14: error: expected function 'f6' has no actual declaration in module
for JVM -The following declaration is incompatible because number of value parameters is different: - public actual fun f6(p2: Int): Unit - -expect fun f6(p1: String, p2: Int) - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:14:12: error: expected function 'f7' has no actual declaration in module
for JVM -The following declaration is incompatible because number of type parameters is different: - public actual fun f7(): Unit - -expect fun f7() - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:19:12: error: expected function 'f11' has no actual declaration in module
for JVM -The following declaration is incompatible because upper bounds of type parameters are different: - public actual fun f11(): Unit - -expect fun f11() - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:20:12: error: expected function 'f12' has no actual declaration in module
for JVM -The following declaration is incompatible because upper bounds of type parameters are different: - public actual fun > f12(): Unit - -expect fun > f12() - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:21:12: error: expected function 'f13' has no actual declaration in module
for JVM -The following declaration is incompatible because upper bounds of type parameters are different: - public actual fun > f13(): Unit - -expect fun > f13() - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:32:15: error: expected function 'f21' has no actual declaration in module
for JVM -The following declaration is incompatible because parameter types are different: - public actual fun f21(c: Unit.() -> Unit): Unit - -expect fun f21(c: suspend Unit.() -> Unit) - ^ -compiler/testData/multiplatform/incompatibleCallables/common.kt:33:15: error: expected function 'f22' has no actual declaration in module
for JVM -The following declaration is incompatible because parameter types are different: - public actual fun f22(c: suspend Unit.() -> Unit): Unit - -expect fun f22(c: Unit.() -> Unit) - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:1:18: error: actual function 'f1' has no corresponding expected declaration -The following declaration is incompatible because return type is different: - public expect fun f1(): Unit +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:1:12: error: 'actual fun f1(): String' has no corresponding expected declaration +The following declaration is incompatible: + expect fun f1(): Unit actual fun f1(): String = "" - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:3:14: error: actual function 'f2' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:3:12: error: 'actual fun f2(otherName: String): Unit' has no corresponding expected declaration The following declaration is incompatible because parameter names are different: - public expect fun f2(name: String): Unit + expect fun f2(name: String): Unit actual fun f2(otherName: String) {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:5:14: error: actual function 'f3' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:5:12: error: 'actual fun f3(name: Double): Unit' has no corresponding expected declaration The following declaration is incompatible because parameter types are different: - public expect fun f3(name: String): Unit + expect fun f3(name: String): Unit actual fun f3(name: Double) {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:6:24: error: actual function 'f3ext' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:6:19: error: 'actual fun Double.f3ext(): Unit' has no corresponding expected declaration The following declaration is incompatible because parameter types are different: - public expect fun String.f3ext(): Unit + expect fun String.f3ext(): Unit actual fun Double.f3ext() {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:8:12: error: actual function 'f4' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:8:19: error: 'actual fun String.f4(): Unit' has no corresponding expected declaration The following declaration is incompatible because parameter shapes are different (extension vs non-extension): - public expect fun f4(name: String): Unit + expect fun f4(name: String): Unit actual fun String.f4() {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:10:14: error: actual function 'f5' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:10:12: error: 'actual fun f5(name: String): Unit' has no corresponding expected declaration The following declaration is incompatible because parameter shapes are different (extension vs non-extension): - public expect fun String.f5(): Unit + expect fun String.f5(): Unit actual fun f5(name: String) {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:12:14: error: actual function 'f6' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:12:12: error: 'actual fun f6(p2: Int): Unit' has no corresponding expected declaration The following declaration is incompatible because number of value parameters is different: - public expect fun f6(p1: String, p2: Int): Unit + expect fun f6(p1: String, p2: Int): Unit actual fun f6(p2: Int) {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:14:12: error: actual function 'f7' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:14:19: error: 'actual fun f7(): Unit' has no corresponding expected declaration The following declaration is incompatible because number of type parameters is different: - public expect fun f7(): Unit + expect fun f7(): Unit actual fun f7() {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:17:1: error: actual function 'f10' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:17:21: error: 'actual fun f10(): Unit' has no corresponding expected declaration The following declaration is incompatible because visibility is different: - public expect fun f10(): Unit + expect fun f10(): Unit internal actual fun f10() {} -^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:19:12: error: actual function 'f11' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:19:29: error: 'actual fun f11(): Unit' has no corresponding expected declaration The following declaration is incompatible because upper bounds of type parameters are different: - public expect fun f11(): Unit + expect fun f11(): Unit actual fun f11() {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:20:12: error: actual function 'f12' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:20:42: error: 'actual fun > f12(): Unit' has no corresponding expected declaration The following declaration is incompatible because upper bounds of type parameters are different: - public expect fun > f12(): Unit + expect fun > f12(): Unit actual fun > f12() {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:21:12: error: actual function 'f13' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:21:35: error: 'actual fun > f13(): Unit' has no corresponding expected declaration The following declaration is incompatible because upper bounds of type parameters are different: - public expect fun > f13(): Unit + expect fun > f13(): Unit actual fun > f13() {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:23:19: error: actual function 'f14' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:23:31: error: 'actual fun f14(): Unit' has no corresponding expected declaration The following declaration is incompatible because some type parameter is reified in one declaration and non-reified in the other: - public expect inline fun f14(): Unit + expect fun f14(): Unit actual inline fun f14() {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:26:16: error: actual function cannot have default argument values, they should be declared in the expected function + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:26:16: error: actual function cannot have default argument values. They should be declared in the expected function. actual fun f16(s: String = "") {} ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:28:15: error: actual function 'f17' has no corresponding expected declaration +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:28:12: error: 'actual fun f17(s: Array): Unit' has no corresponding expected declaration The following declaration is incompatible because some value parameter is vararg in one declaration and non-vararg in the other: - public expect fun f17(vararg s: String): Unit + expect fun f17(vararg s: Array): Unit actual fun f17(s: Array) {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:29:15: error: actual function 'f18' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:29:12: error: 'actual fun f18(vararg s: Array): Unit' has no corresponding expected declaration The following declaration is incompatible because some value parameter is vararg in one declaration and non-vararg in the other: - public expect fun f18(s: Array): Unit + expect fun f18(s: Array): Unit actual fun f18(vararg s: String) {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:30:22: error: actual function 'f19' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:30:19: error: 'actual fun f19(crossinline s: () -> Unit): Unit' has no corresponding expected declaration The following declaration is incompatible because some value parameter is crossinline in one declaration and not crossinline in the other: - public expect inline fun f19(s: () -> Unit): Unit + expect fun f19(s: () -> Unit): Unit actual inline fun f19(crossinline s: () -> Unit) {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:31:22: error: actual function 'f20' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:31:19: error: 'actual fun f20(noinline s: () -> Unit): Unit' has no corresponding expected declaration The following declaration is incompatible because some value parameter is noinline in one declaration and not noinline in the other: - public expect inline fun f20(s: () -> Unit): Unit + expect fun f20(s: () -> Unit): Unit actual inline fun f20(noinline s: () -> Unit) {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:32:15: error: actual function 'f21' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:32:12: error: 'actual fun f21(c: Unit.() -> Unit): Unit' has no corresponding expected declaration The following declaration is incompatible because parameter types are different: - public expect fun f21(c: suspend Unit.() -> Unit): Unit + expect fun f21(c: suspend Unit.() -> Unit): Unit actual fun f21(c: Unit.() -> Unit) {} - ^ -compiler/testData/multiplatform/incompatibleCallables/jvm.kt:33:15: error: actual function 'f22' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleCallables/jvm.kt:33:12: error: 'actual fun f22(c: suspend Unit.() -> Unit): Unit' has no corresponding expected declaration The following declaration is incompatible because parameter types are different: - public expect fun f22(c: Unit.() -> Unit): Unit + expect fun f22(c: Unit.() -> Unit): Unit actual fun f22(c: suspend Unit.() -> Unit) {} - ^ + ^ diff --git a/compiler/testData/multiplatform/incompatibleClasses/output.txt b/compiler/testData/multiplatform/incompatibleClasses/output.txt index 63aea3563fb..7b9032289d5 100644 --- a/compiler/testData/multiplatform/incompatibleClasses/output.txt +++ b/compiler/testData/multiplatform/incompatibleClasses/output.txt @@ -1,160 +1,103 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/incompatibleClasses/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class PClass -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:2:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect interface PInterface -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:3:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect object PObject -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:4:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect enum class PEnumClass -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:5:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect annotation class PAnnotationClass -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:7:10: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -internal expect object InternalObject - ^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:8:8: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -public expect object PublicObject - ^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:10:6: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -open expect class OpenClass - ^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:11:10: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -abstract expect class AbstractClass - ^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:12:7: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -final expect class FinalClass - ^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:14:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class C1 -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:15:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class C2 -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:16:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class C3 -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:18:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class C4 -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:21:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect abstract class ExtendsNumber : Number -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:23:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect fun interface FunInterface { -^ -compiler/testData/multiplatform/incompatibleClasses/common.kt:27:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect fun interface FunInterface2 { -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:1:8: error: actual interface 'PClass' has no corresponding expected declaration +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:1:18: error: 'actual interface PClass : Any' has no corresponding expected declaration The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation): - public final expect class PClass + expect class PClass : Any actual interface PClass - ^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:2:8: error: actual object 'PInterface' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:2:15: error: 'actual object PInterface : Any' has no corresponding expected declaration The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation): - public expect interface PInterface + expect interface PInterface : Any actual object PInterface - ^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:3:8: error: actual enum class 'PObject' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:3:19: error: 'actual enum class PObject : Enum' has no corresponding expected declaration The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation): - public expect object PObject + expect object PObject : Any actual enum class PObject - ^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:4:8: error: actual annotation class 'PEnumClass' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:4:25: error: 'actual annotation class PEnumClass : Annotation' has no corresponding expected declaration The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation): - public final expect enum class PEnumClass : Enum + expect enum class PEnumClass : Enum actual annotation class PEnumClass - ^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:5:8: error: actual class 'PAnnotationClass' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:5:14: error: 'actual class PAnnotationClass : Any' has no corresponding expected declaration The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation): - public final expect annotation class PAnnotationClass : Annotation + expect annotation class PAnnotationClass : Annotation actual class PAnnotationClass - ^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:7:1: error: actual object 'PublicObject' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:7:24: error: 'actual object PublicObject : Any' has no corresponding expected declaration The following declaration is incompatible because visibility is different: - public expect object PublicObject + expect object PublicObject : Any internal actual object PublicObject -^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:8:1: error: actual object 'InternalObject' has no corresponding expected declaration -The following declaration is incompatible because visibility is different: - internal expect object InternalObject - -public actual object InternalObject -^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:10:1: error: actual class 'OpenClass' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:10:20: error: 'actual class OpenClass : Any' has no corresponding expected declaration The following declaration is incompatible because modality is different: - public open expect class OpenClass + expect class OpenClass : Any final actual class OpenClass -^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:11:1: error: actual class 'AbstractClass' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:11:19: error: 'actual class AbstractClass : Any' has no corresponding expected declaration The following declaration is incompatible because modality is different: - public abstract expect class AbstractClass + expect class AbstractClass : Any open actual class AbstractClass -^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:12:1: error: actual class 'FinalClass' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:12:23: error: 'actual class FinalClass : Any' has no corresponding expected declaration The following declaration is incompatible because modality is different: - public final expect class FinalClass + expect class FinalClass : Any abstract actual class FinalClass -^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:14:16: error: actual class 'C1' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:14:14: error: 'actual class C1 : Any' has no corresponding expected declaration The following declaration is incompatible because number of type parameters is different: - public final expect class C1 + expect class C1 : Any actual class C1 - ^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:15:16: error: actual class 'C2' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:15:14: error: 'actual class C2 : Any' has no corresponding expected declaration The following declaration is incompatible because declaration-site variances of type parameters are different: - public final expect class C2 + expect class C2 : Any actual class C2 - ^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:16:16: error: actual class 'C3' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:16:14: error: 'actual class C3 : Any' has no corresponding expected declaration The following declaration is incompatible because upper bounds of type parameters are different: - public final expect class C3 + expect class C3 : Any actual class C3 - ^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:18:20: error: actual typealias 'C4' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:18:18: error: 'actual typealias C4 = C4Impl' has no corresponding expected declaration The following declaration is incompatible because upper bounds of type parameters are different: - public final expect class C4 + expect class C4 : Any actual typealias C4 = C4Impl - ^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:21:39: error: actual class 'ExtendsNumber' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:21:23: error: 'actual class ExtendsNumber : Any' has no corresponding expected declaration The following declaration is incompatible because some supertypes are missing in the actual declaration: - public abstract expect class ExtendsNumber : Number + expect class ExtendsNumber : Number actual abstract class ExtendsNumber : Any() - ^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:23:1: error: actual interface 'FunInterface' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:23:18: error: 'actual interface FunInterface : Any' has no corresponding expected declaration The following declaration is incompatible because actual declaration for fun expect interface is not a functional interface: - public expect fun interface FunInterface + expect fun interface FunInterface : Any actual interface FunInterface { -^ -compiler/testData/multiplatform/incompatibleClasses/jvm.kt:31:1: error: actual typealias 'FunInterface2' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleClasses/jvm.kt:31:18: error: 'actual typealias FunInterface2 = FunInterface2Typealias' has no corresponding expected declaration The following declaration is incompatible because actual declaration for fun expect interface is not a functional interface: - public expect fun interface FunInterface2 + expect fun interface FunInterface2 : Any actual typealias FunInterface2 = FunInterface2Typealias -^ + ^ diff --git a/compiler/testData/multiplatform/incompatibleFunctions/output.txt b/compiler/testData/multiplatform/incompatibleFunctions/output.txt index 64c6d021dcc..66b781f71c7 100644 --- a/compiler/testData/multiplatform/incompatibleFunctions/output.txt +++ b/compiler/testData/multiplatform/incompatibleFunctions/output.txt @@ -5,21 +5,21 @@ Output: -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:1:1: error: actual function 'plus' has no corresponding expected declaration +compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:1:16: error: 'actual fun Int.plus(s: CharSequence): Int' has no corresponding expected declaration The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (infix, inline, operator): - public expect infix fun Int.plus(s: CharSequence): Int + expect fun Int.plus(s: CharSequence): Int actual fun Int.plus(s: CharSequence): Int = 0 -^ -compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:3:1: error: actual function 'times' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:3:19: error: 'actual fun Double.times(x: CharArray): Unit' has no corresponding expected declaration The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (infix, inline, operator): - public expect operator fun Double.times(x: CharArray): Unit + expect fun Double.times(x: CharArray): Unit actual fun Double.times(x: CharArray) {} -^ -compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:5:1: error: actual function 'f1' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:5:12: error: 'actual fun f1(): Unit' has no corresponding expected declaration The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (infix, inline, operator): - public expect inline fun f1(): Unit + expect fun f1(): Unit actual fun f1() {} -^ + ^ diff --git a/compiler/testData/multiplatform/incompatibleNestedClasses/output.txt b/compiler/testData/multiplatform/incompatibleNestedClasses/output.txt index 91db9a1f6f1..1f0e8fa0689 100644 --- a/compiler/testData/multiplatform/incompatibleNestedClasses/output.txt +++ b/compiler/testData/multiplatform/incompatibleNestedClasses/output.txt @@ -1,91 +1,55 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class O1 { -^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:2:11: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 - class N1 - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:3:15: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 - interface N2 - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:4:12: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 - object N3 - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:7:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class O2 { -^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:8:11: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 - class N2 - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:9:17: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 - inner class I2 - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:12:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class O3 { -^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:13:12: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 - object Companion - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:14:22: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 - companion object Factory - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:17:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class O4 { -^ -compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:18:15: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 - companion object - ^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:2:12: error: actual interface 'N1' has no corresponding expected declaration +compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:2:22: error: 'actual interface N1 : Any' has no corresponding expected declaration The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation): - public final expect class N1 + expect class N1 : Any actual interface N1 - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:3:12: error: actual object 'N2' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:3:19: error: 'actual object N2 : Any' has no corresponding expected declaration The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation): - public expect interface N2 + expect interface N2 : Any actual object N2 - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:4:12: error: actual class 'N3' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:4:18: error: 'actual class N3 : Any' has no corresponding expected declaration The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation): - public expect object N3 + expect object N3 : Any actual class N3 - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:8:5: error: actual class 'N2' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:8:24: error: 'actual inner class N2 : Any' has no corresponding expected declaration The following declaration is incompatible because modifiers are different (companion, inner, inline, value): - public final expect class N2 + expect class N2 : Any actual inner class N2 - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:9:5: error: actual class 'I2' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:9:18: error: 'actual class I2 : Any' has no corresponding expected declaration The following declaration is incompatible because modifiers are different (companion, inner, inline, value): - public final expect inner class I2 + expect inner class I2 : Any actual class I2 - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:13:5: error: actual companion object 'Companion' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:13:22: error: 'actual companion object Companion : Any' has no corresponding expected declaration The following declaration is incompatible because modifiers are different (companion, inner, inline, value): - public expect object Companion + expect object Companion : Any actual companion object {} - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:14:5: error: actual object 'Factory' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:14:19: error: 'actual object Factory : Any' has no corresponding expected declaration The following declaration is incompatible because modifiers are different (companion, inner, inline, value): - public expect companion object Factory + expect companion object Factory : Any actual object Factory - ^ -compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:18:5: error: actual object 'Companion' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:18:19: error: 'actual object Companion : Any' has no corresponding expected declaration The following declaration is incompatible because modifiers are different (companion, inner, inline, value): - public expect companion object + expect companion object Companion : Any actual object Companion - ^ + ^ diff --git a/compiler/testData/multiplatform/incompatibleProperties/output.txt b/compiler/testData/multiplatform/incompatibleProperties/output.txt index 253f9528588..d703aa3abb5 100644 --- a/compiler/testData/multiplatform/incompatibleProperties/output.txt +++ b/compiler/testData/multiplatform/incompatibleProperties/output.txt @@ -5,15 +5,15 @@ Output: -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/incompatibleProperties/jvm.kt:1:8: error: actual property 'pval' has no corresponding expected declaration +compiler/testData/multiplatform/incompatibleProperties/jvm.kt:1:12: error: 'actual var pval: String' has no corresponding expected declaration The following declaration is incompatible because property kinds are different (val vs var): - public expect val pval: String + expect val pval: String actual var pval: String = "" - ^ -compiler/testData/multiplatform/incompatibleProperties/jvm.kt:2:8: error: actual property 'pvar' has no corresponding expected declaration + ^ +compiler/testData/multiplatform/incompatibleProperties/jvm.kt:2:12: error: 'actual val pvar: String' has no corresponding expected declaration The following declaration is incompatible because property kinds are different (val vs var): - public expect var pvar: String + expect var pvar: String actual val pvar: String = "" - ^ + ^ diff --git a/compiler/testData/multiplatform/incorrectImplInClass/output.txt b/compiler/testData/multiplatform/incorrectImplInClass/output.txt index 63c41794af7..fcad5619730 100644 --- a/compiler/testData/multiplatform/incorrectImplInClass/output.txt +++ b/compiler/testData/multiplatform/incorrectImplInClass/output.txt @@ -1,22 +1,19 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/incorrectImplInClass/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/incorrectImplInClass/jvm.kt:1:18: error: actual constructor of 'Foo' has no corresponding expected declaration +compiler/testData/multiplatform/incorrectImplInClass/jvm.kt:1:18: error: 'actual constructor(): Foo' has no corresponding expected declaration actual class Foo actual constructor() { ^ -compiler/testData/multiplatform/incorrectImplInClass/jvm.kt:2:5: error: actual constructor of 'Foo' has no corresponding expected declaration +compiler/testData/multiplatform/incorrectImplInClass/jvm.kt:2:5: error: 'actual constructor(s: String): Foo' has no corresponding expected declaration actual constructor(s: String) : this() ^ -compiler/testData/multiplatform/incorrectImplInClass/jvm.kt:4:16: error: actual function 'nonPlatformFun' has no corresponding expected declaration +compiler/testData/multiplatform/incorrectImplInClass/jvm.kt:4:16: error: 'actual fun nonPlatformFun(): Unit' has no corresponding expected declaration actual fun nonPlatformFun() {} ^ -compiler/testData/multiplatform/incorrectImplInClass/jvm.kt:6:16: error: actual property 'nonPlatformVal' has no corresponding expected declaration +compiler/testData/multiplatform/incorrectImplInClass/jvm.kt:6:16: error: 'actual val nonPlatformVal: String' has no corresponding expected declaration actual val nonPlatformVal = "" ^ diff --git a/compiler/testData/multiplatform/inlineClasses/output.txt b/compiler/testData/multiplatform/inlineClasses/output.txt index dedab16a245..6ecf53454ea 100644 --- a/compiler/testData/multiplatform/inlineClasses/output.txt +++ b/compiler/testData/multiplatform/inlineClasses/output.txt @@ -1,35 +1,23 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/inlineClasses/common.kt:3:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect inline class Foo1(val x: Int) -^ -compiler/testData/multiplatform/inlineClasses/common.kt:3:8: warning: 'inline' modifier is deprecated. Use 'value' instead -expect inline class Foo1(val x: Int) - ^ -compiler/testData/multiplatform/inlineClasses/common.kt:4:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect inline class Foo2(val y: String) -^ -compiler/testData/multiplatform/inlineClasses/common.kt:4:8: warning: 'inline' modifier is deprecated. Use 'value' instead -expect inline class Foo2(val y: String) - ^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/inlineClasses/jvm.kt:5:1: error: actual class 'Foo2' has no corresponding expected declaration +compiler/testData/multiplatform/inlineClasses/jvm.kt:5:14: error: 'actual class Foo2 : Any' has no corresponding expected declaration The following declaration is incompatible because modifiers are different (companion, inner, inline, value): - public final expect inline class Foo2 + expect class Foo2 : Any actual class Foo2 actual constructor(actual val y: String) -^ + ^ -- JS -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/inlineClasses/js.kt:5:1: error: actual class 'Foo2' has no corresponding expected declaration +compiler/testData/multiplatform/inlineClasses/js.kt:5:14: error: 'actual class Foo2 : Any' has no corresponding expected declaration The following declaration is incompatible because modifiers are different (companion, inner, inline, value): - public final expect inline class Foo2 + expect class Foo2 : Any actual class Foo2 actual constructor(actual val y: String) -^ + ^ diff --git a/compiler/testData/multiplatform/innerGenericClass/output.txt b/compiler/testData/multiplatform/innerGenericClass/output.txt index 2c52162d1d6..3b01b7630c2 100644 --- a/compiler/testData/multiplatform/innerGenericClass/output.txt +++ b/compiler/testData/multiplatform/innerGenericClass/output.txt @@ -5,6 +5,6 @@ Output: -- Common (2) -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/innerGenericClass/common2.kt:8:15: error: unresolved reference: unresolved +compiler/testData/multiplatform/innerGenericClass/common2.kt:8:15: error: unresolved reference 'unresolved'. b.getAE().unresolved() ^ diff --git a/compiler/testData/multiplatform/jsNameClash/output.txt b/compiler/testData/multiplatform/jsNameClash/output.txt index 183763d596c..6b3f5dfc27f 100644 --- a/compiler/testData/multiplatform/jsNameClash/output.txt +++ b/compiler/testData/multiplatform/jsNameClash/output.txt @@ -1,16 +1,7 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/jsNameClash/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class ClassWithImplByExtension -^ -- JS -- Exit code: OK Output: -compiler/testData/multiplatform/jsNameClash/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class ClassWithImplByExtension -^ -compiler/testData/multiplatform/jsNameClash/js.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -actual class ClassWithImplByExtension -^ diff --git a/compiler/testData/multiplatform/missingOverload/output.txt b/compiler/testData/multiplatform/missingOverload/output.txt index d401b74132b..7675f89e853 100644 --- a/compiler/testData/multiplatform/missingOverload/output.txt +++ b/compiler/testData/multiplatform/missingOverload/output.txt @@ -1,25 +1,16 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/missingOverload/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo { -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/missingOverload/common.kt:7:13: error: expected function 'g' has no actual declaration in module
for JVM -The following declaration is incompatible because parameter types are different: - public actual fun g(a: Any): Unit +compiler/testData/multiplatform/missingOverload/jvm.kt:1:14: error: actual class 'actual class Foo : Any' has no corresponding members for expected class members: -expect fun g(s: String) - ^ -compiler/testData/multiplatform/missingOverload/jvm.kt:1:14: error: actual class 'Foo' has no corresponding members for expected class members: - - public final expect fun f(a: Any): Unit + expect fun f(a: Any): Unit The following declaration is incompatible because parameter types are different: - public final actual fun f(s: String): Unit + actual fun f(s: String): Unit actual class Foo { ^ diff --git a/compiler/testData/multiplatform/optionalExpectation/output.txt b/compiler/testData/multiplatform/optionalExpectation/output.txt index 41726d6525e..bd464eefcb7 100644 --- a/compiler/testData/multiplatform/optionalExpectation/output.txt +++ b/compiler/testData/multiplatform/optionalExpectation/output.txt @@ -1,9 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/optionalExpectation/common.kt:5:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect annotation class A() -^ -- JVM -- Exit code: OK @@ -18,6 +15,3 @@ actual annotation class A -- JS -- Exit code: OK Output: -compiler/testData/multiplatform/optionalExpectation/common.kt:5:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect annotation class A() -^ diff --git a/compiler/testData/multiplatform/regressions/incompatibleClassScopesWithImplTypeAlias/output.txt b/compiler/testData/multiplatform/regressions/incompatibleClassScopesWithImplTypeAlias/output.txt index 8e243fc9911..22bb3671f9a 100644 --- a/compiler/testData/multiplatform/regressions/incompatibleClassScopesWithImplTypeAlias/output.txt +++ b/compiler/testData/multiplatform/regressions/incompatibleClassScopesWithImplTypeAlias/output.txt @@ -1,21 +1,18 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/regressions/incompatibleClassScopesWithImplTypeAlias/common.kt:3:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect abstract class Writer protected constructor() -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/regressions/incompatibleClassScopesWithImplTypeAlias/jvm.kt:3:18: error: actual class 'Writer' has no corresponding members for expected class members: +compiler/testData/multiplatform/regressions/incompatibleClassScopesWithImplTypeAlias/jvm.kt:3:18: error: actual class 'actual typealias Writer = Writer' has no corresponding members for expected class members: - protected constructor Writer() + expect constructor(): Writer The following declaration is incompatible because visibility is different: - protected/*protected and package*/ constructor Writer() + constructor(): Writer The following declaration is incompatible because number of value parameters is different: - protected/*protected and package*/ constructor Writer(p0: Any!) + constructor(p0: Any!): Writer actual typealias Writer = java.io.Writer ^ diff --git a/compiler/testData/multiplatform/regressions/kt28385/output.txt b/compiler/testData/multiplatform/regressions/kt28385/output.txt index 6d9721f5fde..1bd9c1ce178 100644 --- a/compiler/testData/multiplatform/regressions/kt28385/output.txt +++ b/compiler/testData/multiplatform/regressions/kt28385/output.txt @@ -5,18 +5,18 @@ Output: -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/regressions/kt28385/jvm.kt:5:1: error: expecting a top level declaration -sdax = { -^ -compiler/testData/multiplatform/regressions/kt28385/jvm.kt:5:6: error: expecting a top level declaration -sdax = { - ^ -compiler/testData/multiplatform/regressions/kt28385/jvm.kt:5:8: error: expecting a top level declaration -sdax = { - ^ -compiler/testData/multiplatform/regressions/kt28385/jvm.kt:3:1: error: property must be initialized +compiler/testData/multiplatform/regressions/kt28385/jvm.kt:3:1: error: property must be initialized. val dasda ^ -compiler/testData/multiplatform/regressions/kt28385/jvm.kt:5:8: error: function declaration must have a name +compiler/testData/multiplatform/regressions/kt28385/jvm.kt:5:1: error: syntax error: Expecting a top level declaration. +sdax = { +^ +compiler/testData/multiplatform/regressions/kt28385/jvm.kt:5:6: error: syntax error: Expecting a top level declaration. +sdax = { + ^ +compiler/testData/multiplatform/regressions/kt28385/jvm.kt:5:8: error: syntax error: Expecting a top level declaration. +sdax = { + ^ +compiler/testData/multiplatform/regressions/kt28385/jvm.kt:5:8: error: function declaration must have a name. sdax = { ^ diff --git a/compiler/testData/multiplatform/simple/output.txt b/compiler/testData/multiplatform/simple/output.txt index 2d709044a62..f325abcdea3 100644 --- a/compiler/testData/multiplatform/simple/output.txt +++ b/compiler/testData/multiplatform/simple/output.txt @@ -1,9 +1,6 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/simple/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Printer() { -^ -- JVM -- Exit code: OK @@ -18,9 +15,3 @@ actual class Printer { -- JS -- Exit code: OK Output: -compiler/testData/multiplatform/simple/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Printer() { -^ -compiler/testData/multiplatform/simple/js.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -actual class Printer { -^ diff --git a/compiler/testData/multiplatform/weakIncompatibilityWithoutActualModifier/output.txt b/compiler/testData/multiplatform/weakIncompatibilityWithoutActualModifier/output.txt index 4cc42495b96..fa5e7f1bde8 100644 --- a/compiler/testData/multiplatform/weakIncompatibilityWithoutActualModifier/output.txt +++ b/compiler/testData/multiplatform/weakIncompatibilityWithoutActualModifier/output.txt @@ -1,13 +1,10 @@ -- Common -- Exit code: OK Output: -compiler/testData/multiplatform/weakIncompatibilityWithoutActualModifier/common.kt:1:1: warning: 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573 -expect class Foo -^ -- JVM -- Exit code: COMPILATION_ERROR Output: -compiler/testData/multiplatform/weakIncompatibilityWithoutActualModifier/jvm.kt:1:11: error: declaration must be marked with 'actual' -interface Foo - ^ +compiler/testData/multiplatform/weakIncompatibilityWithoutActualModifier/common.kt:1:1: error: expect declaration `Foo` doesn't match actual `Foo` because class kinds are different (class, interface, object, enum, annotation) +expect class Foo +^ diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java index 391aa8e5877..51dcd6431ba 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java @@ -1120,21 +1120,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/resultInReturnTypeSupportedByDefault15.args"); } - @TestMetadata("resultInReturnTypeUnsupportedByDefault14.args") - public void testResultInReturnTypeUnsupportedByDefault14() throws Exception { - runTest("compiler/testData/cli/jvm/resultInReturnTypeUnsupportedByDefault14.args"); - } - - @TestMetadata("resultInReturnTypeWithEnabledInlineClasses.args") - public void testResultInReturnTypeWithEnabledInlineClasses() throws Exception { - runTest("compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClasses.args"); - } - - @TestMetadata("resultInReturnTypeWithEnabledInlineClassesXX.args") - public void testResultInReturnTypeWithEnabledInlineClassesXX() throws Exception { - runTest("compiler/testData/cli/jvm/resultInReturnTypeWithEnabledInlineClassesXX.args"); - } - @TestMetadata("returnAsWhenKey.args") public void testReturnAsWhenKey() throws Exception { runTest("compiler/testData/cli/jvm/returnAsWhenKey.args"); @@ -1240,11 +1225,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/useMixedNamedArgumentsFlag.args"); } - @TestMetadata("variableInWhenSubject.args") - public void testVariableInWhenSubject() throws Exception { - runTest("compiler/testData/cli/jvm/variableInWhenSubject.args"); - } - @TestMetadata("warningJdkWithNoJdk.args") public void testWarningJdkWithNoJdk() throws Exception { runTest("compiler/testData/cli/jvm/warningJdkWithNoJdk.args"); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt index 0106838db69..a88ff1180a5 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt @@ -648,7 +648,9 @@ abstract class AbstractCompileKotlinAgainstCustomBinariesTest : AbstractKotlinCo fun testAgainstFirWithStableAbiAndNoPrereleaseCheck() { val library = compileLibrary("library", additionalOptions = listOf("-language-version", "2.0", "-Xabi-stability=stable")) - compileKotlin("source.kt", tmpdir, listOf(library), additionalOptions = listOf("-Xskip-prerelease-check")) + compileKotlin( + "source.kt", tmpdir, listOf(library), additionalOptions = listOf("-language-version", "1.9", "-Xskip-prerelease-check") + ) } fun testAgainstFirWithAllowUnstableDependencies() { @@ -706,7 +708,7 @@ abstract class AbstractCompileKotlinAgainstCustomBinariesTest : AbstractKotlinCo listOf("-Xexpect-actual-linker") ) } - + companion object { @JvmStatic protected fun copyJarFileWithoutEntry(jarPath: File, vararg entriesToDelete: String): File = diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt index a0692a54537..618d9b8ae6c 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -1,8 +1,10 @@ -'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14 -'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 -'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 -Cannot access 'InternalClass1': it is internal in 'test' at line 5, column 13 -Cannot access 'InternalClass1': it is internal in 'test' at line 8, column 36 -Cannot access 'InternalClassAnnotation': it is internal in 'test' at line 10, column 2 -Cannot access 'InternalTestAnnotation': it is internal in 'test' at line 1, column 7 -Cannot access 'member': it is invisible (private in a supertype) in 'ClassAA1' at line 27, column 25 +'internal open override val test/ClassBB1.member: kotlin/Int = Int(10) + internal get(): kotlin/Int' has no access to 'internal abstract val test/ClassB1.member: kotlin/Int + internal get(): kotlin/Int', so it cannot override it at line 14, column 14 +Cannot access '@Target(...) @Retention(...) annotation class InternalClassAnnotation : Annotation': it is internal in file at line 10, column 2 +Cannot access '@Target(...) @Retention(...) annotation class InternalTestAnnotation : Annotation': it is internal in file at line 1, column 7 +Cannot access 'class InternalClass1 : Any': it is internal in file at line 5, column 13 +Cannot access 'class InternalClass1 : Any': it is internal in file at line 8, column 36 +Cannot access 'val member: Int': it is internal in 'test/ClassA1' at line 27, column 25 +public subclass exposes its internal supertype 'InternalClass1' at line 8, column 36 +public subclass exposes its internal supertype 'InternalClass2' at line 18, column 36 \ No newline at end of file diff --git a/plugins/kapt3/kapt3-cli/testData/integration/correctErrorTypesOff/build.txt b/plugins/kapt3/kapt3-cli/testData/integration/correctErrorTypesOff/build.txt index 1e013b88208..3a9c302792e 100644 --- a/plugins/kapt3/kapt3-cli/testData/integration/correctErrorTypesOff/build.txt +++ b/plugins/kapt3/kapt3-cli/testData/integration/correctErrorTypesOff/build.txt @@ -41,6 +41,7 @@ test.Test # after Return code: 1 +warning: kapt currently doesn't support language version 2.0+. Falling back to 1.9. error: error: NonExistentClass type occurred Test.kt:4:8: error: unresolved reference: generated import generated.Property