From 4e58dc346781eeaebf5546c10e419ed91abe45b7 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 23 Dec 2021 15:11:52 +0300 Subject: [PATCH] Fix small compilation problems in LC testdata which should not influence LC results --- .../testData/asJava/ultraLightClasses/classModifiers.kt | 2 +- .../testData/asJava/ultraLightClasses/constructors.kt | 2 +- compiler/testData/asJava/ultraLightClasses/coroutines.kt | 8 ++++---- .../testData/asJava/ultraLightClasses/jvmOverloads.kt | 2 +- .../testData/asJava/ultraLightClasses/throwsAnnotation.kt | 4 ++-- compiler/testData/asJava/ultraLightFacades/coroutines.kt | 4 ++-- compiler/testData/asJava/ultraLightFacades/inlineOnly.kt | 1 + .../testData/asJava/ultraLightFacades/throwsAnnotation.kt | 4 ++-- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/compiler/testData/asJava/ultraLightClasses/classModifiers.kt b/compiler/testData/asJava/ultraLightClasses/classModifiers.kt index c8fddda2654..ddba0670a3b 100644 --- a/compiler/testData/asJava/ultraLightClasses/classModifiers.kt +++ b/compiler/testData/asJava/ultraLightClasses/classModifiers.kt @@ -2,7 +2,7 @@ package pkg open class Open { - private class Private: Open {} + private class Private: Open() {} protected inner class Private2 {} internal class StaticInternal {} } diff --git a/compiler/testData/asJava/ultraLightClasses/constructors.kt b/compiler/testData/asJava/ultraLightClasses/constructors.kt index e8090c68af9..76c0c68c441 100644 --- a/compiler/testData/asJava/ultraLightClasses/constructors.kt +++ b/compiler/testData/asJava/ultraLightClasses/constructors.kt @@ -1,5 +1,5 @@ class TestConstructor private constructor(p: Int = 1) -class A(vararg a: Int, f: () -> Unit) {} +class AAA(vararg a: Int, f: () -> Unit) {} class B { @Deprecated("", level = DeprecationLevel.HIDDEN) diff --git a/compiler/testData/asJava/ultraLightClasses/coroutines.kt b/compiler/testData/asJava/ultraLightClasses/coroutines.kt index 7474ce69616..7d354d23993 100644 --- a/compiler/testData/asJava/ultraLightClasses/coroutines.kt +++ b/compiler/testData/asJava/ultraLightClasses/coroutines.kt @@ -1,15 +1,15 @@ //RELEASE_COROUTINE_NEEDED //CHECK_BY_JAVA_FILE class Foo { - suspend fun doSomething(foo: Foo): Bar {} + suspend fun doSomething(foo: Foo): Bar { TODO() } } class Boo { - private suspend fun doSomething(foo: Foo): Bar {} + private suspend fun doSomething(foo: Foo): Bar { TODO() } } class Bar { - fun async(block: suspend () -> T) + fun async(block: suspend () -> T) {} } interface Base { @@ -17,7 +17,7 @@ interface Base { } class Derived: Base { - override suspend fun foo() { ... } + override suspend fun foo() { } } // WITH_STDLIB diff --git a/compiler/testData/asJava/ultraLightClasses/jvmOverloads.kt b/compiler/testData/asJava/ultraLightClasses/jvmOverloads.kt index 3892592d6b1..d4ac6b77cf2 100644 --- a/compiler/testData/asJava/ultraLightClasses/jvmOverloads.kt +++ b/compiler/testData/asJava/ultraLightClasses/jvmOverloads.kt @@ -1,7 +1,7 @@ class C @JvmOverloads constructor( val type: String?, val p1: Boolean = false, - val p2: String = type + val p2: String = type!! ) { @JvmOverloads fun foo(x: Int = 1, y: Double, z: String = "") {} diff --git a/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.kt b/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.kt index cc547c26048..84bf34e68f7 100644 --- a/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.kt +++ b/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.kt @@ -1,8 +1,8 @@ -class MyException : Exception +class MyException : Exception() class C @Throws(Exception::class) constructor(a: Int = 1) { @Throws(java.io.IOException::class, MyException::class) - fun readFile(name: String): String {} + fun readFile(name: String): String { TODO() } // Should be mapped to java.lang.Throwable @Throws(kotlin.Throwable::class) diff --git a/compiler/testData/asJava/ultraLightFacades/coroutines.kt b/compiler/testData/asJava/ultraLightFacades/coroutines.kt index 9cf08d39c60..99950ccfb60 100644 --- a/compiler/testData/asJava/ultraLightFacades/coroutines.kt +++ b/compiler/testData/asJava/ultraLightFacades/coroutines.kt @@ -1,7 +1,7 @@ //RELEASE_COROUTINE_NEEDED -suspend fun doSomething(foo: String): Int {} +suspend fun doSomething(foo: String): Int { TODO() } -fun async(block: suspend () -> T) +fun async(block: suspend () -> T) { TODO() } // WITH_STDLIB // FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightFacades/inlineOnly.kt b/compiler/testData/asJava/ultraLightFacades/inlineOnly.kt index 6fe4a922846..f82ff83ee62 100644 --- a/compiler/testData/asJava/ultraLightFacades/inlineOnly.kt +++ b/compiler/testData/asJava/ultraLightFacades/inlineOnly.kt @@ -1,2 +1,3 @@ +@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") @kotlin.internal.InlineOnly inline fun foo() {} diff --git a/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.kt b/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.kt index 7350e8870a7..957ef9230d9 100644 --- a/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.kt +++ b/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.kt @@ -1,8 +1,8 @@ -class MyException : Exception +class MyException : Exception() @Throws(java.io.IOException::class, MyException::class) -fun readFile(name: String): String {} +fun readFile(name: String): String { TODO() } // Should be mapped to java.lang.Throwable @Throws(kotlin.Throwable::class)