From 659ebae5881e30543d729466d0636befed2c0517 Mon Sep 17 00:00:00 2001 From: Andrew Kozlov Date: Thu, 12 Jun 2025 23:46:57 +0200 Subject: [PATCH] [kotlin] KTIJ-32930 test data renamed GitOrigin-RevId: b04a54c466b2b22832331f80df5d78c0f2919518 --- .../TopLevelPropertyNameCollision.dependency1.kt} | 0 .../TopLevelPropertyNameCollision.kt} | 0 .../test/MultiFileJvmBasicCompletionTestGenerated.java | 10 +++++----- ...hLevelMultiFileJvmBasicCompletionTestGenerated.java | 10 +++++----- .../KotlinMultifileNavigationTestGenerated.java | 6 +++--- .../TopLevelPropertyNameCollision.dependency1.kt} | 0 .../TopLevelPropertyNameCollision.kt} | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) rename plugins/kotlin/completion/testData/basic/multifile/{KTIJ_32930/KTIJ_32930.dependency1.kt => TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.dependency1.kt} (100%) rename plugins/kotlin/completion/testData/basic/multifile/{KTIJ_32930/KTIJ_32930.kt => TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.kt} (100%) rename plugins/kotlin/navigation/tests/testData/multifile/{KTIJ_32930/KTIJ_32930.dependency1.kt => TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.dependency1.kt} (100%) rename plugins/kotlin/navigation/tests/testData/multifile/{KTIJ_32930/KTIJ_32930.kt => TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.kt} (56%) diff --git a/plugins/kotlin/completion/testData/basic/multifile/KTIJ_32930/KTIJ_32930.dependency1.kt b/plugins/kotlin/completion/testData/basic/multifile/TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.dependency1.kt similarity index 100% rename from plugins/kotlin/completion/testData/basic/multifile/KTIJ_32930/KTIJ_32930.dependency1.kt rename to plugins/kotlin/completion/testData/basic/multifile/TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.dependency1.kt diff --git a/plugins/kotlin/completion/testData/basic/multifile/KTIJ_32930/KTIJ_32930.kt b/plugins/kotlin/completion/testData/basic/multifile/TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.kt similarity index 100% rename from plugins/kotlin/completion/testData/basic/multifile/KTIJ_32930/KTIJ_32930.kt rename to plugins/kotlin/completion/testData/basic/multifile/TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.kt diff --git a/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java b/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java index c0289259aff0..260e1e5c9e1b 100644 --- a/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java +++ b/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java @@ -335,11 +335,6 @@ public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJ runTest("../testData/basic/multifile/KTIJ_32792/"); } - @TestMetadata("KTIJ_32930") - public void testKTIJ_32930() throws Exception { - runTest("../testData/basic/multifile/KTIJ_32930/"); - } - @TestMetadata("MoreSpecificExtensionGeneric") public void testMoreSpecificExtensionGeneric() throws Exception { runTest("../testData/basic/multifile/MoreSpecificExtensionGeneric/"); @@ -600,6 +595,11 @@ public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJ runTest("../testData/basic/multifile/TopLevelFunction/"); } + @TestMetadata("TopLevelPropertyNameCollision") + public void testTopLevelPropertyNameCollision() throws Exception { + runTest("../testData/basic/multifile/TopLevelPropertyNameCollision/"); + } + @TestMetadata("TypeAliases") public void testTypeAliases() throws Exception { runTest("../testData/basic/multifile/TypeAliases/"); diff --git a/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java b/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java index 52040292029e..6123a641baf5 100644 --- a/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java +++ b/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java @@ -335,11 +335,6 @@ public class HighLevelMultiFileJvmBasicCompletionTestGenerated extends AbstractH runTest("../../completion/testData/basic/multifile/KTIJ_32792/"); } - @TestMetadata("KTIJ_32930") - public void testKTIJ_32930() throws Exception { - runTest("../../completion/testData/basic/multifile/KTIJ_32930/"); - } - @TestMetadata("MoreSpecificExtensionGeneric") public void testMoreSpecificExtensionGeneric() throws Exception { runTest("../../completion/testData/basic/multifile/MoreSpecificExtensionGeneric/"); @@ -600,6 +595,11 @@ public class HighLevelMultiFileJvmBasicCompletionTestGenerated extends AbstractH runTest("../../completion/testData/basic/multifile/TopLevelFunction/"); } + @TestMetadata("TopLevelPropertyNameCollision") + public void testTopLevelPropertyNameCollision() throws Exception { + runTest("../../completion/testData/basic/multifile/TopLevelPropertyNameCollision/"); + } + @TestMetadata("TypeAliases") public void testTypeAliases() throws Exception { runTest("../../completion/testData/basic/multifile/TypeAliases/"); diff --git a/plugins/kotlin/navigation/tests/test/org/jetbrains/kotlin/idea/k2/navigation/KotlinMultifileNavigationTestGenerated.java b/plugins/kotlin/navigation/tests/test/org/jetbrains/kotlin/idea/k2/navigation/KotlinMultifileNavigationTestGenerated.java index 1f9c85f7a4c6..62f3e7f7fc96 100644 --- a/plugins/kotlin/navigation/tests/test/org/jetbrains/kotlin/idea/k2/navigation/KotlinMultifileNavigationTestGenerated.java +++ b/plugins/kotlin/navigation/tests/test/org/jetbrains/kotlin/idea/k2/navigation/KotlinMultifileNavigationTestGenerated.java @@ -30,8 +30,8 @@ public class KotlinMultifileNavigationTestGenerated extends AbstractKotlinMultif KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - @TestMetadata("KTIJ_32930") - public void testKTIJ_32930() throws Exception { - runTest("testData/multifile/KTIJ_32930/"); + @TestMetadata("TopLevelPropertyNameCollision") + public void testTopLevelPropertyNameCollision() throws Exception { + runTest("testData/multifile/TopLevelPropertyNameCollision/"); } } diff --git a/plugins/kotlin/navigation/tests/testData/multifile/KTIJ_32930/KTIJ_32930.dependency1.kt b/plugins/kotlin/navigation/tests/testData/multifile/TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.dependency1.kt similarity index 100% rename from plugins/kotlin/navigation/tests/testData/multifile/KTIJ_32930/KTIJ_32930.dependency1.kt rename to plugins/kotlin/navigation/tests/testData/multifile/TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.dependency1.kt diff --git a/plugins/kotlin/navigation/tests/testData/multifile/KTIJ_32930/KTIJ_32930.kt b/plugins/kotlin/navigation/tests/testData/multifile/TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.kt similarity index 56% rename from plugins/kotlin/navigation/tests/testData/multifile/KTIJ_32930/KTIJ_32930.kt rename to plugins/kotlin/navigation/tests/testData/multifile/TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.kt index fed25fb1825f..7085b128a02a 100644 --- a/plugins/kotlin/navigation/tests/testData/multifile/KTIJ_32930/KTIJ_32930.kt +++ b/plugins/kotlin/navigation/tests/testData/multifile/TopLevelPropertyNameCollision/TopLevelPropertyNameCollision.kt @@ -6,4 +6,4 @@ fun test() { bar } -// REF: (KTIJ_32930.kt in foo).bar \ No newline at end of file +// REF: (TopLevelPropertyNameCollision.kt in foo).bar \ No newline at end of file