From 6d95a69a3eb042177a22bf8e5ec9850aa8723173 Mon Sep 17 00:00:00 2001 From: Bart van Helvert Date: Thu, 22 Aug 2024 16:48:32 +0200 Subject: [PATCH] [kotlin] Add inner reference without qualifier move file test GitOrigin-RevId: 324880807321b893da71dd80791e3f01e6957807 --- .../idea/refactoring/move/MoveTestGenerated.java | 5 +++++ .../innerReferenceWithoutQualifier/after/a/.keep | 0 .../after/b/ObjectContainer.kt | 16 ++++++++++++++++ .../before/a/.keep | 0 .../before/a/ObjectContainer.kt | 16 ++++++++++++++++ .../innerReferenceWithoutQualifier.test | 7 +++++++ .../K2MoveFileOrDirectoriesTestGenerated.java | 5 +++++ 7 files changed, 49 insertions(+) create mode 100644 plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/after/a/.keep create mode 100644 plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/after/b/ObjectContainer.kt create mode 100644 plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/before/a/.keep create mode 100644 plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/before/a/ObjectContainer.kt create mode 100644 plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/innerReferenceWithoutQualifier.test diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java index f6f0330c61b2..ae225826c583 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java @@ -164,6 +164,11 @@ public abstract class MoveTestGenerated extends AbstractMoveTest { runTest("testData/refactoring/moveFile/kotlin/externalDestructuringUsage/externalDestructuringUsage.test"); } + @TestMetadata("kotlin/innerReferenceWithoutQualifier/innerReferenceWithoutQualifier.test") + public void testKotlin_innerReferenceWithoutQualifier_InnerReferenceWithoutQualifier() throws Exception { + runTest("testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/innerReferenceWithoutQualifier.test"); + } + @TestMetadata("kotlin/internalReferences/internalReferences.test") public void testKotlin_internalReferences_InternalReferences() throws Exception { runTest("testData/refactoring/moveFile/kotlin/internalReferences/internalReferences.test"); diff --git a/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/after/a/.keep b/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/after/a/.keep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/after/b/ObjectContainer.kt b/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/after/b/ObjectContainer.kt new file mode 100644 index 000000000000..ff037c701a1b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/after/b/ObjectContainer.kt @@ -0,0 +1,16 @@ +package b + +import b.ObjectContainer.NestedObject.CONST +import b.ObjectContainer.NestedObject.objectFun + +class ObjectContainer { + object NestedObject { + const val CONST = 0 + fun objectFun() {} + } + + fun refer() { + CONST + objectFun() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/before/a/.keep b/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/before/a/.keep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/before/a/ObjectContainer.kt b/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/before/a/ObjectContainer.kt new file mode 100644 index 000000000000..6f99621516d6 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/before/a/ObjectContainer.kt @@ -0,0 +1,16 @@ +package a + +import a.ObjectContainer.NestedObject.CONST +import a.ObjectContainer.NestedObject.objectFun + +class ObjectContainer { + object NestedObject { + const val CONST = 0 + fun objectFun() {} + } + + fun refer() { + CONST + objectFun() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/innerReferenceWithoutQualifier.test b/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/innerReferenceWithoutQualifier.test new file mode 100644 index 000000000000..a919e4a59b46 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/innerReferenceWithoutQualifier.test @@ -0,0 +1,7 @@ +{ + "mainFile": "a/ObjectContainer.kt", + "type": "MOVE_FILES", + "targetPackage": "b", + "enabledInK1": "true", + "enabledInK2": "true" +} diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/move/K2MoveFileOrDirectoriesTestGenerated.java b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/move/K2MoveFileOrDirectoriesTestGenerated.java index 844ad77ef881..57e08fc5564b 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/move/K2MoveFileOrDirectoriesTestGenerated.java +++ b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/move/K2MoveFileOrDirectoriesTestGenerated.java @@ -60,6 +60,11 @@ public class K2MoveFileOrDirectoriesTestGenerated extends AbstractK2MoveFileOrDi runTest("../../idea/tests/testData/refactoring/moveFile/kotlin/externalDestructuringUsage/externalDestructuringUsage.test"); } + @TestMetadata("kotlin/innerReferenceWithoutQualifier/innerReferenceWithoutQualifier.test") + public void testKotlin_innerReferenceWithoutQualifier_InnerReferenceWithoutQualifier() throws Exception { + runTest("../../idea/tests/testData/refactoring/moveFile/kotlin/innerReferenceWithoutQualifier/innerReferenceWithoutQualifier.test"); + } + @TestMetadata("kotlin/internalReferences/internalReferences.test") public void testKotlin_internalReferences_InternalReferences() throws Exception { runTest("../../idea/tests/testData/refactoring/moveFile/kotlin/internalReferences/internalReferences.test");