From 96132fa61a69078cd39f4b1ddadeec059bf0c205 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 25 May 2016 15:26:03 +0300 Subject: [PATCH] Rename: @JvmName support #KT-8044 Fixed #KT-9432 Fixed --- ChangeLog.md | 1 + .../load/kotlin/PackagePartClassUtils.kt | 16 ++ .../kotlin/asJava/KtLightClassForFacade.kt | 44 +++- .../jetbrains/kotlin/asJava/KtLightMethod.kt | 17 +- idea/src/META-INF/plugin.xml | 1 + .../KotlinElementDescriptionProvider.kt | 7 +- .../rename/RenameJvmNameHandler.kt | 83 +++++++ .../rename/RenameKotlinClassProcessor.kt | 33 +-- .../rename/RenameKotlinFunctionProcessor.kt | 33 ++- .../rename/RenameKotlinPropertyProcessor.kt | 66 +++++- .../after/test/JavaClient.java | 7 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 7 + .../before/test/test.kt | 6 + ...KotlinFacadeClassWithDefaultNameByRef.test | 7 + .../after/test/JavaClient.java | 7 + .../after/test/test.kt | 7 + .../before/test/JavaClient.java | 7 + .../before/test/test.kt | 6 + ...KotlinFacadeClassWithDefaultNameByRef.test | 7 + .../after/test/JavaClient.java | 7 + .../after/test/test.kt | 7 + .../before/test/JavaClient.java | 7 + .../before/test/test.kt | 5 + ...KotlinFacadeClassWithDefaultNameByRef.test | 7 + .../after/test/JavaClient.java | 7 + .../after/test/foo.kt | 5 + .../before/test/JavaClient.java | 7 + .../before/test/test.kt | 5 + ...KotlinFacadeClassWithDefaultNameByRef.test | 7 + .../after/test/JavaClient.java | 7 + .../after/test/test.kt | 6 + .../before/test/JavaClient.java | 7 + .../before/test/test.kt | 6 + ...nameKotlinFacadeClassWithJvmNameByRef.test | 7 + .../after/test/JavaClient.java | 7 + .../after/test/test.kt | 5 + .../before/test/JavaClient.java | 7 + .../before/test/test.kt | 6 + ...nameKotlinFacadeClassWithJvmNameByRef.test | 7 + .../after/test/JavaClient.java | 7 + .../after/test/test.kt | 10 + .../before/test/JavaClient.java | 7 + .../before/test/test.kt | 10 + .../renameKotlinFunWithJvmName.test | 6 + .../after/test/JavaClient.java | 7 + .../after/test/test.kt | 10 + .../before/test/JavaClient.java | 7 + .../before/test/test.kt | 10 + .../renameKotlinFunWithJvmNameByJavaRef.test | 7 + .../after/test/JavaClient.java | 7 + .../after/test/test.kt | 9 + .../before/test/JavaClient.java | 7 + .../before/test/test.kt | 10 + ...otlinFunWithJvmNameToDefaultByJavaRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 7 + .../after/test/test2.kt | 7 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 7 + .../before/test/test2.kt | 7 + ...KotlinMultifileFacadeClassWithJvmName.test | 7 + .../after/RenameKotlinClass.kt | 3 - .../after/testing/JavaClient.java | 9 - .../before/RenameKotlinClass.kt | 3 - .../before/testing/JavaClient.java | 9 - .../javaWrapperForKotlinPackageClass.test | 6 - .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...enameKotlinParameterWithGetterJvmName.test | 6 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...ParameterWithGetterJvmNameByGetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...ParameterWithGetterJvmNameBySetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...ParameterWithGetterJvmNameByGetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...otlinParameterWithGetterSetterJvmName.test | 6 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...terWithGetterSetterJvmNameByGetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...terWithGetterSetterJvmNameBySetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...terWithGetterSetterJvmNameByGetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...terWithGetterSetterJvmNameBySetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...enameKotlinParameterWithSetterJvmName.test | 6 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...ParameterWithSetterJvmNameByGetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...ParameterWithSetterJvmNameBySetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 8 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 8 + ...ParameterWithSetterJvmNameBySetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 11 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 11 + ...renameKotlinPropertyWithGetterJvmName.test | 6 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 11 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 11 + ...nPropertyWithGetterJvmNameByGetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 11 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 11 + ...nPropertyWithGetterJvmNameBySetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 10 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 11 + ...nPropertyWithGetterJvmNameByGetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 12 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 12 + ...KotlinPropertyWithGetterSetterJvmName.test | 6 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 12 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 12 + ...rtyWithGetterSetterJvmNameByGetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 12 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 12 + ...rtyWithGetterSetterJvmNameBySetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 11 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 12 + ...rtyWithGetterSetterJvmNameByGetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 11 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 12 + ...rtyWithGetterSetterJvmNameBySetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 11 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 11 + ...renameKotlinPropertyWithSetterJvmName.test | 6 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 11 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 11 + ...nPropertyWithSetterJvmNameByGetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 11 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 11 + ...nPropertyWithSetterJvmNameBySetterRef.test | 7 + .../after/test/JavaClient.java | 8 + .../after/test/test.kt | 10 + .../before/test/JavaClient.java | 8 + .../before/test/test.kt | 11 + ...nPropertyWithSetterJvmNameBySetterRef.test | 7 + .../rename/RenameTestGenerated.java | 222 +++++++++++++++++- 198 files changed, 1928 insertions(+), 87 deletions(-) create mode 100644 idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/renameKotlinFacadeClassWithDefaultNameByRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/renameKotlinFacadeClassWithDefaultNameByRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/after/test/foo.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/renameKotlinFacadeClassWithJvmNameByRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/renameKotlinFacadeClassWithJvmNameByRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmName/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmName/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmName/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmName/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmName/renameKotlinFunWithJvmName.test create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/renameKotlinFunWithJvmNameByJavaRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/renameKotlinFunWithJvmNameToDefaultByJavaRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/test2.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/test2.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/renameKotlinMultifileFacadeClassWithJvmName.test delete mode 100644 idea/testData/refactoring/rename/renameKotlinPackageClass/after/RenameKotlinClass.kt delete mode 100644 idea/testData/refactoring/rename/renameKotlinPackageClass/after/testing/JavaClient.java delete mode 100644 idea/testData/refactoring/rename/renameKotlinPackageClass/before/RenameKotlinClass.kt delete mode 100644 idea/testData/refactoring/rename/renameKotlinPackageClass/before/testing/JavaClient.java delete mode 100644 idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/renameKotlinParameterWithGetterJvmName.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/renameKotlinParameterWithGetterJvmNameBySetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/renameKotlinParameterWithGetterSetterJvmName.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/renameKotlinParameterWithSetterJvmName.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/renameKotlinParameterWithSetterJvmNameByGetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/renameKotlinPropertyWithGetterJvmName.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/renameKotlinPropertyWithGetterJvmNameBySetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/renameKotlinPropertyWithGetterSetterJvmName.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/renameKotlinPropertyWithSetterJvmName.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/renameKotlinPropertyWithSetterJvmNameByGetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/after/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/before/test/test.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test diff --git a/ChangeLog.md b/ChangeLog.md index 89ffc4f5cd2..f1609513b61 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -173,6 +173,7 @@ ###### New features - [`KT-7851`](https://youtrack.jetbrains.com/issue/KT-7851) Respect naming conventions in automatic variable rename +- [`KT-8044`](https://youtrack.jetbrains.com/issue/KT-8044), [`KT-9432`](https://youtrack.jetbrains.com/issue/KT-9432) Support @JvmName annotation in rename refactoring ###### Issues fixed - [`KT-8860`](https://youtrack.jetbrains.com/issue/KT-8860) Allow renaming class by constructor delegation call referencing primary constructor diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt index 7dcdf3c55ed..22861f4c0c2 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.load.kotlin import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.annotations.TestOnly +import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -45,6 +46,15 @@ object PackagePartClassUtils { else "_$str" + private @JvmStatic fun decapitalizeAsJavaClassName(str: String): String = + // NB use Locale.ENGLISH so that build is locale-independent. + // See Javadoc on java.lang.String.toUpperCase() for more details. + when { + Character.isJavaIdentifierStart(str[0]) -> str.substring(0, 1).toLowerCase(Locale.ENGLISH) + str.substring(1) + str[0] == '_' -> str.substring(1) + else -> str + } + @TestOnly @JvmStatic fun getDefaultPartFqName(facadeClassFqName: FqName, file: VirtualFile): FqName = getPackagePartFqName(facadeClassFqName.parent(), file.name) @@ -68,4 +78,10 @@ object PackagePartClassUtils { @JvmStatic fun getFilePartShortName(fileName: String): String = getPartClassName(FileUtil.getNameWithoutExtension(fileName)) + @JvmStatic fun getFileNameByFacadeName(facadeClassName: String): String? { + if (!facadeClassName.endsWith(PART_CLASS_NAME_SUFFIX)) return null + val baseName = facadeClassName.substring(0, facadeClassName.length - PART_CLASS_NAME_SUFFIX.length) + if (baseName == "_") return null + return "${decapitalizeAsJavaClassName(baseName)}.${KotlinFileType.EXTENSION}" + } } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt index e60ea53672a..b9e2ebeae0a 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt @@ -29,12 +29,17 @@ import com.intellij.psi.util.CachedValuesManager import com.intellij.psi.util.PsiModificationTracker import com.intellij.util.containers.SLRUCache import org.jetbrains.annotations.NonNls +import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName import org.jetbrains.kotlin.idea.KotlinLanguage +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils.fileHasTopLevelCallables import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.psi.KtPsiFactory +import org.jetbrains.kotlin.psi.KtStringTemplateExpression +import org.jetbrains.kotlin.psi.psiUtil.siblings import javax.swing.Icon class KtLightClassForFacade private constructor( @@ -140,7 +145,44 @@ class KtLightClassForFacade private constructor( override fun getName() = facadeClassFqName.shortName().asString() - override fun setName(name: String): PsiElement? = this + override fun setName(name: String): PsiElement? { + for (file in files) { + val jvmNameEntry = JvmFileClassUtil.findAnnotationEntryOnFileNoResolve(file, JvmFileClassUtil.JVM_NAME_SHORT) + + if (PackagePartClassUtils.getFilePartShortName(file.name) == name) { + jvmNameEntry?.delete() + continue + } + + if (jvmNameEntry == null) { + val newFileName = PackagePartClassUtils.getFileNameByFacadeName(name) + val facadeDir = file.parent + if (newFileName != null && facadeDir != null && facadeDir.findFile(newFileName) == null) { + file.name = newFileName + continue + } + + val psiFactory = KtPsiFactory(this) + val annotationText = "${JvmFileClassUtil.JVM_NAME_SHORT}(\"$name\")" + val newFileAnnotationList = psiFactory.createFileAnnotationListWithAnnotation(annotationText) + val annotationList = file.fileAnnotationList + if (annotationList != null) { + annotationList.add(newFileAnnotationList.annotationEntries.first()) + } + else { + val anchor = file.firstChild.siblings().firstOrNull { it !is PsiWhiteSpace && it !is PsiComment } + file.addBefore(newFileAnnotationList, anchor) + } + continue + } + + val jvmNameExpression = jvmNameEntry.valueArguments.firstOrNull()?.getArgumentExpression() as? KtStringTemplateExpression + ?: continue + ElementManipulators.handleContentChange(jvmNameExpression, name) + } + + return this + } override fun getQualifiedName() = facadeClassFqName.asString() diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightMethod.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightMethod.kt index 93573a004b0..f48b99d47d6 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightMethod.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightMethod.kt @@ -26,6 +26,7 @@ import com.intellij.psi.util.* import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind interface KtLightMethod : PsiMethod, KtLightDeclaration { @@ -99,8 +100,20 @@ sealed class KtLightMethodImpl( } override fun setName(name: String): PsiElement? { - val toRename = kotlinOrigin as? PsiNamedElement ?: throwCanNotModify() - toRename.setName(propertyNameByAccessor(name, this) ?: name) + val jvmNameAnnotation = modifierList.findAnnotation(DescriptorUtils.JVM_NAME.asString()) + val newNameForOrigin = propertyNameByAccessor(name, this) ?: name + if (newNameForOrigin == kotlinOrigin?.name) { + jvmNameAnnotation?.delete() + return this + } + val nameExpression = jvmNameAnnotation?.findAttributeValue("name")?.unwrapped as? KtStringTemplateExpression + if (nameExpression != null) { + nameExpression.replace(KtPsiFactory(this).createStringTemplate(name)) + } + else { + val toRename = kotlinOrigin as? PsiNamedElement ?: throwCanNotModify() + toRename.setName(newNameForOrigin) + } return this } diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 2c98b79d893..b955b47eaca 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -428,6 +428,7 @@ + diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt index e222d5ceec2..4fbe3ffe75b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt @@ -24,7 +24,9 @@ import com.intellij.psi.PsiNamedElement import com.intellij.refactoring.util.CommonRefactoringUtil import com.intellij.refactoring.util.RefactoringDescriptionLocation import com.intellij.usageView.UsageViewLongNameLocation +import com.intellij.usageView.UsageViewShortNameLocation import com.intellij.usageView.UsageViewTypeLocation +import org.jetbrains.kotlin.asJava.KtLightClassForFacade import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor @@ -36,7 +38,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils class KotlinElementDescriptionProvider : ElementDescriptionProvider { override fun getElementDescription(element: PsiElement, location: ElementDescriptionLocation): String? { - val targetElement = element.unwrapped + val targetElement = element.unwrapped ?: element fun elementKind() = when (targetElement) { is KtClass -> if (targetElement.isInterface()) "interface" else "class" @@ -48,6 +50,7 @@ class KotlinElementDescriptionProvider : ElementDescriptionProvider { is KtParameter -> "parameter" is KtDestructuringDeclarationEntry -> "variable" is RenameJavaSyntheticPropertyHandler.SyntheticPropertyWrapper -> "property" + is KtLightClassForFacade -> "facade class" else -> null } @@ -62,7 +65,7 @@ class KotlinElementDescriptionProvider : ElementDescriptionProvider { if (targetElement !is PsiNamedElement || targetElement.language != KotlinLanguage.INSTANCE) return null return when(location) { is UsageViewTypeLocation -> elementKind() - is UsageViewLongNameLocation -> targetElement.getName() + is UsageViewShortNameLocation, is UsageViewLongNameLocation -> targetElement.getName() is RefactoringDescriptionLocation -> { val kind = elementKind() ?: return null val descriptor = targetDescriptor() ?: return null diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt new file mode 100644 index 00000000000..05a8bd02ea0 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameJvmNameHandler.kt @@ -0,0 +1,83 @@ +/* + * Copyright 2010-2016 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.rename + +import com.intellij.openapi.actionSystem.CommonDataKeys +import com.intellij.openapi.actionSystem.DataContext +import com.intellij.openapi.editor.Editor +import com.intellij.openapi.project.Project +import com.intellij.psi.PsiElement +import com.intellij.psi.PsiFile +import com.intellij.psi.util.PsiTreeUtil +import com.intellij.refactoring.rename.PsiElementRenameHandler +import org.jetbrains.kotlin.asJava.findFacadeClass +import org.jetbrains.kotlin.asJava.toLightMethods +import org.jetbrains.kotlin.idea.caches.resolve.analyze +import org.jetbrains.kotlin.idea.imports.importableFqName +import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.psi.psiUtil.isPlain +import org.jetbrains.kotlin.psi.psiUtil.plainContent +import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode + +class RenameJvmNameHandler : PsiElementRenameHandler() { + private fun getStringTemplate(dataContext: DataContext): KtStringTemplateExpression? { + val caret = CommonDataKeys.CARET.getData(dataContext) ?: return null + val ktFile = CommonDataKeys.PSI_FILE.getData(dataContext) as? KtFile ?: return null + return ktFile.findElementAt(caret.offset)?.getNonStrictParentOfType() + } + + override fun isAvailableOnDataContext(dataContext: DataContext): Boolean { + val nameExpression = getStringTemplate(dataContext) ?: return false + if (!nameExpression.isPlain()) return false + val entry = ((nameExpression.parent as? KtValueArgument)?.parent as? KtValueArgumentList)?.parent as? KtAnnotationEntry + ?: return false + val annotationType = entry.analyze(BodyResolveMode.PARTIAL)[BindingContext.TYPE, entry.typeReference] + ?: return false + return annotationType.constructor.declarationDescriptor?.importableFqName == DescriptorUtils.JVM_NAME + } + + private fun wrapDataContext(dataContext: DataContext): DataContext? { + val nameExpression = getStringTemplate(dataContext) ?: return null + val name = nameExpression.plainContent + val entry = nameExpression.getStrictParentOfType() ?: return null + val annotationList = PsiTreeUtil.getParentOfType(entry, KtModifierList::class.java, KtFileAnnotationList::class.java) + val newElement = when (annotationList) { + is KtModifierList -> + (annotationList.parent as? KtDeclaration)?.toLightMethods()?.firstOrNull { it.name == name } ?: return null + + is KtFileAnnotationList -> annotationList.getContainingKtFile().findFacadeClass() ?: return null + + else -> return null + } + return DataContext { id -> + if (CommonDataKeys.PSI_ELEMENT.`is`(id)) return@DataContext newElement + dataContext.getData(id) + } + } + + override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext) { + super.invoke(project, editor, file, wrapDataContext(dataContext) ?: return) + } + + override fun invoke(project: Project, elements: Array, dataContext: DataContext) { + super.invoke(project, elements, wrapDataContext(dataContext) ?: return) + } +} diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt index fd625094e7f..515384742e5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt @@ -19,12 +19,9 @@ package org.jetbrains.kotlin.idea.refactoring.rename import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference -import com.intellij.refactoring.RefactoringBundle -import com.intellij.refactoring.util.CommonRefactoringUtil import org.jetbrains.kotlin.asJava.KtLightClass import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration import org.jetbrains.kotlin.asJava.KtLightClassForFacade -import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.psi.KtClassOrObject @@ -38,12 +35,10 @@ class RenameKotlinClassProcessor : RenameKotlinPsiProcessor() { return element is KtClassOrObject || element is KtLightClass || element is KtConstructor<*> } - override fun substituteElementToRename(element: PsiElement, editor: Editor?): PsiElement? { - return getKtClassOrObject(element, true, editor) - } + override fun substituteElementToRename(element: PsiElement, editor: Editor?) = getClassOrObject(element) override fun prepareRenaming(element: PsiElement, newName: String, allRenames: MutableMap) { - val classOrObject = getKtClassOrObject(element, false, null) ?: return + val classOrObject = getClassOrObject(element) as? KtClassOrObject ?: return val file = classOrObject.getContainingKtFile() @@ -71,26 +66,12 @@ class RenameKotlinClassProcessor : RenameKotlinPsiProcessor() { return bindingContext[BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, element] != null } - private fun getKtClassOrObject(element: PsiElement?, showErrors: Boolean, editor: Editor?): KtClassOrObject? = when (element) { + private fun getClassOrObject(element: PsiElement?): PsiElement? = when (element) { is KtLightClass -> - if (element is KtLightClassForExplicitDeclaration) { - element.kotlinOrigin - } - else if (element is KtLightClassForFacade) { - if (showErrors) { - CommonRefactoringUtil.showErrorHint( - element.project, editor, - KotlinBundle.message("rename.kotlin.package.class.error"), - RefactoringBundle.message("rename.title"), - null) - } - - // Cancel rename - null - } - else { - assert(false) { "Should not be suggested to rename element of type " + element.javaClass + " " + element } - null + when (element) { + is KtLightClassForExplicitDeclaration -> element.kotlinOrigin + is KtLightClassForFacade -> element + else -> throw AssertionError("Should not be suggested to rename element of type " + element.javaClass + " " + element) } is KtConstructor<*> -> diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt index b6453ec41e8..f21629cf68b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt @@ -19,19 +19,22 @@ package org.jetbrains.kotlin.idea.refactoring.rename import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod +import com.intellij.psi.PsiReference import com.intellij.psi.search.SearchScope import com.intellij.refactoring.listeners.RefactoringElementListener import com.intellij.refactoring.rename.RenameJavaMethodProcessor import com.intellij.usageView.UsageInfo +import org.jetbrains.kotlin.asJava.KtLightElement import org.jetbrains.kotlin.asJava.KtLightMethod import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.asJava.unwrapped +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.refactoring.dropOverrideKeywordIfNecessary +import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.util.application.runReadAction -import org.jetbrains.kotlin.psi.KtFunction -import org.jetbrains.kotlin.psi.KtNamedDeclaration -import org.jetbrains.kotlin.psi.KtNamedFunction -import org.jetbrains.kotlin.psi.KtSecondaryConstructor +import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.resolve.DescriptorUtils class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() { private val javaMethodProcessorInstance = RenameJavaMethodProcessor() @@ -40,6 +43,21 @@ class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() { return element is KtNamedFunction || (element is KtLightMethod && element.kotlinOrigin is KtNamedFunction) } + private fun getJvmName(element: PsiElement): String? { + val descriptor = (element.unwrapped as? KtFunction)?.resolveToDescriptor() as? FunctionDescriptor ?: return null + return DescriptorUtils.getJvmName(descriptor) + } + + override fun findReferences(element: PsiElement): Collection { + val allReferences = super.findReferences(element) + return when { + getJvmName(element) == null -> allReferences + element is KtElement -> allReferences.filter { it is KtReference } + element is KtLightElement<*, *> -> allReferences.filterNot { it is KtReference } + else -> emptyList() + } + } + override fun findCollisions( element: PsiElement?, newName: String?, @@ -55,10 +73,11 @@ class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() { // Use java dialog to ask we should rename function with the base element val substitutedJavaElement = javaMethodProcessorInstance.substituteElementToRename(wrappedMethod, editor) - return when (substitutedJavaElement) { - is KtLightMethod -> substitutedJavaElement.kotlinOrigin as? KtNamedFunction - else -> substitutedJavaElement + if (substitutedJavaElement is KtLightMethod && element is KtDeclaration) { + return substitutedJavaElement.kotlinOrigin as? KtNamedFunction } + + return substitutedJavaElement } override fun prepareRenaming(element: PsiElement?, newName: String?, allRenames: MutableMap, scope: SearchScope) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt index 0986f95f3ef..a3b8db255ae 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt @@ -19,24 +19,20 @@ package org.jetbrains.kotlin.idea.refactoring.rename import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.editor.Editor import com.intellij.openapi.ui.Messages -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiMethod -import com.intellij.psi.PsiNamedElement -import com.intellij.psi.SyntheticElement +import com.intellij.psi.* import com.intellij.psi.search.SearchScope import com.intellij.psi.search.searches.OverridingMethodsSearch import com.intellij.refactoring.listeners.RefactoringElementListener import com.intellij.refactoring.rename.RenameProcessor import com.intellij.refactoring.util.RefactoringUtil import com.intellij.usageView.UsageInfo -import org.jetbrains.kotlin.asJava.KtLightMethod -import org.jetbrains.kotlin.asJava.LightClassUtil -import org.jetbrains.kotlin.asJava.namedUnwrappedElement -import org.jetbrains.kotlin.asJava.propertyNameByAccessor +import org.jetbrains.kotlin.asJava.* import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.idea.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.refactoring.dropOverrideKeywordIfNecessary +import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.lexer.KtTokens @@ -45,6 +41,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.OverrideResolver class RenameKotlinPropertyProcessor : RenameKotlinPsiProcessor() { @@ -56,12 +53,32 @@ class RenameKotlinPropertyProcessor : RenameKotlinPsiProcessor() { /* Can't properly update getters and setters in Java */ override fun isInplaceRenameSupported() = false - override fun substituteElementToRename(element: PsiElement?, editor: Editor?): PsiElement? { - val namedUnwrappedElement = element?.namedUnwrappedElement + private fun getJvmNames(element: PsiElement): Pair { + val descriptor = (element.unwrapped as? KtDeclaration)?.resolveToDescriptor() as? PropertyDescriptor ?: return null to null + val getterName = descriptor.getter?.let { DescriptorUtils.getJvmName(it) } + val setterName = descriptor.setter?.let { DescriptorUtils.getJvmName(it) } + return getterName to setterName + } - val callableDeclaration = namedUnwrappedElement as? KtCallableDeclaration - ?: throw IllegalStateException("Can't be for element $element there because of canProcessElement()") + override fun findReferences(element: PsiElement): Collection { + val allReferences = super.findReferences(element) + val (getterJvmName, setterJvmName) = getJvmNames(element) + return when { + getterJvmName == null && setterJvmName == null -> allReferences + element is KtElement -> allReferences.filter { + it is KtReference + || (getterJvmName == null && (it.resolve() as? PsiNamedElement)?.name != setterJvmName) + || (setterJvmName == null && (it.resolve() as? PsiNamedElement)?.name != getterJvmName) + } + element is KtLightElement<*, *> -> { + val name = element.name + if (name == getterJvmName || name == setterJvmName) allReferences.filterNot { it is KtReference } else allReferences + } + else -> emptyList() + } + } + private fun chooseCallableToRename(callableDeclaration: KtCallableDeclaration): KtCallableDeclaration? { val deepestSuperDeclaration = findDeepestOverriddenDeclaration(callableDeclaration) if (deepestSuperDeclaration == null || deepestSuperDeclaration == callableDeclaration) { return callableDeclaration @@ -86,6 +103,24 @@ class RenameKotlinPropertyProcessor : RenameKotlinPsiProcessor() { } } + override fun substituteElementToRename(element: PsiElement?, editor: Editor?): PsiElement? { + val namedUnwrappedElement = element?.namedUnwrappedElement ?: return null + + val callableDeclaration = namedUnwrappedElement as? KtCallableDeclaration + ?: throw IllegalStateException("Can't be for element $element there because of canProcessElement()") + + val declarationToRename = chooseCallableToRename(callableDeclaration) ?: return null + + val (getterJvmName, setterJvmName) = getJvmNames(namedUnwrappedElement) + if (element is KtLightMethod) { + val name = element.name + if (element.name != getterJvmName && element.name != setterJvmName) return declarationToRename + return declarationToRename.toLightMethods().firstOrNull { it.name == name } + } + + return declarationToRename + } + override fun prepareRenaming(element: PsiElement?, newName: String?, allRenames: MutableMap, scope: SearchScope) { val namedUnwrappedElement = element?.namedUnwrappedElement val propertyMethods = when(namedUnwrappedElement) { @@ -107,6 +142,10 @@ class RenameKotlinPropertyProcessor : RenameKotlinPsiProcessor() { override tailrec fun renameElement(element: PsiElement, newName: String, usages: Array, listener: RefactoringElementListener?) { if (element is KtLightMethod) { + if (element.modifierList.findAnnotation(DescriptorUtils.JVM_NAME.asString()) != null) { + return super.renameElement(element, newName, usages, listener) + } + val origin = element.kotlinOrigin val newPropertyName = propertyNameByAccessor(newName, element) // Kotlin references to Kotlin property should not use accessor name @@ -159,7 +198,8 @@ class RenameKotlinPropertyProcessor : RenameKotlinPsiProcessor() { } private fun addRenameElements(psiMethod: PsiMethod?, - oldName: String?, newName: String?, + oldName: String?, + newName: String?, allRenames: MutableMap, scope: SearchScope) { if (psiMethod == null) return diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/after/test/JavaClient.java new file mode 100644 index 00000000000..7df35f94648 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/after/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + Foo.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/after/test/test.kt new file mode 100644 index 00000000000..27b5c57fe3c --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/after/test/test.kt @@ -0,0 +1,8 @@ +// test +@file:JvmName("Foo") + +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/before/test/JavaClient.java new file mode 100644 index 00000000000..6d120ae84f0 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/before/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + /*rename*/TestKt.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/before/test/test.kt new file mode 100644 index 00000000000..70e09a7cdf2 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/before/test/test.kt @@ -0,0 +1,6 @@ +// test +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/renameKotlinFacadeClassWithDefaultNameByRef.test b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/renameKotlinFacadeClassWithDefaultNameByRef.test new file mode 100644 index 00000000000..649e24a70b8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/renameKotlinFacadeClassWithDefaultNameByRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "Foo", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/after/test/JavaClient.java new file mode 100644 index 00000000000..7df35f94648 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/after/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + Foo.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/after/test/test.kt new file mode 100644 index 00000000000..a8af773c972 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/after/test/test.kt @@ -0,0 +1,7 @@ +@file:JvmMultifileClass @file:JvmName("Foo") + +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/before/test/JavaClient.java new file mode 100644 index 00000000000..6d120ae84f0 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/before/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + /*rename*/TestKt.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/before/test/test.kt new file mode 100644 index 00000000000..e7884ec49da --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/before/test/test.kt @@ -0,0 +1,6 @@ +@file:JvmMultifileClass +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/renameKotlinFacadeClassWithDefaultNameByRef.test b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/renameKotlinFacadeClassWithDefaultNameByRef.test new file mode 100644 index 00000000000..649e24a70b8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/renameKotlinFacadeClassWithDefaultNameByRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "Foo", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/after/test/JavaClient.java new file mode 100644 index 00000000000..7df35f94648 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/after/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + Foo.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/after/test/test.kt new file mode 100644 index 00000000000..c204fb3cfb0 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/after/test/test.kt @@ -0,0 +1,7 @@ +@file:JvmName("Foo") + +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/before/test/JavaClient.java new file mode 100644 index 00000000000..6d120ae84f0 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/before/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + /*rename*/TestKt.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/before/test/test.kt new file mode 100644 index 00000000000..8db7f19bc92 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/before/test/test.kt @@ -0,0 +1,5 @@ +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test new file mode 100644 index 00000000000..649e24a70b8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "Foo", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/after/test/JavaClient.java new file mode 100644 index 00000000000..6464252b5c0 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/after/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + FooKt.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/after/test/foo.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/after/test/foo.kt new file mode 100644 index 00000000000..8db7f19bc92 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/after/test/foo.kt @@ -0,0 +1,5 @@ +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/before/test/JavaClient.java new file mode 100644 index 00000000000..6d120ae84f0 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/before/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + /*rename*/TestKt.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/before/test/test.kt new file mode 100644 index 00000000000..8db7f19bc92 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/before/test/test.kt @@ -0,0 +1,5 @@ +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test new file mode 100644 index 00000000000..86fd34ccb36 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "FooKt", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/after/test/JavaClient.java new file mode 100644 index 00000000000..da2d0fea7bc --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/after/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + Bar.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/after/test/test.kt new file mode 100644 index 00000000000..5b3f7a683b7 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/after/test/test.kt @@ -0,0 +1,6 @@ +@file:JvmName("Bar") +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/before/test/JavaClient.java new file mode 100644 index 00000000000..0f3b296e269 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/before/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + /*rename*/Foo.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/before/test/test.kt new file mode 100644 index 00000000000..f19bc7b707a --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/before/test/test.kt @@ -0,0 +1,6 @@ +@file:JvmName("Foo") +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/renameKotlinFacadeClassWithJvmNameByRef.test b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/renameKotlinFacadeClassWithJvmNameByRef.test new file mode 100644 index 00000000000..10755c0df0b --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/renameKotlinFacadeClassWithJvmNameByRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "Bar", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/after/test/JavaClient.java new file mode 100644 index 00000000000..b14a0af80f0 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/after/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + TestKt.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/after/test/test.kt new file mode 100644 index 00000000000..8db7f19bc92 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/after/test/test.kt @@ -0,0 +1,5 @@ +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/before/test/JavaClient.java new file mode 100644 index 00000000000..0f3b296e269 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/before/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + /*rename*/Foo.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/before/test/test.kt new file mode 100644 index 00000000000..f19bc7b707a --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/before/test/test.kt @@ -0,0 +1,6 @@ +@file:JvmName("Foo") +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/renameKotlinFacadeClassWithJvmNameByRef.test b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/renameKotlinFacadeClassWithJvmNameByRef.test new file mode 100644 index 00000000000..55ead1db92e --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/renameKotlinFacadeClassWithJvmNameByRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "TestKt", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/after/test/JavaClient.java new file mode 100644 index 00000000000..e77cb35577d --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/after/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + new A().foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/after/test/test.kt new file mode 100644 index 00000000000..fa80716f6a4 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/after/test/test.kt @@ -0,0 +1,10 @@ +package test + +class A { + @JvmName("foo") + fun second() = 1 +} + +fun test() { + A().second() +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/before/test/JavaClient.java new file mode 100644 index 00000000000..e77cb35577d --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/before/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + new A().foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/before/test/test.kt new file mode 100644 index 00000000000..068f3803956 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/before/test/test.kt @@ -0,0 +1,10 @@ +package test + +class A { + @JvmName("foo") + fun /*rename*/first() = 1 +} + +fun test() { + A().first() +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/renameKotlinFunWithJvmName.test b/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/renameKotlinFunWithJvmName.test new file mode 100644 index 00000000000..8996c6967e8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmName/renameKotlinFunWithJvmName.test @@ -0,0 +1,6 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/test.kt", + "newName": "second", + "withRuntime": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/after/test/JavaClient.java new file mode 100644 index 00000000000..b95ba3b8f64 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/after/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + new A().bar(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/after/test/test.kt new file mode 100644 index 00000000000..51673e2d747 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/after/test/test.kt @@ -0,0 +1,10 @@ +package test + +class A { + @JvmName("bar") + fun first() = 1 +} + +fun test() { + A().first() +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/before/test/JavaClient.java new file mode 100644 index 00000000000..169921e114a --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/before/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + new A()./*rename*/foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/before/test/test.kt new file mode 100644 index 00000000000..e8a58eb9d87 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/before/test/test.kt @@ -0,0 +1,10 @@ +package test + +class A { + @JvmName("foo") + fun first() = 1 +} + +fun test() { + A().first() +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/renameKotlinFunWithJvmNameByJavaRef.test b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/renameKotlinFunWithJvmNameByJavaRef.test new file mode 100644 index 00000000000..263d863701a --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/renameKotlinFunWithJvmNameByJavaRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "bar", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/after/test/JavaClient.java new file mode 100644 index 00000000000..1e9e75ef32f --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/after/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + new A().first(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/after/test/test.kt new file mode 100644 index 00000000000..020449854e8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/after/test/test.kt @@ -0,0 +1,9 @@ +package test + +class A { + fun first() = 1 +} + +fun test() { + A().first() +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/before/test/JavaClient.java new file mode 100644 index 00000000000..169921e114a --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/before/test/JavaClient.java @@ -0,0 +1,7 @@ +package test; + +class Test { + { + new A()./*rename*/foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/before/test/test.kt new file mode 100644 index 00000000000..e8a58eb9d87 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/before/test/test.kt @@ -0,0 +1,10 @@ +package test + +class A { + @JvmName("foo") + fun first() = 1 +} + +fun test() { + A().first() +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/renameKotlinFunWithJvmNameToDefaultByJavaRef.test b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/renameKotlinFunWithJvmNameToDefaultByJavaRef.test new file mode 100644 index 00000000000..0e0417d1c69 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/renameKotlinFunWithJvmNameToDefaultByJavaRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "first", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/JavaClient.java new file mode 100644 index 00000000000..046467c4e6a --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + Bar.foo(); + Bar.foo2(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/test.kt new file mode 100644 index 00000000000..c422c1f4785 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/test.kt @@ -0,0 +1,7 @@ +@file:JvmMultifileClass +@file:JvmName("Bar") +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/test2.kt b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/test2.kt new file mode 100644 index 00000000000..1f1a5c03c56 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/after/test/test2.kt @@ -0,0 +1,7 @@ +@file:JvmMultifileClass +@file:JvmName("Bar") +package test + +fun foo2() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/JavaClient.java new file mode 100644 index 00000000000..04cd696bf8b --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + /*rename*/Foo.foo(); + Foo.foo2(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/test.kt new file mode 100644 index 00000000000..d9c4089ee8c --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/test.kt @@ -0,0 +1,7 @@ +@file:JvmMultifileClass +@file:JvmName("Foo") +package test + +fun foo() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/test2.kt b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/test2.kt new file mode 100644 index 00000000000..4872e882f3b --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/before/test/test2.kt @@ -0,0 +1,7 @@ +@file:JvmMultifileClass +@file:JvmName("Foo") +package test + +fun foo2() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/renameKotlinMultifileFacadeClassWithJvmName.test b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/renameKotlinMultifileFacadeClassWithJvmName.test new file mode 100644 index 00000000000..10755c0df0b --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/renameKotlinMultifileFacadeClassWithJvmName.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "Bar", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPackageClass/after/RenameKotlinClass.kt b/idea/testData/refactoring/rename/renameKotlinPackageClass/after/RenameKotlinClass.kt deleted file mode 100644 index a3937ab01fd..00000000000 --- a/idea/testData/refactoring/rename/renameKotlinPackageClass/after/RenameKotlinClass.kt +++ /dev/null @@ -1,3 +0,0 @@ -package testing.rename - -fun test() = 12 \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPackageClass/after/testing/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPackageClass/after/testing/JavaClient.java deleted file mode 100644 index 1430b77470b..00000000000 --- a/idea/testData/refactoring/rename/renameKotlinPackageClass/after/testing/JavaClient.java +++ /dev/null @@ -1,9 +0,0 @@ -package testing; - -import testing.rename.RenameKotlinClassKt; - -class JavaClient { - void foo() { - RenameKotlinClassKt.test(); - } -} diff --git a/idea/testData/refactoring/rename/renameKotlinPackageClass/before/RenameKotlinClass.kt b/idea/testData/refactoring/rename/renameKotlinPackageClass/before/RenameKotlinClass.kt deleted file mode 100644 index a3937ab01fd..00000000000 --- a/idea/testData/refactoring/rename/renameKotlinPackageClass/before/RenameKotlinClass.kt +++ /dev/null @@ -1,3 +0,0 @@ -package testing.rename - -fun test() = 12 \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPackageClass/before/testing/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPackageClass/before/testing/JavaClient.java deleted file mode 100644 index 1430b77470b..00000000000 --- a/idea/testData/refactoring/rename/renameKotlinPackageClass/before/testing/JavaClient.java +++ /dev/null @@ -1,9 +0,0 @@ -package testing; - -import testing.rename.RenameKotlinClassKt; - -class JavaClient { - void foo() { - RenameKotlinClassKt.test(); - } -} diff --git a/idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test b/idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test deleted file mode 100644 index a99ed960d29..00000000000 --- a/idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "JAVA_CLASS", - "hint": "Can\u0027t rename Kotlin package facade class", - "classId": "testing/rename/RenameKotlinClassKt", - "newName": "NewPackageName" -} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/after/test/JavaClient.java new file mode 100644 index 00000000000..6ecee93ae63 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setSecond(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/after/test/test.kt new file mode 100644 index 00000000000..1ff0a8577fd --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") var second: Int = 1) + +fun test() { + A().second + A().second = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/before/test/JavaClient.java new file mode 100644 index 00000000000..49c82c527c6 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/before/test/test.kt new file mode 100644 index 00000000000..9b31d4e5003 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") var /*rename*/first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/renameKotlinParameterWithGetterJvmName.test b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/renameKotlinParameterWithGetterJvmName.test new file mode 100644 index 00000000000..8996c6967e8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/renameKotlinParameterWithGetterJvmName.test @@ -0,0 +1,6 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/test.kt", + "newName": "second", + "withRuntime": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..1d73121f08d --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFooNew(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/after/test/test.kt new file mode 100644 index 00000000000..01ec2617623 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFooNew") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..897a01a68fe --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A()./*rename*/getFoo(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/before/test/test.kt new file mode 100644 index 00000000000..e9528fdc394 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test new file mode 100644 index 00000000000..1aa1fd8e59e --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "getFooNew", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..6ecee93ae63 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setSecond(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/after/test/test.kt new file mode 100644 index 00000000000..1ff0a8577fd --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") var second: Int = 1) + +fun test() { + A().second + A().second = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..bab2758a515 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A()./*rename*/setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/before/test/test.kt new file mode 100644 index 00000000000..e9528fdc394 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/renameKotlinParameterWithGetterJvmNameBySetterRef.test b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/renameKotlinParameterWithGetterJvmNameBySetterRef.test new file mode 100644 index 00000000000..64b3aea2b70 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/renameKotlinParameterWithGetterJvmNameBySetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "second", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..0aa69713da8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/after/test/test.kt new file mode 100644 index 00000000000..6726c7b66c4 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..897a01a68fe --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A()./*rename*/getFoo(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/before/test/test.kt new file mode 100644 index 00000000000..e9528fdc394 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test new file mode 100644 index 00000000000..c4d3df8c2e6 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "getFirst", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/after/test/JavaClient.java new file mode 100644 index 00000000000..5f68756dd13 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/after/test/test.kt new file mode 100644 index 00000000000..4461feebb47 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") @set:JvmName("setBar") var second: Int = 1) + +fun test() { + A().second + A().second = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/before/test/JavaClient.java new file mode 100644 index 00000000000..5f68756dd13 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/before/test/test.kt new file mode 100644 index 00000000000..f20eb7b33c0 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") @set:JvmName("setBar") var /*rename*/first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/renameKotlinParameterWithGetterSetterJvmName.test b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/renameKotlinParameterWithGetterSetterJvmName.test new file mode 100644 index 00000000000..8996c6967e8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/renameKotlinParameterWithGetterSetterJvmName.test @@ -0,0 +1,6 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/test.kt", + "newName": "second", + "withRuntime": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..d9c4347b049 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFooNew(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/after/test/test.kt new file mode 100644 index 00000000000..ec1208f0d7c --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFooNew") @set:JvmName("setBar") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..5b088423226 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A()./*rename*/getFoo(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/before/test/test.kt new file mode 100644 index 00000000000..60e7f7a6aad --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") @set:JvmName("setBar") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test new file mode 100644 index 00000000000..1aa1fd8e59e --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "getFooNew", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..a443eb6e41b --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setBarNew(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/after/test/test.kt new file mode 100644 index 00000000000..c9b509e9d29 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") @set:JvmName("setBarNew") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..d7dcd9d0054 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A()./*rename*/setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/before/test/test.kt new file mode 100644 index 00000000000..60e7f7a6aad --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") @set:JvmName("setBar") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test new file mode 100644 index 00000000000..c0e223a4b78 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "setBarNew", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..9c73950c824 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/after/test/test.kt new file mode 100644 index 00000000000..bd714f7be61 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@set:JvmName("setBar") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..5b088423226 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A()./*rename*/getFoo(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/before/test/test.kt new file mode 100644 index 00000000000..60e7f7a6aad --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") @set:JvmName("setBar") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test new file mode 100644 index 00000000000..c4d3df8c2e6 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "getFirst", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..49c82c527c6 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/after/test/test.kt new file mode 100644 index 00000000000..e9528fdc394 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..d7dcd9d0054 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A()./*rename*/setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/before/test/test.kt new file mode 100644 index 00000000000..60e7f7a6aad --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@get:JvmName("getFoo") @set:JvmName("setBar") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test new file mode 100644 index 00000000000..56defee272c --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "setFirst", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/after/test/JavaClient.java new file mode 100644 index 00000000000..dd24f4ba1c4 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getSecond(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/after/test/test.kt new file mode 100644 index 00000000000..aef4e5781f9 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@set:JvmName("setBar") var second: Int = 1) + +fun test() { + A().second + A().second = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/before/test/JavaClient.java new file mode 100644 index 00000000000..9c73950c824 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/before/test/test.kt new file mode 100644 index 00000000000..9b23ac55bae --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@set:JvmName("setBar") var /*rename*/first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/renameKotlinParameterWithSetterJvmName.test b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/renameKotlinParameterWithSetterJvmName.test new file mode 100644 index 00000000000..8996c6967e8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/renameKotlinParameterWithSetterJvmName.test @@ -0,0 +1,6 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/test.kt", + "newName": "second", + "withRuntime": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..dd24f4ba1c4 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getSecond(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/after/test/test.kt new file mode 100644 index 00000000000..aef4e5781f9 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@set:JvmName("setBar") var second: Int = 1) + +fun test() { + A().second + A().second = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..10f88488ec6 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A()./*rename*/getFirst(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/before/test/test.kt new file mode 100644 index 00000000000..bd714f7be61 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@set:JvmName("setBar") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/renameKotlinParameterWithSetterJvmNameByGetterRef.test b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/renameKotlinParameterWithSetterJvmNameByGetterRef.test new file mode 100644 index 00000000000..64b3aea2b70 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/renameKotlinParameterWithSetterJvmNameByGetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "second", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..969c41c4a4d --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A().setBarNew(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/after/test/test.kt new file mode 100644 index 00000000000..e4448445d02 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@set:JvmName("setBarNew") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..b6eb73e56ce --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A()./*rename*/setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/before/test/test.kt new file mode 100644 index 00000000000..bd714f7be61 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@set:JvmName("setBar") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test new file mode 100644 index 00000000000..c0e223a4b78 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "setBarNew", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..0aa69713da8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/after/test/test.kt new file mode 100644 index 00000000000..6726c7b66c4 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/after/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..b6eb73e56ce --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A()./*rename*/setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/before/test/test.kt new file mode 100644 index 00000000000..bd714f7be61 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/before/test/test.kt @@ -0,0 +1,8 @@ +package test + +class A(@set:JvmName("setBar") var first: Int = 1) + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test new file mode 100644 index 00000000000..56defee272c --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "setFirst", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/after/test/JavaClient.java new file mode 100644 index 00000000000..6ecee93ae63 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setSecond(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/after/test/test.kt new file mode 100644 index 00000000000..86c22ac4b9d --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/after/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @get:JvmName("getFoo") + var second = 1 +} + +fun test() { + A().second + A().second = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/before/test/JavaClient.java new file mode 100644 index 00000000000..49c82c527c6 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/before/test/test.kt new file mode 100644 index 00000000000..d1f6b76b957 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/before/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @get:JvmName("getFoo") + var /*rename*/first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/renameKotlinPropertyWithGetterJvmName.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/renameKotlinPropertyWithGetterJvmName.test new file mode 100644 index 00000000000..8996c6967e8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/renameKotlinPropertyWithGetterJvmName.test @@ -0,0 +1,6 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/test.kt", + "newName": "second", + "withRuntime": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..1d73121f08d --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFooNew(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/after/test/test.kt new file mode 100644 index 00000000000..9af027042d3 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/after/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @get:JvmName("getFooNew") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..897a01a68fe --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A()./*rename*/getFoo(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/before/test/test.kt new file mode 100644 index 00000000000..fc6fa40058f --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/before/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @get:JvmName("getFoo") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test new file mode 100644 index 00000000000..1aa1fd8e59e --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "getFooNew", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..6ecee93ae63 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setSecond(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/after/test/test.kt new file mode 100644 index 00000000000..86c22ac4b9d --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/after/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @get:JvmName("getFoo") + var second = 1 +} + +fun test() { + A().second + A().second = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..bab2758a515 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A()./*rename*/setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/before/test/test.kt new file mode 100644 index 00000000000..fc6fa40058f --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/before/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @get:JvmName("getFoo") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/renameKotlinPropertyWithGetterJvmNameBySetterRef.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/renameKotlinPropertyWithGetterJvmNameBySetterRef.test new file mode 100644 index 00000000000..64b3aea2b70 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/renameKotlinPropertyWithGetterJvmNameBySetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "second", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..0aa69713da8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/after/test/test.kt new file mode 100644 index 00000000000..b1ebe535949 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/after/test/test.kt @@ -0,0 +1,10 @@ +package test + +class A { + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..897a01a68fe --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A()./*rename*/getFoo(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/before/test/test.kt new file mode 100644 index 00000000000..fc6fa40058f --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/before/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @get:JvmName("getFoo") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test new file mode 100644 index 00000000000..c4d3df8c2e6 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "getFirst", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/after/test/JavaClient.java new file mode 100644 index 00000000000..5f68756dd13 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/after/test/test.kt new file mode 100644 index 00000000000..960ca37c0fd --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/after/test/test.kt @@ -0,0 +1,12 @@ +package test + +class A { + @get:JvmName("getFoo") + @set:JvmName("setBar") + var second = 1 +} + +fun test() { + A().second + A().second = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/before/test/JavaClient.java new file mode 100644 index 00000000000..5f68756dd13 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/before/test/test.kt new file mode 100644 index 00000000000..a364945a3cb --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/before/test/test.kt @@ -0,0 +1,12 @@ +package test + +class A { + @get:JvmName("getFoo") + @set:JvmName("setBar") + var /*rename*/first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/renameKotlinPropertyWithGetterSetterJvmName.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/renameKotlinPropertyWithGetterSetterJvmName.test new file mode 100644 index 00000000000..8996c6967e8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/renameKotlinPropertyWithGetterSetterJvmName.test @@ -0,0 +1,6 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/test.kt", + "newName": "second", + "withRuntime": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..d9c4347b049 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFooNew(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/after/test/test.kt new file mode 100644 index 00000000000..b82825b56aa --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/after/test/test.kt @@ -0,0 +1,12 @@ +package test + +class A { + @get:JvmName("getFooNew") + @set:JvmName("setBar") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..5b088423226 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A()./*rename*/getFoo(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/before/test/test.kt new file mode 100644 index 00000000000..9ff24fde0f3 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/before/test/test.kt @@ -0,0 +1,12 @@ +package test + +class A { + @get:JvmName("getFoo") + @set:JvmName("setBar") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test new file mode 100644 index 00000000000..1aa1fd8e59e --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "getFooNew", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..a443eb6e41b --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setBarNew(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/after/test/test.kt new file mode 100644 index 00000000000..a7d162638ab --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/after/test/test.kt @@ -0,0 +1,12 @@ +package test + +class A { + @get:JvmName("getFoo") + @set:JvmName("setBarNew") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..d7dcd9d0054 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A()./*rename*/setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/before/test/test.kt new file mode 100644 index 00000000000..9ff24fde0f3 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/before/test/test.kt @@ -0,0 +1,12 @@ +package test + +class A { + @get:JvmName("getFoo") + @set:JvmName("setBar") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test new file mode 100644 index 00000000000..c0e223a4b78 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "setBarNew", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..9c73950c824 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/after/test/test.kt new file mode 100644 index 00000000000..6d8d53069bb --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/after/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @set:JvmName("setBar") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..5b088423226 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A()./*rename*/getFoo(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/before/test/test.kt new file mode 100644 index 00000000000..9ff24fde0f3 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/before/test/test.kt @@ -0,0 +1,12 @@ +package test + +class A { + @get:JvmName("getFoo") + @set:JvmName("setBar") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test new file mode 100644 index 00000000000..c4d3df8c2e6 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "getFirst", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..49c82c527c6 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/after/test/test.kt new file mode 100644 index 00000000000..fc6fa40058f --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/after/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @get:JvmName("getFoo") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..d7dcd9d0054 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFoo(); + new A()./*rename*/setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/before/test/test.kt new file mode 100644 index 00000000000..9ff24fde0f3 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/before/test/test.kt @@ -0,0 +1,12 @@ +package test + +class A { + @get:JvmName("getFoo") + @set:JvmName("setBar") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test new file mode 100644 index 00000000000..56defee272c --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "setFirst", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/after/test/JavaClient.java new file mode 100644 index 00000000000..dd24f4ba1c4 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getSecond(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/after/test/test.kt new file mode 100644 index 00000000000..8ccdd94146b --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/after/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @set:JvmName("setBar") + var second = 1 +} + +fun test() { + A().second + A().second = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/before/test/JavaClient.java new file mode 100644 index 00000000000..9c73950c824 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/before/test/test.kt new file mode 100644 index 00000000000..f15cd63f8d2 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/before/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @set:JvmName("setBar") + var /*rename*/first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/renameKotlinPropertyWithSetterJvmName.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/renameKotlinPropertyWithSetterJvmName.test new file mode 100644 index 00000000000..8996c6967e8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/renameKotlinPropertyWithSetterJvmName.test @@ -0,0 +1,6 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/test.kt", + "newName": "second", + "withRuntime": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..dd24f4ba1c4 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getSecond(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/after/test/test.kt new file mode 100644 index 00000000000..8ccdd94146b --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/after/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @set:JvmName("setBar") + var second = 1 +} + +fun test() { + A().second + A().second = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..10f88488ec6 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A()./*rename*/getFirst(); + new A().setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/before/test/test.kt new file mode 100644 index 00000000000..6d8d53069bb --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/before/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @set:JvmName("setBar") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/renameKotlinPropertyWithSetterJvmNameByGetterRef.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/renameKotlinPropertyWithSetterJvmNameByGetterRef.test new file mode 100644 index 00000000000..64b3aea2b70 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/renameKotlinPropertyWithSetterJvmNameByGetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "second", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..969c41c4a4d --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A().setBarNew(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/after/test/test.kt new file mode 100644 index 00000000000..edf8fdadbcb --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/after/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @set:JvmName("setBarNew") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..b6eb73e56ce --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A()./*rename*/setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/before/test/test.kt new file mode 100644 index 00000000000..6d8d53069bb --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/before/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @set:JvmName("setBar") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test new file mode 100644 index 00000000000..c0e223a4b78 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "setBarNew", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java new file mode 100644 index 00000000000..0aa69713da8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/after/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A().setFirst(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/after/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/after/test/test.kt new file mode 100644 index 00000000000..b1ebe535949 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/after/test/test.kt @@ -0,0 +1,10 @@ +package test + +class A { + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java new file mode 100644 index 00000000000..b6eb73e56ce --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/before/test/JavaClient.java @@ -0,0 +1,8 @@ +package test; + +class Test { + { + new A().getFirst(); + new A()./*rename*/setBar(1); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/before/test/test.kt b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/before/test/test.kt new file mode 100644 index 00000000000..6d8d53069bb --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/before/test/test.kt @@ -0,0 +1,11 @@ +package test + +class A { + @set:JvmName("setBar") + var first = 1 +} + +fun test() { + A().first + A().first = 1 +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test new file mode 100644 index 00000000000..56defee272c --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test @@ -0,0 +1,7 @@ +{ + "type": "MARKED_ELEMENT", + "mainFile": "test/JavaClient.java", + "newName": "setFirst", + "withRuntime": "true", + "byRef": "true" +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java index c3a5ad6d8b6..8eb41ec55e6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java @@ -335,6 +335,42 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest(fileName); } + @TestMetadata("renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/renameKotlinFacadeClassWithDefaultNameByRef.test") + public void testRenameKotlinFacadeClassWithDefaultNameAndCommentsByRef_RenameKotlinFacadeClassWithDefaultNameByRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndCommentsByRef/renameKotlinFacadeClassWithDefaultNameByRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/renameKotlinFacadeClassWithDefaultNameByRef.test") + public void testRenameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef_RenameKotlinFacadeClassWithDefaultNameByRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameAndJvmMultifileClassByRef/renameKotlinFacadeClassWithDefaultNameByRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinFacadeClassWithDefaultNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test") + public void testRenameKotlinFacadeClassWithDefaultNameByRef_RenameKotlinFacadeClassWithDefaultNameByRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test") + public void testRenameKotlinFacadeClassWithDefaultNameViaFileNameByRef_RenameKotlinFacadeClassWithDefaultNameByRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFacadeClassWithDefaultNameViaFileNameByRef/renameKotlinFacadeClassWithDefaultNameByRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinFacadeClassWithJvmNameByRef/renameKotlinFacadeClassWithJvmNameByRef.test") + public void testRenameKotlinFacadeClassWithJvmNameByRef_RenameKotlinFacadeClassWithJvmNameByRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameByRef/renameKotlinFacadeClassWithJvmNameByRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinFacadeClassWithJvmNameToDefaultByRef/renameKotlinFacadeClassWithJvmNameByRef.test") + public void testRenameKotlinFacadeClassWithJvmNameToDefaultByRef_RenameKotlinFacadeClassWithJvmNameByRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFacadeClassWithJvmNameToDefaultByRef/renameKotlinFacadeClassWithJvmNameByRef.test"); + doTest(fileName); + } + @TestMetadata("renameKotlinFile/renameFile.test") public void testRenameKotlinFile_RenameFile() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFile/renameFile.test"); @@ -353,6 +389,24 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest(fileName); } + @TestMetadata("renameKotlinFunWithJvmName/renameKotlinFunWithJvmName.test") + public void testRenameKotlinFunWithJvmName_RenameKotlinFunWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFunWithJvmName/renameKotlinFunWithJvmName.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinFunWithJvmNameByJavaRef/renameKotlinFunWithJvmNameByJavaRef.test") + public void testRenameKotlinFunWithJvmNameByJavaRef_RenameKotlinFunWithJvmNameByJavaRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFunWithJvmNameByJavaRef/renameKotlinFunWithJvmNameByJavaRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinFunWithJvmNameToDefaultByJavaRef/renameKotlinFunWithJvmNameToDefaultByJavaRef.test") + public void testRenameKotlinFunWithJvmNameToDefaultByJavaRef_RenameKotlinFunWithJvmNameToDefaultByJavaRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFunWithJvmNameToDefaultByJavaRef/renameKotlinFunWithJvmNameToDefaultByJavaRef.test"); + doTest(fileName); + } + @TestMetadata("renameKotlinMethod/javaWrapperForKotlinMethod.test") public void testRenameKotlinMethod_JavaWrapperForKotlinMethod() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMethod/javaWrapperForKotlinMethod.test"); @@ -371,6 +425,12 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest(fileName); } + @TestMetadata("renameKotlinMultifileFacadeClassWithJvmNameByRef/renameKotlinMultifileFacadeClassWithJvmName.test") + public void testRenameKotlinMultifileFacadeClassWithJvmNameByRef_RenameKotlinMultifileFacadeClassWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMultifileFacadeClassWithJvmNameByRef/renameKotlinMultifileFacadeClassWithJvmName.test"); + doTest(fileName); + } + @TestMetadata("renameKotlinPackage/renameInOtherFile.test") public void testRenameKotlinPackage_RenameInOtherFile() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackage/renameInOtherFile.test"); @@ -383,12 +443,6 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest(fileName); } - @TestMetadata("renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test") - public void testRenameKotlinPackageClass_JavaWrapperForKotlinPackageClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test"); - doTest(fileName); - } - @TestMetadata("renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test") public void testRenameKotlinPackageFunctionFromJava_RenameKotlinPackageFunctionFromJava() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test"); @@ -401,6 +455,84 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest(fileName); } + @TestMetadata("renameKotlinParameterWithGetterJvmName/renameKotlinParameterWithGetterJvmName.test") + public void testRenameKotlinParameterWithGetterJvmName_RenameKotlinParameterWithGetterJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmName/renameKotlinParameterWithGetterJvmName.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithGetterJvmNameByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test") + public void testRenameKotlinParameterWithGetterJvmNameByGetterRef_RenameKotlinParameterWithGetterJvmNameByGetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithGetterJvmNameBySetterRef/renameKotlinParameterWithGetterJvmNameBySetterRef.test") + public void testRenameKotlinParameterWithGetterJvmNameBySetterRef_RenameKotlinParameterWithGetterJvmNameBySetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameBySetterRef/renameKotlinParameterWithGetterJvmNameBySetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test") + public void testRenameKotlinParameterWithGetterJvmNameToDefaultByGetterRef_RenameKotlinParameterWithGetterJvmNameByGetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithGetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterJvmNameByGetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithGetterSetterJvmName/renameKotlinParameterWithGetterSetterJvmName.test") + public void testRenameKotlinParameterWithGetterSetterJvmName_RenameKotlinParameterWithGetterSetterJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmName/renameKotlinParameterWithGetterSetterJvmName.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithGetterSetterJvmNameByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test") + public void testRenameKotlinParameterWithGetterSetterJvmNameByGetterRef_RenameKotlinParameterWithGetterSetterJvmNameByGetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithGetterSetterJvmNameBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test") + public void testRenameKotlinParameterWithGetterSetterJvmNameBySetterRef_RenameKotlinParameterWithGetterSetterJvmNameBySetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test") + public void testRenameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef_RenameKotlinParameterWithGetterSetterJvmNameByGetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinParameterWithGetterSetterJvmNameByGetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test") + public void testRenameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef_RenameKotlinParameterWithGetterSetterJvmNameBySetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithGetterSetterJvmNameBySetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithSetterJvmName/renameKotlinParameterWithSetterJvmName.test") + public void testRenameKotlinParameterWithSetterJvmName_RenameKotlinParameterWithSetterJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmName/renameKotlinParameterWithSetterJvmName.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithSetterJvmNameByGetterRef/renameKotlinParameterWithSetterJvmNameByGetterRef.test") + public void testRenameKotlinParameterWithSetterJvmNameByGetterRef_RenameKotlinParameterWithSetterJvmNameByGetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameByGetterRef/renameKotlinParameterWithSetterJvmNameByGetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithSetterJvmNameBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test") + public void testRenameKotlinParameterWithSetterJvmNameBySetterRef_RenameKotlinParameterWithSetterJvmNameBySetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test") + public void testRenameKotlinParameterWithSetterJvmNameToDefaultBySetterRef_RenameKotlinParameterWithSetterJvmNameBySetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinParameterWithSetterJvmNameToDefaultBySetterRef/renameKotlinParameterWithSetterJvmNameBySetterRef.test"); + doTest(fileName); + } + @TestMetadata("renameKotlinPrimaryConstructorProperty/renameKotlinPrimaryConstructorProperty.test") public void testRenameKotlinPrimaryConstructorProperty_RenameKotlinPrimaryConstructorProperty() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPrimaryConstructorProperty/renameKotlinPrimaryConstructorProperty.test"); @@ -413,12 +545,90 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest(fileName); } + @TestMetadata("renameKotlinPropertyWithGetterJvmName/renameKotlinPropertyWithGetterJvmName.test") + public void testRenameKotlinPropertyWithGetterJvmName_RenameKotlinPropertyWithGetterJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmName/renameKotlinPropertyWithGetterJvmName.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithGetterJvmNameByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test") + public void testRenameKotlinPropertyWithGetterJvmNameByGetterRef_RenameKotlinPropertyWithGetterJvmNameByGetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithGetterJvmNameBySetterRef/renameKotlinPropertyWithGetterJvmNameBySetterRef.test") + public void testRenameKotlinPropertyWithGetterJvmNameBySetterRef_RenameKotlinPropertyWithGetterJvmNameBySetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameBySetterRef/renameKotlinPropertyWithGetterJvmNameBySetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test") + public void testRenameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef_RenameKotlinPropertyWithGetterJvmNameByGetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithGetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterJvmNameByGetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithGetterSetterJvmName/renameKotlinPropertyWithGetterSetterJvmName.test") + public void testRenameKotlinPropertyWithGetterSetterJvmName_RenameKotlinPropertyWithGetterSetterJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmName/renameKotlinPropertyWithGetterSetterJvmName.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test") + public void testRenameKotlinPropertyWithGetterSetterJvmNameByGetterRef_RenameKotlinPropertyWithGetterSetterJvmNameByGetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test") + public void testRenameKotlinPropertyWithGetterSetterJvmNameBySetterRef_RenameKotlinPropertyWithGetterSetterJvmNameBySetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test") + public void testRenameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef_RenameKotlinPropertyWithGetterSetterJvmNameByGetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultByGetterRef/renameKotlinPropertyWithGetterSetterJvmNameByGetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test") + public void testRenameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef_RenameKotlinPropertyWithGetterSetterJvmNameBySetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithGetterSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithGetterSetterJvmNameBySetterRef.test"); + doTest(fileName); + } + @TestMetadata("renameKotlinPropertyWithJvmField/renameKotlinPropertyWithJvmField.test") public void testRenameKotlinPropertyWithJvmField_RenameKotlinPropertyWithJvmField() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithJvmField/renameKotlinPropertyWithJvmField.test"); doTest(fileName); } + @TestMetadata("renameKotlinPropertyWithSetterJvmName/renameKotlinPropertyWithSetterJvmName.test") + public void testRenameKotlinPropertyWithSetterJvmName_RenameKotlinPropertyWithSetterJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmName/renameKotlinPropertyWithSetterJvmName.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithSetterJvmNameByGetterRef/renameKotlinPropertyWithSetterJvmNameByGetterRef.test") + public void testRenameKotlinPropertyWithSetterJvmNameByGetterRef_RenameKotlinPropertyWithSetterJvmNameByGetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameByGetterRef/renameKotlinPropertyWithSetterJvmNameByGetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithSetterJvmNameBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test") + public void testRenameKotlinPropertyWithSetterJvmNameBySetterRef_RenameKotlinPropertyWithSetterJvmNameBySetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test") + public void testRenameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef_RenameKotlinPropertyWithSetterJvmNameBySetterRef() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPropertyWithSetterJvmNameToDefaultBySetterRef/renameKotlinPropertyWithSetterJvmNameBySetterRef.test"); + doTest(fileName); + } + @TestMetadata("renameKotlinStaticMethod/renameKotlinStaticMethod.test") public void testRenameKotlinStaticMethod_RenameKotlinStaticMethod() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinStaticMethod/renameKotlinStaticMethod.test");