From 787bbe9a4ce99e9aff576ca2e054435f75d3c269 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 11 Aug 2017 16:47:26 +0300 Subject: [PATCH] Safe Delete: Support header/impl declarations #KT-18433 Fixed --- .../kotlin/generators/tests/GenerateTests.kt | 5 + .../KotlinJavaSafeDeleteDelegate.kt | 4 +- .../safeDelete/KotlinSafeDeleteProcessor.kt | 143 ++++++++++++--- .../SafeDeleteValueArgumentListUsageInfo.kt | 24 ++- .../byHeaderClass/after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 3 + .../byHeaderClass/after/JS/JS.iml | 20 +++ .../byHeaderClass/after/JS/src/test/test.kt | 4 + .../byHeaderClass/after/JVM/JVM.iml | 20 +++ .../byHeaderClass/after/JVM/src/test/test.kt | 4 + .../byHeaderClass/before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 4 + .../byHeaderClass/before/JS/JS.iml | 20 +++ .../byHeaderClass/before/JS/src/test/test.kt | 4 + .../byHeaderClass/before/JVM/JVM.iml | 20 +++ .../byHeaderClass/before/JVM/src/test/test.kt | 4 + .../byHeaderClass/byHeaderClass.test | 4 + .../byHeaderClass/conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 8 + .../byHeaderClassMemberFun/after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 11 ++ .../byHeaderClassMemberFun/after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 11 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 9 + .../byHeaderClassMemberFun/before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 11 ++ .../byHeaderClassMemberFun/before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 11 ++ .../byHeaderClassMemberFun.test | 4 + .../byHeaderClassMemberFun/conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 10 ++ .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 12 ++ .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 12 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 10 ++ .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 12 ++ .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 12 ++ .../byHeaderClassMemberFunParameter.test | 4 + .../conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 6 + .../byHeaderClassMemberVal/after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 7 + .../byHeaderClassMemberVal/after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 7 + .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 7 + .../byHeaderClassMemberVal/before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 7 + .../byHeaderClassMemberVal/before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 7 + .../byHeaderClassMemberVal.test | 4 + .../byHeaderClassMemberVal/conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 8 + .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 13 ++ .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 14 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 8 + .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 13 ++ .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 14 ++ .../conflicts.txt | 1 + ...eaderClassPrimaryConstructorParameter.test | 4 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 6 + .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 7 + .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 7 + .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 7 + .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 7 + .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 7 + .../byHeaderClassSecondaryConstructor.test | 4 + .../conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 10 ++ .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 13 ++ .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 14 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 10 ++ .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 13 ++ .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 14 ++ .../conflicts.txt | 1 + ...derClassSecondaryConstructorParameter.test | 4 + .../byHeaderFun/after/Common/Common.iml | 19 ++ .../byHeaderFun/after/Common/src/test/test.kt | 5 + .../byHeaderFun/after/JS/JS.iml | 20 +++ .../byHeaderFun/after/JS/src/test/test.kt | 9 + .../byHeaderFun/after/JVM/JVM.iml | 20 +++ .../byHeaderFun/after/JVM/src/test/test.kt | 9 + .../byHeaderFun/before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 7 + .../byHeaderFun/before/JS/JS.iml | 20 +++ .../byHeaderFun/before/JS/src/test/test.kt | 9 + .../byHeaderFun/before/JVM/JVM.iml | 20 +++ .../byHeaderFun/before/JVM/src/test/test.kt | 9 + .../byHeaderFun/byHeaderFun.test | 4 + .../byHeaderFun/conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 8 + .../byHeaderFunParamerer/after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 10 ++ .../byHeaderFunParamerer/after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 10 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 8 + .../byHeaderFunParamerer/before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 10 ++ .../byHeaderFunParamerer/before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 10 ++ .../byHeaderFunParameter.test | 4 + .../byHeaderFunParamerer/conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 7 + .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 9 + .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 9 + .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 7 + .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 9 + .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 9 + .../byHeaderFunVarargParameter.test | 4 + .../byHeaderFunVarargParamerer/conflicts.txt | 1 + .../byHeaderVal/after/Common/Common.iml | 19 ++ .../byHeaderVal/after/Common/src/test/test.kt | 3 + .../byHeaderVal/after/JS/JS.iml | 20 +++ .../byHeaderVal/after/JS/src/test/test.kt | 5 + .../byHeaderVal/after/JVM/JVM.iml | 20 +++ .../byHeaderVal/after/JVM/src/test/test.kt | 5 + .../byHeaderVal/before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 5 + .../byHeaderVal/before/JS/JS.iml | 20 +++ .../byHeaderVal/before/JS/src/test/test.kt | 5 + .../byHeaderVal/before/JVM/JVM.iml | 20 +++ .../byHeaderVal/before/JVM/src/test/test.kt | 5 + .../byHeaderVal/byHeaderVal.test | 4 + .../byHeaderVal/conflicts.txt | 1 + .../byImplClass/after/Common/Common.iml | 19 ++ .../byImplClass/after/Common/src/test/test.kt | 4 + .../byImplClass/after/JS/JS.iml | 20 +++ .../byImplClass/after/JS/src/test/test.kt | 3 + .../byImplClass/after/JVM/JVM.iml | 20 +++ .../byImplClass/after/JVM/src/test/test.kt | 4 + .../byImplClass/before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 4 + .../byImplClass/before/JS/JS.iml | 20 +++ .../byImplClass/before/JS/src/test/test.kt | 4 + .../byImplClass/before/JVM/JVM.iml | 20 +++ .../byImplClass/before/JVM/src/test/test.kt | 4 + .../byImplClass/byImplClass.test | 4 + .../byImplClass/conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 9 + .../byImplClassMemberFun/after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 8 + .../byImplClassMemberFun/after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 11 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 9 + .../byImplClassMemberFun/before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 11 ++ .../byImplClassMemberFun/before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 11 ++ .../byImplClassMemberFun.test | 4 + .../byImplClassMemberFun/conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 10 ++ .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 12 ++ .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 12 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 10 ++ .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 12 ++ .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 12 ++ ...lassMemberFunParameterLiftingToHeader.test | 4 + .../conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 7 + .../byImplClassMemberVal/after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 6 + .../byImplClassMemberVal/after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 7 + .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 7 + .../byImplClassMemberVal/before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 7 + .../byImplClassMemberVal/before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 7 + .../byImplClassMemberVal.test | 4 + .../byImplClassMemberVal/conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 8 + .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 13 ++ .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 14 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 8 + .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 13 ++ .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 14 ++ .../conflicts.txt | 1 + ...yImplClassPrimaryConstructorParameter.test | 4 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 7 + .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 6 + .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 7 + .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 7 + .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 7 + .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 7 + .../byImplClassSecondaryConstructor.test | 4 + .../conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 8 + .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 13 ++ .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 14 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 8 + .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 13 ++ .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 14 ++ .../conflicts.txt | 1 + ...mplClassSecondaryConstructorParameter.test | 4 + .../byImplFun/after/Common/Common.iml | 19 ++ .../byImplFun/after/Common/src/test/test.kt | 7 + .../byImplFun/after/JS/JS.iml | 20 +++ .../byImplFun/after/JS/src/test/test.kt | 5 + .../byImplFun/after/JVM/JVM.iml | 20 +++ .../byImplFun/after/JVM/src/test/test.kt | 9 + .../byImplFun/before/Common/Common.iml | 19 ++ .../byImplFun/before/Common/src/test/test.kt | 7 + .../byImplFun/before/JS/JS.iml | 20 +++ .../byImplFun/before/JS/src/test/test.kt | 9 + .../byImplFun/before/JVM/JVM.iml | 20 +++ .../byImplFun/before/JVM/src/test/test.kt | 9 + .../byImplFun/byImplFun.test | 4 + .../byImplFun/conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 8 + .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 10 ++ .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 10 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 8 + .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 10 ++ .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 10 ++ .../byImplFunParameterLiftingToHeader.test | 4 + .../conflicts.txt | 1 + .../after/Common/Common.iml | 19 ++ .../after/Common/src/test/test.kt | 8 + .../after/JS/JS.iml | 20 +++ .../after/JS/src/test/test.kt | 10 ++ .../after/JVM/JVM.iml | 20 +++ .../after/JVM/src/test/test.kt | 10 ++ .../before/Common/Common.iml | 19 ++ .../before/Common/src/test/test.kt | 8 + .../before/JS/JS.iml | 20 +++ .../before/JS/src/test/test.kt | 10 ++ .../before/JVM/JVM.iml | 20 +++ .../before/JVM/src/test/test.kt | 10 ++ .../byImplFunParameterNoLiftingToHeader.test | 5 + .../conflicts.txt | 1 + .../byImplVal/after/Common/Common.iml | 19 ++ .../byImplVal/after/Common/src/test/test.kt | 5 + .../byImplVal/after/JS/JS.iml | 20 +++ .../byImplVal/after/JS/src/test/test.kt | 3 + .../byImplVal/after/JVM/JVM.iml | 20 +++ .../byImplVal/after/JVM/src/test/test.kt | 5 + .../byImplVal/before/Common/Common.iml | 19 ++ .../byImplVal/before/Common/src/test/test.kt | 5 + .../byImplVal/before/JS/JS.iml | 20 +++ .../byImplVal/before/JS/src/test/test.kt | 5 + .../byImplVal/before/JVM/JVM.iml | 20 +++ .../byImplVal/before/JVM/src/test/test.kt | 5 + .../byImplVal/byImplVal.test | 4 + .../byImplVal/conflicts.txt | 1 + .../AbstractMultiModuleSafeDeleteTest.kt | 59 ++++++ .../MultiModuleSafeDeleteTestGenerated.java | 170 ++++++++++++++++++ 314 files changed, 4195 insertions(+), 35 deletions(-) create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/byHeaderClass.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/byHeaderClassMemberFun.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/byHeaderClassMemberFunParameter.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/byHeaderClassMemberVal.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/headersAndImplsByHeaderClassPrimaryConstructorParameter.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/byHeaderClassSecondaryConstructor.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/headersAndImplsByHeaderClassSecondaryConstructorParameter.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/byHeaderFun.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/byHeaderFunParameter.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/byHeaderFunVarargParameter.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/byHeaderVal.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/byImplClass.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClass/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/byImplClassMemberFun.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/byImplClassMemberFunParameterLiftingToHeader.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/byImplClassMemberVal.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassPrimaryConstructorParameter.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/byImplClassSecondaryConstructor.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassSecondaryConstructorParameter.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/byImplFun.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFun/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/byImplFunParameterLiftingToHeader.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/byImplFunParameterNoLiftingToHeader.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/conflicts.txt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/Common/Common.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/Common/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JS/JS.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JS/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JVM/JVM.iml create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JVM/src/test/test.kt create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/byImplVal.test create mode 100644 idea/testData/refactoring/safeDeleteMultiModule/byImplVal/conflicts.txt create mode 100644 idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/AbstractMultiModuleSafeDeleteTest.kt create mode 100644 idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/MultiModuleSafeDeleteTestGenerated.java diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index ddb121d4633..8812551475e 100755 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -131,6 +131,7 @@ import org.jetbrains.kotlin.idea.refactoring.pullUp.AbstractPullUpTest import org.jetbrains.kotlin.idea.refactoring.pushDown.AbstractPushDownTest import org.jetbrains.kotlin.idea.refactoring.rename.AbstractMultiModuleRenameTest import org.jetbrains.kotlin.idea.refactoring.rename.AbstractRenameTest +import org.jetbrains.kotlin.idea.refactoring.safeDelete.AbstractMultiModuleSafeDeleteTest import org.jetbrains.kotlin.idea.refactoring.safeDelete.AbstractSafeDeleteTest import org.jetbrains.kotlin.idea.repl.AbstractIdeReplCompletionTest import org.jetbrains.kotlin.idea.resolve.* @@ -794,6 +795,10 @@ fun main(args: Array) { model("refactoring/copyMultiModule", extension = "test", singleClass = true) } + testClass { + model("refactoring/safeDeleteMultiModule", extension = "test", singleClass = true) + } + testClass { model("multiFileIntentions", extension = "test", singleClass = true, filenameStartsLowerCase = true) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt index ff9d74d56f3..03cf9a8615d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt @@ -58,7 +58,7 @@ class KotlinJavaSafeDeleteDelegate : JavaSafeDeleteDelegate { val namedArguments = args.filter { arg -> arg is KtValueArgument && arg.getArgumentName()?.text == parameter.name } if (!namedArguments.isEmpty()) { - usages.add(SafeDeleteValueArgumentListUsageInfo(namedArguments.first(), parameter)) + usages.add(SafeDeleteValueArgumentListUsageInfo(parameter, namedArguments.first())) return } @@ -69,7 +69,7 @@ class KotlinJavaSafeDeleteDelegate : JavaSafeDeleteDelegate { val argCount = args.size if (parameterIndex < argCount) { - usages.add(SafeDeleteValueArgumentListUsageInfo((args[parameterIndex] as KtValueArgument), parameter)) + usages.add(SafeDeleteValueArgumentListUsageInfo(parameter, args[parameterIndex] as KtValueArgument)) } else { val lambdaArgs = callExpression.lambdaArguments val lambdaIndex = parameterIndex - argCount diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt index 2c064c68dd1..450644c32e1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.idea.refactoring.safeDelete import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project +import com.intellij.openapi.ui.Messages import com.intellij.openapi.util.Condition import com.intellij.openapi.util.Conditions -import com.intellij.psi.PsiClass -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiMethod -import com.intellij.psi.PsiParameter +import com.intellij.openapi.util.Key +import com.intellij.psi.* import com.intellij.psi.search.searches.ReferencesSearch +import com.intellij.refactoring.RefactoringBundle import com.intellij.refactoring.safeDelete.JavaSafeDeleteProcessor import com.intellij.refactoring.safeDelete.NonCodeUsageSearchInfo import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteOverrideAnnotation @@ -33,27 +33,43 @@ import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteOverridingMethodU import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceJavaDeleteUsageInfo import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo import com.intellij.usageView.UsageInfo +import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.asJava.* import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.core.deleteElementAndCleanParent +import org.jetbrains.kotlin.idea.highlighter.markers.headerImplementations +import org.jetbrains.kotlin.idea.highlighter.markers.liftToHeader import org.jetbrains.kotlin.idea.refactoring.checkSuperMethods import org.jetbrains.kotlin.idea.refactoring.formatClass import org.jetbrains.kotlin.idea.refactoring.formatFunction +import org.jetbrains.kotlin.idea.refactoring.withHeaderImplementations import org.jetbrains.kotlin.idea.references.KtReference +import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions +import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch +import org.jetbrains.kotlin.psi.psiUtil.parameterIndex import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.utils.SmartSet import org.jetbrains.kotlin.utils.ifEmpty import java.util.* class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { + companion object { + @set:TestOnly + internal var Project.ALLOW_LIFTING_IMPL_PARAMETER_TO_HEADER + by NotNullableUserDataProperty(Key.create("ALLOW_LIFTING_IMPL_PARAMETER_TO_HEADER"), true) + + private var KtDeclaration.dropImplModifier: Boolean? by UserDataProperty(Key.create("DROP_IMPL_MODIFIER")) + } + override fun handlesElement(element: PsiElement): Boolean = element.canDeleteElement() override fun findUsages( @@ -69,6 +85,50 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { fun getSearchInfo(element: PsiElement) = NonCodeUsageSearchInfo(getIgnoranceCondition(), element) + fun searchKotlinDeclarationReferences(declaration: KtDeclaration): Sequence { + val elementsToSearch = if (declaration is KtParameter) declaration.withHeaderImplementations() else listOf(declaration) + return elementsToSearch.asSequence().flatMap { + val searchParameters = KotlinReferencesSearchParameters( + it, + it.useScope, + kotlinOptions = KotlinReferencesSearchOptions(acceptCallableOverrides = true) + ) + ReferencesSearch.search(searchParameters) + .asSequence() + .filterNot { reference -> getIgnoranceCondition().value(reference.element) } + } + } + + fun findKotlinParameterUsages(parameter: KtParameter) { + val ownerFunction = parameter.ownerFunction as? KtFunction ?: return + val index = parameter.parameterIndex() + for (reference in searchKotlinDeclarationReferences(ownerFunction)) { + val callee = reference.element as? KtExpression ?: continue + val resolvedCall = callee.getResolvedCall(callee.analyze()) ?: continue + val parameterDescriptor = resolvedCall.candidateDescriptor.valueParameters.getOrNull(index) ?: continue + val resolvedArgument = resolvedCall.valueArguments[parameterDescriptor] ?: continue + val arguments = resolvedArgument.arguments.filterIsInstance() + if (arguments.isEmpty()) continue + + usages.add(SafeDeleteValueArgumentListUsageInfo(parameter, *arguments.toTypedArray())) + } + } + + fun findKotlinDeclarationUsages(declaration: KtDeclaration): NonCodeUsageSearchInfo { + searchKotlinDeclarationReferences(declaration).mapNotNullTo(usages) { reference -> + val refElement = reference.element ?: return@mapNotNullTo null + refElement.getNonStrictParentOfType()?.let { importDirective -> + SafeDeleteImportDirectiveUsageInfo(importDirective, element) + } ?: SafeDeleteReferenceSimpleDeleteUsageInfo(refElement, declaration, false) + } + + if (declaration is KtParameter) { + findKotlinParameterUsages(declaration) + } + + return getSearchInfo(declaration) + } + fun findUsagesByJavaProcessor(element: PsiElement, forceReferencedElementUnwrapping: Boolean): NonCodeUsageSearchInfo? { val javaUsages = ArrayList() val searchInfo = super.findUsages(element, allElementsToDelete, javaUsages) @@ -122,29 +182,19 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { .fold(insideDeleted) { condition1, condition2 -> Conditions.or(condition1, condition2) } fun findUsagesByJavaProcessor(ktDeclaration: KtDeclaration): NonCodeUsageSearchInfo { + val lightElements = ktDeclaration.toLightElements() + if (lightElements.isEmpty()) { + return findKotlinDeclarationUsages(ktDeclaration) + } return NonCodeUsageSearchInfo( findUsagesByJavaProcessor( - ktDeclaration.toLightElements().asSequence(), + lightElements.asSequence(), getIgnoranceCondition() ), ktDeclaration ) } - fun findKotlinDeclarationUsages(declaration: KtDeclaration): NonCodeUsageSearchInfo { - ReferencesSearch.search(declaration, declaration.useScope) - .asSequence() - .filterNot { reference -> getIgnoranceCondition().value(reference.element) } - .mapNotNullTo(usages) { reference -> - val refElement = reference.element ?: return@mapNotNullTo null - refElement.getNonStrictParentOfType()?.let { importDirective -> - SafeDeleteImportDirectiveUsageInfo(importDirective, element) - } ?: SafeDeleteReferenceSimpleDeleteUsageInfo(refElement, declaration, false) - } - - return getSearchInfo(declaration) - } - fun findTypeParameterUsages(parameter: KtTypeParameter) { val owner = parameter.getNonStrictParentOfType() ?: return @@ -189,14 +239,14 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { element.toLightClass()?.let { klass -> findDelegationCallUsages(klass) findUsagesByJavaProcessor(klass, false) - } + } ?: findKotlinDeclarationUsages(element) } is KtSecondaryConstructor -> { element.getRepresentativeLightMethod()?.let { method -> findDelegationCallUsages(method) findUsagesByJavaProcessor(method, false) - } + } ?: findKotlinDeclarationUsages(element) } is KtNamedFunction -> { @@ -204,7 +254,13 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { findKotlinDeclarationUsages(element) } else { - element.toLightMethods().map { method -> findUsagesByJavaProcessor(method, false) }.firstOrNull() + val lightMethods = element.toLightMethods() + if (lightMethods.isNotEmpty()) { + lightMethods.map { method -> findUsagesByJavaProcessor(method, false) }.firstOrNull() + } + else { + findKotlinDeclarationUsages(element) + } } } @@ -305,6 +361,17 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { } override fun prepareForDeletion(element: PsiElement) { + if (element is KtDeclaration) { + element.headerImplementations().forEach { + if (it is KtParameter) { + (it.parent as? KtParameterList)?.removeParameter(it) + } + else { + it.removeModifier(KtTokens.IMPL_KEYWORD) + } + } + } + when (element) { is PsiMethod -> element.cleanUpOverrides() @@ -321,19 +388,47 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { is KtTypeParameter -> element.deleteElementAndCleanParent() - is KtParameter -> + is KtParameter -> { + element.ownerFunction?.let { + if (it.dropImplModifier == true) { + it.removeModifier(KtTokens.IMPL_KEYWORD) + it.dropImplModifier = null + } + } (element.parent as KtParameterList).removeParameter(element) + } } } + private fun shouldAllowPropagationToHeader(parameter: KtParameter): Boolean { + if (ApplicationManager.getApplication().isUnitTestMode) return parameter.project.ALLOW_LIFTING_IMPL_PARAMETER_TO_HEADER + + return Messages.showYesNoDialog( + "Do you want to delete this parameter in header declaration and all its implementations?", + RefactoringBundle.message("safe.delete.title"), + Messages.getQuestionIcon() + ) == Messages.YES + } + override fun getElementsToSearch( element: PsiElement, module: Module?, allElementsToDelete: Collection ): Collection? { when (element) { - is KtParameter -> + is KtParameter -> { + val headerParameter = element.liftToHeader() as? KtParameter + if (headerParameter != null && headerParameter != element) { + if (shouldAllowPropagationToHeader(element)) { + return listOf(headerParameter) + } else { + element.ownerFunction?.dropImplModifier = true + return listOf(element) + } + } + return element.toPsiParameters().flatMap { psiParameter -> checkParametersInMethodHierarchy(psiParameter) ?: emptyList() }.ifEmpty { listOf(element) } + } is PsiParameter -> return checkParametersInMethodHierarchy(element) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteValueArgumentListUsageInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteValueArgumentListUsageInfo.kt index ebdef31fb45..b2808c7bb33 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteValueArgumentListUsageInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteValueArgumentListUsageInfo.kt @@ -20,18 +20,24 @@ import com.intellij.psi.PsiElement import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo import org.jetbrains.kotlin.psi.KtValueArgument import org.jetbrains.kotlin.psi.KtValueArgumentList +import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer class SafeDeleteValueArgumentListUsageInfo( - valueArgument: KtValueArgument, parameter: PsiElement -) : SafeDeleteReferenceSimpleDeleteUsageInfo(valueArgument, parameter, true) { + parameter: PsiElement, + vararg valueArguments: KtValueArgument +) : SafeDeleteReferenceSimpleDeleteUsageInfo(valueArguments.first(), parameter, true) { + private val valueArgumentPointers = valueArguments.map { it.createSmartPointer() } + override fun deleteElement() { - val element = element as? KtValueArgument ?: return - val parent = element.parent - if (parent is KtValueArgumentList) { - parent.removeArgument(element) - } - else { - element.delete() + for (valueArgumentPointer in valueArgumentPointers) { + val valueArgument = valueArgumentPointer.element ?: return + val parent = valueArgument.parent + if (parent is KtValueArgumentList) { + parent.removeArgument(valueArgument) + } + else { + valueArgument.delete() + } } } } diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/Common/src/test/test.kt new file mode 100644 index 00000000000..8fc5fb64595 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/Common/src/test/test.kt @@ -0,0 +1,3 @@ +package test + +header class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JS/src/test/test.kt new file mode 100644 index 00000000000..e44a5d0e67f --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JS/src/test/test.kt @@ -0,0 +1,4 @@ +package test + +open class Foo +impl class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..e44a5d0e67f --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/after/JVM/src/test/test.kt @@ -0,0 +1,4 @@ +package test + +open class Foo +impl class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/Common/src/test/test.kt new file mode 100644 index 00000000000..e01ca6ef901 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/Common/src/test/test.kt @@ -0,0 +1,4 @@ +package test + +header open class Foo +header class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JS/src/test/test.kt new file mode 100644 index 00000000000..026c865380d --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JS/src/test/test.kt @@ -0,0 +1,4 @@ +package test + +impl open class Foo +impl class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..026c865380d --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/before/JVM/src/test/test.kt @@ -0,0 +1,4 @@ +package test + +impl open class Foo +impl class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/byHeaderClass.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/byHeaderClass.test new file mode 100644 index 00000000000..475dee5778e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/byHeaderClass.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtClass" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/conflicts.txt new file mode 100644 index 00000000000..558a233b89e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/conflicts.txt @@ -0,0 +1 @@ +class test.Foo has 3 usages that are not safe to delete. diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/Common/src/test/test.kt new file mode 100644 index 00000000000..82ddbc2284f --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header class Foo { +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JS/src/test/test.kt new file mode 100644 index 00000000000..780fe101a25 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JS/src/test/test.kt @@ -0,0 +1,11 @@ +package test + +impl class Foo { + fun foo(n: Int) { + + } +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..780fe101a25 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/after/JVM/src/test/test.kt @@ -0,0 +1,11 @@ +package test + +impl class Foo { + fun foo(n: Int) { + + } +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/Common/src/test/test.kt new file mode 100644 index 00000000000..01ee1b4a2f0 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/Common/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +header class Foo { + fun foo(n: Int) +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JS/src/test/test.kt new file mode 100644 index 00000000000..7e969a7e18e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JS/src/test/test.kt @@ -0,0 +1,11 @@ +package test + +impl class Foo { + impl fun foo(n: Int) { + + } +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..7e969a7e18e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/before/JVM/src/test/test.kt @@ -0,0 +1,11 @@ +package test + +impl class Foo { + impl fun foo(n: Int) { + + } +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/byHeaderClassMemberFun.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/byHeaderClassMemberFun.test new file mode 100644 index 00000000000..cea707369bd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/byHeaderClassMemberFun.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtNamedFunction" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/conflicts.txt new file mode 100644 index 00000000000..7801c1c79a7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/conflicts.txt @@ -0,0 +1 @@ +function Foo.foo(Int) has 3 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/Common/src/test/test.kt new file mode 100644 index 00000000000..0f88cb3ced9 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/Common/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +header class Foo { + fun foo() +} + +fun test(f: Foo) { + f.foo() + f.foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JS/src/test/test.kt new file mode 100644 index 00000000000..c5c9f3e0f74 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JS/src/test/test.kt @@ -0,0 +1,12 @@ +package test + +impl class Foo { + impl fun foo() { + n + 1 + } +} + +fun test(f: Foo) { + f.foo() + f.foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..c5c9f3e0f74 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/after/JVM/src/test/test.kt @@ -0,0 +1,12 @@ +package test + +impl class Foo { + impl fun foo() { + n + 1 + } +} + +fun test(f: Foo) { + f.foo() + f.foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/Common/src/test/test.kt new file mode 100644 index 00000000000..235f17c1a2c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/Common/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +header class Foo { + fun foo(n: Int) +} + +fun test(f: Foo) { + f.foo(1) + f.foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JS/src/test/test.kt new file mode 100644 index 00000000000..46474e29fd6 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JS/src/test/test.kt @@ -0,0 +1,12 @@ +package test + +impl class Foo { + impl fun foo(n: Int) { + n + 1 + } +} + +fun test(f: Foo) { + f.foo(1) + f.foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..46474e29fd6 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/before/JVM/src/test/test.kt @@ -0,0 +1,12 @@ +package test + +impl class Foo { + impl fun foo(n: Int) { + n + 1 + } +} + +fun test(f: Foo) { + f.foo(1) + f.foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/byHeaderClassMemberFunParameter.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/byHeaderClassMemberFunParameter.test new file mode 100644 index 00000000000..f3564ee04f3 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/byHeaderClassMemberFunParameter.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtParameter" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/conflicts.txt new file mode 100644 index 00000000000..8ee670db6dd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/conflicts.txt @@ -0,0 +1 @@ +parameter n has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/Common/src/test/test.kt new file mode 100644 index 00000000000..a47332602a4 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/Common/src/test/test.kt @@ -0,0 +1,6 @@ +package test + +header class Foo { +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JS/src/test/test.kt new file mode 100644 index 00000000000..2ee4e13e209 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JS/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl class Foo { + val foo get() = 1 +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..90fb9b39296 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/after/JVM/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl class Foo { + val foo get() = 2 +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/Common/src/test/test.kt new file mode 100644 index 00000000000..36fead3afb4 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header class Foo { + val foo: Int +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JS/src/test/test.kt new file mode 100644 index 00000000000..8506a848e16 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JS/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl class Foo { + impl val foo get() = 1 +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..012c5899162 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/before/JVM/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl class Foo { + impl val foo get() = 2 +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/byHeaderClassMemberVal.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/byHeaderClassMemberVal.test new file mode 100644 index 00000000000..db7d58f6527 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/byHeaderClassMemberVal.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtProperty" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/conflicts.txt new file mode 100644 index 00000000000..9655e77a03d --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/conflicts.txt @@ -0,0 +1 @@ +property Foo.foo has 3 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/Common/src/test/test.kt new file mode 100644 index 00000000000..6eaded1026e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header class Foo() + +fun test() { + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JS/src/test/test.kt new file mode 100644 index 00000000000..87f1db1520a --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JS/src/test/test.kt @@ -0,0 +1,13 @@ +package test + +impl class Foo() { + val x = n + 1 + constructor(s: String): this(0) +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..515daa4cac9 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/after/JVM/src/test/test.kt @@ -0,0 +1,14 @@ +package test + +impl class Foo(s: String) { + constructor(): this("") { + val x = n + 1 + } +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/Common/src/test/test.kt new file mode 100644 index 00000000000..0093e1faf0e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header class Foo(n: Int) + +fun test() { + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JS/src/test/test.kt new file mode 100644 index 00000000000..8095b291851 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JS/src/test/test.kt @@ -0,0 +1,13 @@ +package test + +impl class Foo(n: Int) { + val x = n + 1 + constructor(s: String): this(0) +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..76b63fd2936 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/before/JVM/src/test/test.kt @@ -0,0 +1,14 @@ +package test + +impl class Foo(s: String) { + constructor(n: Int): this("") { + val x = n + 1 + } +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/conflicts.txt new file mode 100644 index 00000000000..8ee670db6dd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/conflicts.txt @@ -0,0 +1 @@ +parameter n has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/headersAndImplsByHeaderClassPrimaryConstructorParameter.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/headersAndImplsByHeaderClassPrimaryConstructorParameter.test new file mode 100644 index 00000000000..f3564ee04f3 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/headersAndImplsByHeaderClassPrimaryConstructorParameter.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtParameter" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/Common/src/test/test.kt new file mode 100644 index 00000000000..4b7d5cf83ce --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/Common/src/test/test.kt @@ -0,0 +1,6 @@ +package test + +header open class Foo { +} + +fun test() = Foo(1) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JS/src/test/test.kt new file mode 100644 index 00000000000..2d146f1cc93 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JS/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl open class Foo { + constructor(n: Int) +} + +fun test() = Foo(1) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..99e92640c32 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/after/JVM/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl open class Foo { + constructor(n: Int) +} + +fun test() = Foo(2) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/Common/src/test/test.kt new file mode 100644 index 00000000000..4e2586c0238 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header open class Foo { + constructor(n: Int) +} + +fun test() = Foo(1) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JS/src/test/test.kt new file mode 100644 index 00000000000..e29a484718f --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JS/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl open class Foo { + impl constructor(n: Int) +} + +fun test() = Foo(1) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..d2d128967c4 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/before/JVM/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl open class Foo { + impl constructor(n: Int) +} + +fun test() = Foo(2) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/byHeaderClassSecondaryConstructor.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/byHeaderClassSecondaryConstructor.test new file mode 100644 index 00000000000..0248180651b --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/byHeaderClassSecondaryConstructor.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtSecondaryConstructor" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/conflicts.txt new file mode 100644 index 00000000000..534b9b48399 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/conflicts.txt @@ -0,0 +1 @@ +constructor Foo(Int) has 3 usages that are not safe to delete. diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/Common/src/test/test.kt new file mode 100644 index 00000000000..a11e68dd0d1 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/Common/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +header class Foo { + constructor() +} + +fun test() { + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JS/src/test/test.kt new file mode 100644 index 00000000000..87f1db1520a --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JS/src/test/test.kt @@ -0,0 +1,13 @@ +package test + +impl class Foo() { + val x = n + 1 + constructor(s: String): this(0) +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..515daa4cac9 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JVM/src/test/test.kt @@ -0,0 +1,14 @@ +package test + +impl class Foo(s: String) { + constructor(): this("") { + val x = n + 1 + } +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/Common/src/test/test.kt new file mode 100644 index 00000000000..7fdff41f002 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/Common/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +header class Foo { + constructor(n: Int) +} + +fun test() { + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JS/src/test/test.kt new file mode 100644 index 00000000000..8095b291851 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JS/src/test/test.kt @@ -0,0 +1,13 @@ +package test + +impl class Foo(n: Int) { + val x = n + 1 + constructor(s: String): this(0) +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..76b63fd2936 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JVM/src/test/test.kt @@ -0,0 +1,14 @@ +package test + +impl class Foo(s: String) { + constructor(n: Int): this("") { + val x = n + 1 + } +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/conflicts.txt new file mode 100644 index 00000000000..8ee670db6dd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/conflicts.txt @@ -0,0 +1 @@ +parameter n has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/headersAndImplsByHeaderClassSecondaryConstructorParameter.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/headersAndImplsByHeaderClassSecondaryConstructorParameter.test new file mode 100644 index 00000000000..f3564ee04f3 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/headersAndImplsByHeaderClassSecondaryConstructorParameter.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtParameter" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/Common/src/test/test.kt new file mode 100644 index 00000000000..a77302d41cb --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/Common/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JS/src/test/test.kt new file mode 100644 index 00000000000..e3a27060cc8 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JS/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +fun foo(n: Int) { + +} + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..e3a27060cc8 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/after/JVM/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +fun foo(n: Int) { + +} + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/Common/src/test/test.kt new file mode 100644 index 00000000000..80fd0824d98 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header fun foo(n: Int) + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JS/src/test/test.kt new file mode 100644 index 00000000000..09dd9b074f1 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JS/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +impl fun foo(n: Int) { + +} + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..09dd9b074f1 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/before/JVM/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +impl fun foo(n: Int) { + +} + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/byHeaderFun.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/byHeaderFun.test new file mode 100644 index 00000000000..cea707369bd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/byHeaderFun.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtNamedFunction" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/conflicts.txt new file mode 100644 index 00000000000..ec036caf54f --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/conflicts.txt @@ -0,0 +1 @@ +function test.foo(Int) has 3 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/Common/src/test/test.kt new file mode 100644 index 00000000000..464414bed21 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header fun foo() + +fun test() { + foo() + foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JS/src/test/test.kt new file mode 100644 index 00000000000..ea45605f39e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JS/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo() { + n + 1 +} + +fun test() { + foo() + foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..ea45605f39e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/after/JVM/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo() { + n + 1 +} + +fun test() { + foo() + foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/Common/src/test/test.kt new file mode 100644 index 00000000000..2d18f61309e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header fun foo(n: Int) + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JS/src/test/test.kt new file mode 100644 index 00000000000..cb9cb3a6950 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JS/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo(n: Int) { + n + 1 +} + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..cb9cb3a6950 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/before/JVM/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo(n: Int) { + n + 1 +} + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/byHeaderFunParameter.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/byHeaderFunParameter.test new file mode 100644 index 00000000000..f3564ee04f3 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/byHeaderFunParameter.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtParameter" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/conflicts.txt new file mode 100644 index 00000000000..8ee670db6dd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/conflicts.txt @@ -0,0 +1 @@ +parameter n has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/Common/src/test/test.kt new file mode 100644 index 00000000000..4bed62c129c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header fun foo(s: String) + +fun test() { + foo("1") +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JS/src/test/test.kt new file mode 100644 index 00000000000..9a14eb42d42 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JS/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +impl fun foo(s: String) { + n.size +} + +fun test() { + foo("1") +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..9a14eb42d42 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/after/JVM/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +impl fun foo(s: String) { + n.size +} + +fun test() { + foo("1") +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/Common/src/test/test.kt new file mode 100644 index 00000000000..1db8486edc1 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header fun foo(s: String, vararg n: Int) + +fun test() { + foo("1", 2, 3) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JS/src/test/test.kt new file mode 100644 index 00000000000..59378566d52 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JS/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +impl fun foo(s: String, vararg n: Int) { + n.size +} + +fun test() { + foo("1", 2, 3) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..59378566d52 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/before/JVM/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +impl fun foo(s: String, vararg n: Int) { + n.size +} + +fun test() { + foo("1", 2, 3) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/byHeaderFunVarargParameter.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/byHeaderFunVarargParameter.test new file mode 100644 index 00000000000..f3564ee04f3 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/byHeaderFunVarargParameter.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtParameter" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/conflicts.txt new file mode 100644 index 00000000000..8ee670db6dd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/conflicts.txt @@ -0,0 +1 @@ +parameter n has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/Common/src/test/test.kt new file mode 100644 index 00000000000..7691e56ec64 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/Common/src/test/test.kt @@ -0,0 +1,3 @@ +package test + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JS/src/test/test.kt new file mode 100644 index 00000000000..3e9a7670ff0 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JS/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +val foo get() = 1 + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..c2e8d1f20fd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/after/JVM/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +val foo get() = 2 + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/Common/src/test/test.kt new file mode 100644 index 00000000000..154c4afcf3f --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/Common/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +header val foo: Int + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JS/src/test/test.kt new file mode 100644 index 00000000000..255c2c0ef1e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JS/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +impl val foo get() = 1 + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..21867576635 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/before/JVM/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +impl val foo get() = 2 + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/byHeaderVal.test b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/byHeaderVal.test new file mode 100644 index 00000000000..db7d58f6527 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/byHeaderVal.test @@ -0,0 +1,4 @@ +{ + "mainFile": "Common/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtProperty" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/conflicts.txt new file mode 100644 index 00000000000..a0459a5e086 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/conflicts.txt @@ -0,0 +1 @@ +property test.foo has 3 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/Common/src/test/test.kt new file mode 100644 index 00000000000..d80b9b471db --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/Common/src/test/test.kt @@ -0,0 +1,4 @@ +package test + +header open class Foo +header class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JS/src/test/test.kt new file mode 100644 index 00000000000..ba105d76bb5 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JS/src/test/test.kt @@ -0,0 +1,3 @@ +package test + +impl class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..026c865380d --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/after/JVM/src/test/test.kt @@ -0,0 +1,4 @@ +package test + +impl open class Foo +impl class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/Common/src/test/test.kt new file mode 100644 index 00000000000..d80b9b471db --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/Common/src/test/test.kt @@ -0,0 +1,4 @@ +package test + +header open class Foo +header class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JS/src/test/test.kt new file mode 100644 index 00000000000..b73a39185f6 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JS/src/test/test.kt @@ -0,0 +1,4 @@ +package test + +impl open class Foo +impl class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..026c865380d --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/before/JVM/src/test/test.kt @@ -0,0 +1,4 @@ +package test + +impl open class Foo +impl class ChildOfFoo : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/byImplClass.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/byImplClass.test new file mode 100644 index 00000000000..607bdbe56f8 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/byImplClass.test @@ -0,0 +1,4 @@ +{ + "mainFile": "JS/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtClass" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/conflicts.txt new file mode 100644 index 00000000000..2dcc568decf --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClass/conflicts.txt @@ -0,0 +1 @@ +class test.Foo has 1 usage that is not safe to delete. diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/Common/src/test/test.kt new file mode 100644 index 00000000000..ea9a695edd6 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/Common/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +header class Foo { + fun foo(n: Int) +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JS/src/test/test.kt new file mode 100644 index 00000000000..7f113c56bbd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JS/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +impl class Foo { +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..7e969a7e18e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/after/JVM/src/test/test.kt @@ -0,0 +1,11 @@ +package test + +impl class Foo { + impl fun foo(n: Int) { + + } +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/Common/src/test/test.kt new file mode 100644 index 00000000000..ea9a695edd6 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/Common/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +header class Foo { + fun foo(n: Int) +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JS/src/test/test.kt new file mode 100644 index 00000000000..1e329a5ddfc --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JS/src/test/test.kt @@ -0,0 +1,11 @@ +package test + +impl class Foo { + impl fun foo(n: Int) { + + } +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..7e969a7e18e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/before/JVM/src/test/test.kt @@ -0,0 +1,11 @@ +package test + +impl class Foo { + impl fun foo(n: Int) { + + } +} + +fun test(f: Foo) { + f.foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/byImplClassMemberFun.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/byImplClassMemberFun.test new file mode 100644 index 00000000000..408beaaf7a4 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/byImplClassMemberFun.test @@ -0,0 +1,4 @@ +{ + "mainFile": "JS/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtNamedFunction" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/conflicts.txt new file mode 100644 index 00000000000..2327685c225 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/conflicts.txt @@ -0,0 +1 @@ +function Foo.foo(Int) has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/Common/src/test/test.kt new file mode 100644 index 00000000000..0f88cb3ced9 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/Common/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +header class Foo { + fun foo() +} + +fun test(f: Foo) { + f.foo() + f.foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JS/src/test/test.kt new file mode 100644 index 00000000000..c5c9f3e0f74 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JS/src/test/test.kt @@ -0,0 +1,12 @@ +package test + +impl class Foo { + impl fun foo() { + n + 1 + } +} + +fun test(f: Foo) { + f.foo() + f.foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..c5c9f3e0f74 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/after/JVM/src/test/test.kt @@ -0,0 +1,12 @@ +package test + +impl class Foo { + impl fun foo() { + n + 1 + } +} + +fun test(f: Foo) { + f.foo() + f.foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/Common/src/test/test.kt new file mode 100644 index 00000000000..8e453ec0d65 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/Common/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +header class Foo { + fun foo(n: Int) +} + +fun test(f: Foo) { + f.foo(1) + f.foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JS/src/test/test.kt new file mode 100644 index 00000000000..e936e490ddb --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JS/src/test/test.kt @@ -0,0 +1,12 @@ +package test + +impl class Foo { + impl fun foo(n: Int) { + n + 1 + } +} + +fun test(f: Foo) { + f.foo(1) + f.foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..46474e29fd6 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/before/JVM/src/test/test.kt @@ -0,0 +1,12 @@ +package test + +impl class Foo { + impl fun foo(n: Int) { + n + 1 + } +} + +fun test(f: Foo) { + f.foo(1) + f.foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/byImplClassMemberFunParameterLiftingToHeader.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/byImplClassMemberFunParameterLiftingToHeader.test new file mode 100644 index 00000000000..75be21f843a --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/byImplClassMemberFunParameterLiftingToHeader.test @@ -0,0 +1,4 @@ +{ + "mainFile": "JS/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtParameter" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/conflicts.txt new file mode 100644 index 00000000000..8ee670db6dd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/conflicts.txt @@ -0,0 +1 @@ +parameter n has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/Common/src/test/test.kt new file mode 100644 index 00000000000..5e72ec48a56 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header class Foo { + val foo: Int +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JS/src/test/test.kt new file mode 100644 index 00000000000..2e9ba396a49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JS/src/test/test.kt @@ -0,0 +1,6 @@ +package test + +impl class Foo { +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..012c5899162 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/after/JVM/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl class Foo { + impl val foo get() = 2 +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/Common/src/test/test.kt new file mode 100644 index 00000000000..5e72ec48a56 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header class Foo { + val foo: Int +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JS/src/test/test.kt new file mode 100644 index 00000000000..470308902f5 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JS/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl class Foo { + impl val foo get() = 1 +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..012c5899162 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/before/JVM/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl class Foo { + impl val foo get() = 2 +} + +fun test(f: Foo) = f.foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/byImplClassMemberVal.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/byImplClassMemberVal.test new file mode 100644 index 00000000000..bab83953c3e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/byImplClassMemberVal.test @@ -0,0 +1,4 @@ +{ + "mainFile": "JS/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtProperty" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/conflicts.txt new file mode 100644 index 00000000000..bf5bfd4809c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/conflicts.txt @@ -0,0 +1 @@ +property Foo.foo has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/Common/src/test/test.kt new file mode 100644 index 00000000000..6eaded1026e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header class Foo() + +fun test() { + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JS/src/test/test.kt new file mode 100644 index 00000000000..87f1db1520a --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JS/src/test/test.kt @@ -0,0 +1,13 @@ +package test + +impl class Foo() { + val x = n + 1 + constructor(s: String): this(0) +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..515daa4cac9 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/after/JVM/src/test/test.kt @@ -0,0 +1,14 @@ +package test + +impl class Foo(s: String) { + constructor(): this("") { + val x = n + 1 + } +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/Common/src/test/test.kt new file mode 100644 index 00000000000..b7382255304 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header class Foo(n: Int) + +fun test() { + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JS/src/test/test.kt new file mode 100644 index 00000000000..b5c7f02f52d --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JS/src/test/test.kt @@ -0,0 +1,13 @@ +package test + +impl class Foo(n: Int) { + val x = n + 1 + constructor(s: String): this(0) +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..76b63fd2936 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/before/JVM/src/test/test.kt @@ -0,0 +1,14 @@ +package test + +impl class Foo(s: String) { + constructor(n: Int): this("") { + val x = n + 1 + } +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/conflicts.txt new file mode 100644 index 00000000000..8ee670db6dd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/conflicts.txt @@ -0,0 +1 @@ +parameter n has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassPrimaryConstructorParameter.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassPrimaryConstructorParameter.test new file mode 100644 index 00000000000..75be21f843a --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassPrimaryConstructorParameter.test @@ -0,0 +1,4 @@ +{ + "mainFile": "JS/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtParameter" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/Common/src/test/test.kt new file mode 100644 index 00000000000..fca5ea1c92c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header open class Foo { + constructor(n: Int) +} + +fun test() = Foo(1) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JS/src/test/test.kt new file mode 100644 index 00000000000..49fbdf1275c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JS/src/test/test.kt @@ -0,0 +1,6 @@ +package test + +impl open class Foo { +} + +fun test() = Foo(1) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..d2d128967c4 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/after/JVM/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl open class Foo { + impl constructor(n: Int) +} + +fun test() = Foo(2) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/Common/src/test/test.kt new file mode 100644 index 00000000000..fca5ea1c92c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header open class Foo { + constructor(n: Int) +} + +fun test() = Foo(1) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JS/src/test/test.kt new file mode 100644 index 00000000000..43449a4138c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JS/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl open class Foo { + impl constructor(n: Int) +} + +fun test() = Foo(1) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..d2d128967c4 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/before/JVM/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +impl open class Foo { + impl constructor(n: Int) +} + +fun test() = Foo(2) \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/byImplClassSecondaryConstructor.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/byImplClassSecondaryConstructor.test new file mode 100644 index 00000000000..10674f52d16 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/byImplClassSecondaryConstructor.test @@ -0,0 +1,4 @@ +{ + "mainFile": "JS/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtSecondaryConstructor" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/conflicts.txt new file mode 100644 index 00000000000..e12498168da --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/conflicts.txt @@ -0,0 +1 @@ +constructor Foo(Int) has 1 usage that is not safe to delete. diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/Common/src/test/test.kt new file mode 100644 index 00000000000..6eaded1026e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header class Foo() + +fun test() { + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JS/src/test/test.kt new file mode 100644 index 00000000000..87f1db1520a --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JS/src/test/test.kt @@ -0,0 +1,13 @@ +package test + +impl class Foo() { + val x = n + 1 + constructor(s: String): this(0) +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..515daa4cac9 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/after/JVM/src/test/test.kt @@ -0,0 +1,14 @@ +package test + +impl class Foo(s: String) { + constructor(): this("") { + val x = n + 1 + } +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo() + Foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/Common/src/test/test.kt new file mode 100644 index 00000000000..b7382255304 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header class Foo(n: Int) + +fun test() { + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JS/src/test/test.kt new file mode 100644 index 00000000000..8095b291851 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JS/src/test/test.kt @@ -0,0 +1,13 @@ +package test + +impl class Foo(n: Int) { + val x = n + 1 + constructor(s: String): this(0) +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..18ca3dc1c9e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/before/JVM/src/test/test.kt @@ -0,0 +1,14 @@ +package test + +impl class Foo(s: String) { + constructor(n: Int): this("") { + val x = n + 1 + } +} + +fun test() { + Foo("1") + Foo(s = "1") + Foo(1) + Foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/conflicts.txt new file mode 100644 index 00000000000..8ee670db6dd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/conflicts.txt @@ -0,0 +1 @@ +parameter n has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassSecondaryConstructorParameter.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassSecondaryConstructorParameter.test new file mode 100644 index 00000000000..1f6b324776f --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassSecondaryConstructorParameter.test @@ -0,0 +1,4 @@ +{ + "mainFile": "JVM/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtParameter" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/Common/src/test/test.kt new file mode 100644 index 00000000000..fd9d1410f23 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header fun foo(n: Int) + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JS/src/test/test.kt new file mode 100644 index 00000000000..a77302d41cb --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JS/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..09dd9b074f1 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/after/JVM/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +impl fun foo(n: Int) { + +} + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/Common/src/test/test.kt new file mode 100644 index 00000000000..fd9d1410f23 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/Common/src/test/test.kt @@ -0,0 +1,7 @@ +package test + +header fun foo(n: Int) + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JS/src/test/test.kt new file mode 100644 index 00000000000..78f7d473d7d --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JS/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +impl fun foo(n: Int) { + +} + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..09dd9b074f1 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/before/JVM/src/test/test.kt @@ -0,0 +1,9 @@ +package test + +impl fun foo(n: Int) { + +} + +fun test() { + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/byImplFun.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/byImplFun.test new file mode 100644 index 00000000000..408beaaf7a4 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/byImplFun.test @@ -0,0 +1,4 @@ +{ + "mainFile": "JS/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtNamedFunction" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/conflicts.txt new file mode 100644 index 00000000000..a6c30c3d0ec --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFun/conflicts.txt @@ -0,0 +1 @@ +function test.foo(Int) has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/Common/src/test/test.kt new file mode 100644 index 00000000000..464414bed21 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header fun foo() + +fun test() { + foo() + foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JS/src/test/test.kt new file mode 100644 index 00000000000..ea45605f39e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JS/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo() { + n + 1 +} + +fun test() { + foo() + foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..ea45605f39e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/after/JVM/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo() { + n + 1 +} + +fun test() { + foo() + foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/Common/src/test/test.kt new file mode 100644 index 00000000000..a6f26ddf3bc --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header fun foo(n: Int) + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JS/src/test/test.kt new file mode 100644 index 00000000000..8947ea1467f --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JS/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo(n: Int) { + n + 1 +} + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..cb9cb3a6950 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/before/JVM/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo(n: Int) { + n + 1 +} + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/byImplFunParameterLiftingToHeader.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/byImplFunParameterLiftingToHeader.test new file mode 100644 index 00000000000..75be21f843a --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/byImplFunParameterLiftingToHeader.test @@ -0,0 +1,4 @@ +{ + "mainFile": "JS/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtParameter" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/conflicts.txt new file mode 100644 index 00000000000..8ee670db6dd --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/conflicts.txt @@ -0,0 +1 @@ +parameter n has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/Common/src/test/test.kt new file mode 100644 index 00000000000..a6f26ddf3bc --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header fun foo(n: Int) + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JS/src/test/test.kt new file mode 100644 index 00000000000..fd385e8dcc0 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JS/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +fun foo() { + n + 1 +} + +fun test() { + foo() + foo() +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..cb9cb3a6950 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/after/JVM/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo(n: Int) { + n + 1 +} + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/Common/src/test/test.kt new file mode 100644 index 00000000000..a6f26ddf3bc --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/Common/src/test/test.kt @@ -0,0 +1,8 @@ +package test + +header fun foo(n: Int) + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JS/src/test/test.kt new file mode 100644 index 00000000000..8947ea1467f --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JS/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo(n: Int) { + n + 1 +} + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..cb9cb3a6950 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/before/JVM/src/test/test.kt @@ -0,0 +1,10 @@ +package test + +impl fun foo(n: Int) { + n + 1 +} + +fun test() { + foo(1) + foo(n = 1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/byImplFunParameterNoLiftingToHeader.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/byImplFunParameterNoLiftingToHeader.test new file mode 100644 index 00000000000..5771bc5ed84 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/byImplFunParameterNoLiftingToHeader.test @@ -0,0 +1,5 @@ +{ + "mainFile": "JS/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtParameter", + "liftParameterToHeader": "false" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/conflicts.txt new file mode 100644 index 00000000000..f225ec816c7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/conflicts.txt @@ -0,0 +1 @@ +parameter n has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/Common/src/test/test.kt new file mode 100644 index 00000000000..361968a94d9 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/Common/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +header val foo: Int + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JS/src/test/test.kt new file mode 100644 index 00000000000..7691e56ec64 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JS/src/test/test.kt @@ -0,0 +1,3 @@ +package test + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JVM/src/test/test.kt new file mode 100644 index 00000000000..21867576635 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/after/JVM/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +impl val foo get() = 2 + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/Common/Common.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/Common/Common.iml new file mode 100644 index 00000000000..0ecf9949f6c --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/Common/Common.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/Common/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/Common/src/test/test.kt new file mode 100644 index 00000000000..361968a94d9 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/Common/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +header val foo: Int + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JS/JS.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JS/JS.iml new file mode 100644 index 00000000000..82d3e6bdf49 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JS/JS.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JS/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JS/src/test/test.kt new file mode 100644 index 00000000000..e52a41e5910 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JS/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +impl val foo get() = 1 + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JVM/JVM.iml b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JVM/JVM.iml new file mode 100644 index 00000000000..c3173af9ec7 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JVM/JVM.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JVM/src/test/test.kt b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JVM/src/test/test.kt new file mode 100644 index 00000000000..21867576635 --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/before/JVM/src/test/test.kt @@ -0,0 +1,5 @@ +package test + +impl val foo get() = 2 + +fun test() = foo \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/byImplVal.test b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/byImplVal.test new file mode 100644 index 00000000000..bab83953c3e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/byImplVal.test @@ -0,0 +1,4 @@ +{ + "mainFile": "JS/src/test/test.kt", + "elementClass": "org.jetbrains.kotlin.psi.KtProperty" +} \ No newline at end of file diff --git a/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/conflicts.txt b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/conflicts.txt new file mode 100644 index 00000000000..d43eee6b09e --- /dev/null +++ b/idea/testData/refactoring/safeDeleteMultiModule/byImplVal/conflicts.txt @@ -0,0 +1 @@ +property test.foo has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/AbstractMultiModuleSafeDeleteTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/AbstractMultiModuleSafeDeleteTest.kt new file mode 100644 index 00000000000..907f24dde53 --- /dev/null +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/AbstractMultiModuleSafeDeleteTest.kt @@ -0,0 +1,59 @@ +/* + * Copyright 2010-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.idea.refactoring.safeDelete + +import com.google.gson.JsonObject +import com.intellij.openapi.vfs.VirtualFile +import com.intellij.psi.PsiElement +import com.intellij.psi.PsiFile +import com.intellij.refactoring.safeDelete.SafeDeleteHandler +import org.jetbrains.kotlin.idea.jsonUtils.getString +import org.jetbrains.kotlin.idea.refactoring.AbstractMultifileRefactoringTest +import org.jetbrains.kotlin.idea.refactoring.rename.loadTestConfiguration +import org.jetbrains.kotlin.idea.refactoring.runRefactoringTest +import org.jetbrains.kotlin.idea.refactoring.safeDelete.KotlinSafeDeleteProcessor.Companion.ALLOW_LIFTING_IMPL_PARAMETER_TO_HEADER +import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase +import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import java.io.File + +abstract class AbstractMultiModuleSafeDeleteTest : KotlinMultiFileTestCase() { + object SafeDeleteAction : AbstractMultifileRefactoringTest.RefactoringAction { + override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementsAtCaret: List, config: JsonObject) { + @Suppress("UNCHECKED_CAST") + val elementClass = Class.forName(config.getString("elementClass")) as Class + val element = elementsAtCaret.single().getNonStrictParentOfType(elementClass)!! + val project = mainFile.project + project.ALLOW_LIFTING_IMPL_PARAMETER_TO_HEADER = config.get("liftParameterToHeader")?.asBoolean ?: true + SafeDeleteHandler.invoke(project, arrayOf(element), null, true, null) + } + } + + override fun getTestRoot(): String = "/refactoring/safeDeleteMultiModule/" + + override fun getTestDataPath(): String = PluginTestCaseBase.getTestDataPathBase() + + fun doTest(path: String) { + val config = loadTestConfiguration(File(path)) + + isMultiModule = true + + doTestCommittingDocuments { rootDir, _ -> + runRefactoringTest(path, config, rootDir, project, SafeDeleteAction) + } + } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/MultiModuleSafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/MultiModuleSafeDeleteTestGenerated.java new file mode 100644 index 00000000000..a1241f637b3 --- /dev/null +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/MultiModuleSafeDeleteTestGenerated.java @@ -0,0 +1,170 @@ +/* + * Copyright 2010-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.idea.refactoring.safeDelete; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("idea/testData/refactoring/safeDeleteMultiModule") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class MultiModuleSafeDeleteTestGenerated extends AbstractMultiModuleSafeDeleteTest { + public void testAllFilesPresentInSafeDeleteMultiModule() throws Exception { + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/safeDeleteMultiModule"), Pattern.compile("^(.+)\\.test$"), TargetBackend.ANY); + } + + @TestMetadata("byHeaderClass/byHeaderClass.test") + public void testByHeaderClass_ByHeaderClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderClass/byHeaderClass.test"); + doTest(fileName); + } + + @TestMetadata("byHeaderClassMemberFun/byHeaderClassMemberFun.test") + public void testByHeaderClassMemberFun_ByHeaderClassMemberFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFun/byHeaderClassMemberFun.test"); + doTest(fileName); + } + + @TestMetadata("byHeaderClassMemberFunParameter/byHeaderClassMemberFunParameter.test") + public void testByHeaderClassMemberFunParameter_ByHeaderClassMemberFunParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberFunParameter/byHeaderClassMemberFunParameter.test"); + doTest(fileName); + } + + @TestMetadata("byHeaderClassMemberVal/byHeaderClassMemberVal.test") + public void testByHeaderClassMemberVal_ByHeaderClassMemberVal() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassMemberVal/byHeaderClassMemberVal.test"); + doTest(fileName); + } + + @TestMetadata("byHeaderClassPrimaryConstructorParameter/headersAndImplsByHeaderClassPrimaryConstructorParameter.test") + public void testByHeaderClassPrimaryConstructorParameter_HeadersAndImplsByHeaderClassPrimaryConstructorParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassPrimaryConstructorParameter/headersAndImplsByHeaderClassPrimaryConstructorParameter.test"); + doTest(fileName); + } + + @TestMetadata("byHeaderClassSecondaryConstructor/byHeaderClassSecondaryConstructor.test") + public void testByHeaderClassSecondaryConstructor_ByHeaderClassSecondaryConstructor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructor/byHeaderClassSecondaryConstructor.test"); + doTest(fileName); + } + + @TestMetadata("byHeaderClassSecondaryConstructorParameter/headersAndImplsByHeaderClassSecondaryConstructorParameter.test") + public void testByHeaderClassSecondaryConstructorParameter_HeadersAndImplsByHeaderClassSecondaryConstructorParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/headersAndImplsByHeaderClassSecondaryConstructorParameter.test"); + doTest(fileName); + } + + @TestMetadata("byHeaderFun/byHeaderFun.test") + public void testByHeaderFun_ByHeaderFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderFun/byHeaderFun.test"); + doTest(fileName); + } + + @TestMetadata("byHeaderFunParamerer/byHeaderFunParameter.test") + public void testByHeaderFunParamerer_ByHeaderFunParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunParamerer/byHeaderFunParameter.test"); + doTest(fileName); + } + + @TestMetadata("byHeaderFunVarargParamerer/byHeaderFunVarargParameter.test") + public void testByHeaderFunVarargParamerer_ByHeaderFunVarargParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderFunVarargParamerer/byHeaderFunVarargParameter.test"); + doTest(fileName); + } + + @TestMetadata("byHeaderVal/byHeaderVal.test") + public void testByHeaderVal_ByHeaderVal() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byHeaderVal/byHeaderVal.test"); + doTest(fileName); + } + + @TestMetadata("byImplClass/byImplClass.test") + public void testByImplClass_ByImplClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplClass/byImplClass.test"); + doTest(fileName); + } + + @TestMetadata("byImplClassMemberFun/byImplClassMemberFun.test") + public void testByImplClassMemberFun_ByImplClassMemberFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFun/byImplClassMemberFun.test"); + doTest(fileName); + } + + @TestMetadata("byImplClassMemberFunParameterLiftingToHeader/byImplClassMemberFunParameterLiftingToHeader.test") + public void testByImplClassMemberFunParameterLiftingToHeader_ByImplClassMemberFunParameterLiftingToHeader() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberFunParameterLiftingToHeader/byImplClassMemberFunParameterLiftingToHeader.test"); + doTest(fileName); + } + + @TestMetadata("byImplClassMemberVal/byImplClassMemberVal.test") + public void testByImplClassMemberVal_ByImplClassMemberVal() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplClassMemberVal/byImplClassMemberVal.test"); + doTest(fileName); + } + + @TestMetadata("byImplClassPrimaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassPrimaryConstructorParameter.test") + public void testByImplClassPrimaryConstructorParameterLiftingToHeader_HeadersAndImplsByImplClassPrimaryConstructorParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplClassPrimaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassPrimaryConstructorParameter.test"); + doTest(fileName); + } + + @TestMetadata("byImplClassSecondaryConstructor/byImplClassSecondaryConstructor.test") + public void testByImplClassSecondaryConstructor_ByImplClassSecondaryConstructor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructor/byImplClassSecondaryConstructor.test"); + doTest(fileName); + } + + @TestMetadata("byImplClassSecondaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassSecondaryConstructorParameter.test") + public void testByImplClassSecondaryConstructorParameterLiftingToHeader_HeadersAndImplsByImplClassSecondaryConstructorParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplClassSecondaryConstructorParameterLiftingToHeader/headersAndImplsByImplClassSecondaryConstructorParameter.test"); + doTest(fileName); + } + + @TestMetadata("byImplFun/byImplFun.test") + public void testByImplFun_ByImplFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplFun/byImplFun.test"); + doTest(fileName); + } + + @TestMetadata("byImplFunParamererLiftingToHeader/byImplFunParameterLiftingToHeader.test") + public void testByImplFunParamererLiftingToHeader_ByImplFunParameterLiftingToHeader() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererLiftingToHeader/byImplFunParameterLiftingToHeader.test"); + doTest(fileName); + } + + @TestMetadata("byImplFunParamererNoLiftingToHeader/byImplFunParameterNoLiftingToHeader.test") + public void testByImplFunParamererNoLiftingToHeader_ByImplFunParameterNoLiftingToHeader() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplFunParamererNoLiftingToHeader/byImplFunParameterNoLiftingToHeader.test"); + doTest(fileName); + } + + @TestMetadata("byImplVal/byImplVal.test") + public void testByImplVal_ByImplVal() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDeleteMultiModule/byImplVal/byImplVal.test"); + doTest(fileName); + } +}