diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index 6b7a8253b95..471ab8964eb 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -426,7 +426,8 @@ public class GenerateTests { "idea/tests/", "ReferenceResolveTestGenerated", AbstractResolveBaseTest.class, - testModel("idea/testData/resolve/references", "doTest") ); + testModel("idea/testData/resolve/references", "doTest") + ); } private static SimpleTestClassModel testModel(@NotNull String rootPath) { diff --git a/idea/testData/safeDelete/deleteClass/class1.kt b/idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/class1.kt rename to idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt diff --git a/idea/testData/safeDelete/deleteClass/class1.kt.after b/idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteClass/class1.kt.after rename to idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt.after diff --git a/idea/testData/safeDelete/deleteClass/class2.kt b/idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/class2.kt rename to idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt diff --git a/idea/testData/safeDelete/deleteClass/class2.kt.messages b/idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/class2.kt.messages rename to idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt.messages diff --git a/idea/testData/safeDelete/deleteClass/nestedClass1.kt b/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/nestedClass1.kt rename to idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt diff --git a/idea/testData/safeDelete/deleteClass/nestedClass1.kt.after b/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteClass/nestedClass1.kt.after rename to idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt.after diff --git a/idea/testData/safeDelete/deleteClass/nestedClass2.kt b/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/nestedClass2.kt rename to idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt diff --git a/idea/testData/safeDelete/deleteClass/nestedClass2.kt.messages b/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/nestedClass2.kt.messages rename to idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt.messages diff --git a/idea/testData/safeDelete/deleteClass/noUsages.kt b/idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/noUsages.kt rename to idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt diff --git a/idea/testData/safeDelete/deleteClass/noUsages.kt.after b/idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteClass/noUsages.kt.after rename to idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt.after diff --git a/idea/testData/safeDelete/deleteClass/trait1.kt b/idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/trait1.kt rename to idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt diff --git a/idea/testData/safeDelete/deleteClass/trait1.kt.after b/idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteClass/trait1.kt.after rename to idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt.after diff --git a/idea/testData/safeDelete/deleteClass/trait2.kt b/idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/trait2.kt rename to idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt diff --git a/idea/testData/safeDelete/deleteClass/trait2.kt.messages b/idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/trait2.kt.messages rename to idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt.messages diff --git a/idea/testData/safeDelete/deleteClass/unsafeImport.kt b/idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/unsafeImport.kt rename to idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt diff --git a/idea/testData/safeDelete/deleteClass/unsafeImport.kt.messages b/idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/unsafeImport.kt.messages rename to idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt.messages diff --git a/idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy1.java b/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java similarity index 100% rename from idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy1.java rename to idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java diff --git a/idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy1.java.after b/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy1.java.after rename to idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java.after diff --git a/idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy1.kt b/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt similarity index 100% rename from idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy1.kt rename to idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt diff --git a/idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy1.kt.after b/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy1.kt.after rename to idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt.after diff --git a/idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy2.java b/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java similarity index 100% rename from idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy2.java rename to idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java diff --git a/idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy2.java.after b/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy2.java.after rename to idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java.after diff --git a/idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy2.kt b/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt similarity index 100% rename from idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy2.kt rename to idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt diff --git a/idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy2.kt.after b/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteJavaMethod/mixedHierarchy2.kt.after rename to idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/fun1.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/fun1.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt diff --git a/idea/testData/safeDelete/deleteFunction/fun1.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/fun1.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/fun2.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/fun2.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt diff --git a/idea/testData/safeDelete/deleteFunction/fun2.kt.messages b/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/fun2.kt.messages rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/implement1.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/implement1.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt diff --git a/idea/testData/safeDelete/deleteFunction/implement1.kt.messages b/idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/implement1.kt.messages rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/implement2.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/implement2.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt diff --git a/idea/testData/safeDelete/deleteFunction/implement2.kt.messages b/idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/implement2.kt.messages rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/noUsages.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/noUsages.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt diff --git a/idea/testData/safeDelete/deleteFunction/noUsages.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/noUsages.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/override1.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/override1.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt diff --git a/idea/testData/safeDelete/deleteFunction/override1.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/override1.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/override2.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/override2.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt diff --git a/idea/testData/safeDelete/deleteFunction/override2.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/override2.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/overrideAndImplement1.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/overrideAndImplement1.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt diff --git a/idea/testData/safeDelete/deleteFunction/overrideAndImplement1.kt.messages b/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/overrideAndImplement1.kt.messages rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/overrideAndImplement2.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/overrideAndImplement2.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt diff --git a/idea/testData/safeDelete/deleteFunction/overrideAndImplement2.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/overrideAndImplement2.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/overrideWithUsages.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/overrideWithUsages.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt diff --git a/idea/testData/safeDelete/deleteFunction/overrideWithUsages.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/overrideWithUsages.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement1.java b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.java similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement1.java rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.java diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement1.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement1.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement1.kt.messages b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement1.kt.messages rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt.messages diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement2.java b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement2.java rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement2.java.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement2.java.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement2.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement2.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement2.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement2.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement3.java b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.java similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement3.java rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.java diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement3.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement3.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement3.kt.messages b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement3.kt.messages rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt.messages diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement4.java b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement4.java rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement4.java.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement4.java.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement4.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement4.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement4.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/implement4.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override1.java b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override1.java rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override1.java.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override1.java.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override1.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override1.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override1.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override1.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override2.java b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override2.java rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override2.java.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override2.java.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override2.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override2.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override2.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override2.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override3.java b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override3.java rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override3.java.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override3.java.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override3.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override3.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/override3.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/override3.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement1.java b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.java similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement1.java rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.java diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement1.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement1.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement1.kt.messages b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement1.kt.messages rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt.messages diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement2.java b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement2.java rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement2.java.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement2.java.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java.after diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement2.kt b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement2.kt rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt diff --git a/idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement2.kt.after b/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunctionWithJavaUsages/overrideAndImplement2.kt.after rename to idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt.after diff --git a/idea/testData/safeDelete/deleteObject/nestedObject1.kt b/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/nestedObject1.kt rename to idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt diff --git a/idea/testData/safeDelete/deleteObject/nestedObject1.kt.after b/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteObject/nestedObject1.kt.after rename to idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt.after diff --git a/idea/testData/safeDelete/deleteObject/nestedObject2.kt b/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/nestedObject2.kt rename to idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt diff --git a/idea/testData/safeDelete/deleteObject/nestedObject2.kt.messages b/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteObject/nestedObject2.kt.messages rename to idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt.messages diff --git a/idea/testData/safeDelete/deleteObject/noUsages.kt b/idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/noUsages.kt rename to idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt diff --git a/idea/testData/safeDelete/deleteObject/noUsages.kt.after b/idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteObject/noUsages.kt.after rename to idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt.after diff --git a/idea/testData/safeDelete/deleteObject/object1.kt b/idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/object1.kt rename to idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt diff --git a/idea/testData/safeDelete/deleteObject/object1.kt.after b/idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteObject/object1.kt.after rename to idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt.after diff --git a/idea/testData/safeDelete/deleteObject/object2.kt b/idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/object2.kt rename to idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt diff --git a/idea/testData/safeDelete/deleteObject/object2.kt.messages b/idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteObject/object2.kt.messages rename to idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt.messages diff --git a/idea/testData/safeDelete/deleteObject/unsafeImport.kt b/idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/unsafeImport.kt rename to idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt diff --git a/idea/testData/safeDelete/deleteObject/unsafeImport.kt.messages b/idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteObject/unsafeImport.kt.messages rename to idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt.messages diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava1.java b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava1.java rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava1.java.after b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava1.java.after rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java.after diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava1.kt b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava1.kt rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava1.kt.after b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava1.kt.after rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt.after diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava2.java b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.java similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava2.java rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.java diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava2.kt b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava2.kt rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava2.kt.messages b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava2.kt.messages rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt.messages diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava3.java b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava3.java rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava3.java.after b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java.after similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava3.java.after rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java.after diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava3.kt b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava3.kt rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava3.kt.after b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava3.kt.after rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt.after diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava4.java b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.java similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava4.java rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.java diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava4.kt b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava4.kt rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava4.kt.messages b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava4.kt.messages rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt.messages diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava5.java b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava5.java rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava5.java.after b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java.after similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava5.java.after rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java.after diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava5.kt b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava5.kt rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava5.kt.after b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava5.kt.after rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt.after diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava6.java b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.java similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava6.java rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.java diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava6.kt b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava6.kt rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt diff --git a/idea/testData/safeDelete/deleteJavaProperty/middleJava6.kt.messages b/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteJavaProperty/middleJava6.kt.messages rename to idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/implement1.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/implement1.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt diff --git a/idea/testData/safeDelete/deleteProperty/implement1.kt.messages b/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/implement1.kt.messages rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/implement2.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/implement2.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt diff --git a/idea/testData/safeDelete/deleteProperty/implement2.kt.messages b/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/implement2.kt.messages rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/implement3.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/implement3.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt diff --git a/idea/testData/safeDelete/deleteProperty/implement3.kt.messages b/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/implement3.kt.messages rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/implement4.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/implement4.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt diff --git a/idea/testData/safeDelete/deleteProperty/implement4.kt.messages b/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/implement4.kt.messages rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/noUsages.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/noUsages.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt diff --git a/idea/testData/safeDelete/deleteProperty/noUsages.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/noUsages.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/override1.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/override1.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt diff --git a/idea/testData/safeDelete/deleteProperty/override1.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/override1.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/override2.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/override2.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt diff --git a/idea/testData/safeDelete/deleteProperty/override2.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/override2.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/override3.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/override3.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt diff --git a/idea/testData/safeDelete/deleteProperty/override3.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/override3.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/override4.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/override4.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt diff --git a/idea/testData/safeDelete/deleteProperty/override4.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/override4.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/overrideAndImplement1.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/overrideAndImplement1.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt diff --git a/idea/testData/safeDelete/deleteProperty/overrideAndImplement1.kt.messages b/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/overrideAndImplement1.kt.messages rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/overrideAndImplement2.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/overrideAndImplement2.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt diff --git a/idea/testData/safeDelete/deleteProperty/overrideAndImplement2.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/overrideAndImplement2.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/overrideAndImplement3.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/overrideAndImplement3.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt diff --git a/idea/testData/safeDelete/deleteProperty/overrideAndImplement3.kt.messages b/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/overrideAndImplement3.kt.messages rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/overrideAndImplement4.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/overrideAndImplement4.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt diff --git a/idea/testData/safeDelete/deleteProperty/overrideAndImplement4.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/overrideAndImplement4.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/overrideWithUsages.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/overrideWithUsages.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt diff --git a/idea/testData/safeDelete/deleteProperty/overrideWithUsages.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/overrideWithUsages.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/property1.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/property1.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt diff --git a/idea/testData/safeDelete/deleteProperty/property1.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/property1.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/property2.kt b/idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/property2.kt rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt diff --git a/idea/testData/safeDelete/deleteProperty/property2.kt.messages b/idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/property2.kt.messages rename to idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt.messages diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.java b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.java rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.java.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.java.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.kt b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.kt rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement1.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.java b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.java rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.java.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.java.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.kt b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.kt rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement2.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.java b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.java rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.java.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.java.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.kt b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.kt rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement3.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.java b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.java rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.java.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.java.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.kt b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.kt rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/implement4.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.java b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.java rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.java.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.java.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.kt b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.kt rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override1.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.java b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.java rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.java.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.java.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.kt b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.kt rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override2.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.java b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.java rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.java.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.java.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.kt b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.kt rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override3.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.java b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.java rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.java.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.java.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.kt b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.kt rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/override4.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.java b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.java rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.java.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.java.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.kt b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.kt rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement1.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.java b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.java rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.java.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.java.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java.after diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.kt b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.kt rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt diff --git a/idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.kt.after b/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deletePropertyWithJavaUsages/overrideAndImplement2.kt.after rename to idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt.after