From 78876b32e9553e9aa30f37e8a4934f629e96ad80 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 5 Feb 2024 15:22:36 +0100 Subject: [PATCH] K2: unmute testInnerClassPackageConflict2 thus fixing current K2 behavior Related to KT-63070, KT-60792 --- .../innerClassPackageConflict2/output.fir.txt | 4 ++++ .../AbstractCompileKotlinAgainstCustomBinariesTest.kt | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/innerClassPackageConflict2/output.fir.txt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/innerClassPackageConflict2/output.fir.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/innerClassPackageConflict2/output.fir.txt new file mode 100644 index 00000000000..64553383442 --- /dev/null +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/innerClassPackageConflict2/output.fir.txt @@ -0,0 +1,4 @@ +compiler/testData/compileKotlinAgainstCustomBinaries/innerClassPackageConflict2/source.kt:10:9: error: unresolved reference 'Nested'. +val v3: Nested? = null + ^ +COMPILATION_ERROR diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt index 7a15bc42e0c..6025fbb7419 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt @@ -472,8 +472,7 @@ abstract class AbstractCompileKotlinAgainstCustomBinariesTest : AbstractKotlinCo compileKotlin("source.kt", tmpdir, listOf(File(tmpdir, "library.jar"))) } - // KT-60792 K2 can resolve FQ type name to a nested classifier even in presence of a parent package - fun testInnerClassPackageConflict2() = muteForK2 { + fun testInnerClassPackageConflict2() { val library1 = compileLibrary("library1", destination = File(tmpdir, "library1")) val library2 = compileLibrary("library2", destination = File(tmpdir, "library2"))