azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename: Increase precedence of RenameSyntheticDeclarationByReferenceHandler

Browse Source 
Otherwise it's not applicable references to Java declarations

 #KT-20241 Fixed
This commit is contained in:
Alexey Sedunov
2018-03-13 19:11:04 +03:00
parent a514c0f515
commit 43b4a496e3
7 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -2813,13 +2813,13 @@
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameDynamicMemberHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameOnSecondaryConstructorHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameJavaSyntheticPropertyHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameSyntheticDeclarationByReferenceHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.JavaMemberByKotlinReferenceInplaceRenameHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameJvmNameHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameBackingFieldReferenceHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameClassByCompanionObjectShortReferenceHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameByLabeledReferenceInLambdaArgumentHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameImportAliasByReferenceHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameSyntheticDeclarationByReferenceHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.KotlinMemberInplaceRenameHandler"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.KotlinVariableInplaceRenameHandler"/>
idea/testData/refactoring/rename/javaEnumValueOf/after/JavaEnum.java
Vendored
+3
View File
@@ -0,0 +1,3 @@
public enum JavaEnum {
V1, V2
}
idea/testData/refactoring/rename/javaEnumValueOf/after/test.kt
Vendored
+1
View File
@@ -0,0 +1 @@
val jenum = JavaEnum./*rename*/valueOf("V1")
idea/testData/refactoring/rename/javaEnumValueOf/before/JavaEnum.java
Vendored
+3
View File
@@ -0,0 +1,3 @@
public enum JavaEnum {
V1, V2
}
idea/testData/refactoring/rename/javaEnumValueOf/before/test.kt
Vendored
+1
View File
@@ -0,0 +1 @@
val jenum = JavaEnum./*rename*/valueOf("V1")
idea/testData/refactoring/rename/javaEnumValueOf/javaEnumValueOf.test
Vendored
+7
View File
@@ -0,0 +1,7 @@
{
"type": "AUTO_DETECT",
"mainFile": "test.kt",
"newName": "valueOfNew",
"withRuntime": "true",
"hint": "Rename is not applicable to synthetic declaration"
}
idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java
Generated
+6
View File
@@ -253,6 +253,12 @@ public class RenameTestGenerated extends AbstractRenameTest {
doTest(fileName);
}
@TestMetadata("javaEnumValueOf/javaEnumValueOf.test")
public void testJavaEnumValueOf_JavaEnumValueOf() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/javaEnumValueOf/javaEnumValueOf.test");
doTest(fileName);
}
@TestMetadata("labeledAnonymousFunByLabel/labeledLambdaByLabel.test")
public void testLabeledAnonymousFunByLabel_LabeledLambdaByLabel() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/labeledAnonymousFunByLabel/labeledLambdaByLabel.test");