Rename: fix renaming of label by label reference in loop

#KT-29796 Fixed

idea/resources/META-INF/plugin-kotlin-extensions.xml

@@ -11,7 +11,7 @@
     <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.RenameByLabeledReferenceHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameImportAliasByReferenceHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.KotlinMemberInplaceRenameHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.KotlinVariableInplaceRenameHandler"/>

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameByLabeledReferenceHandler.kt

@@ -17,34 +17,28 @@
 package org.jetbrains.kotlin.idea.refactoring.rename
 
 import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.refactoring.project
 import org.jetbrains.kotlin.idea.references.getCalleeByLambdaArgument
+import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.KtLabelReferenceExpression
 import org.jetbrains.kotlin.psi.psiUtil.getLabeledParent
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
-class RenameByLabeledReferenceInLambdaArgumentHandler :
+class RenameByLabeledReferenceHandler : AbstractReferenceSubstitutionRenameHandler(KotlinVariableInplaceRenameHandler()) {
-        AbstractReferenceSubstitutionRenameHandler(KotlinVariableInplaceRenameHandler()) {
     override fun getElementToRename(dataContext: DataContext): PsiElement? {
         val refExpr = getReferenceExpression(dataContext) as? KtLabelReferenceExpression ?: return null
         val context = refExpr.analyze(BodyResolveMode.PARTIAL)
-        val lambda = context[BindingContext.LABEL_TARGET, refExpr] as? KtFunction ?: return null
+        val labelTarget = context[BindingContext.LABEL_TARGET, refExpr] as? KtExpression ?: return null
-        val labeledParent = lambda.getLabeledParent(refExpr.getReferencedName())
+        val labeledParent = labelTarget.getLabeledParent(refExpr.getReferencedName())
-        return if (labeledParent != null) {
+        if (labelTarget !is KtFunction || labeledParent != null) return labeledParent
-            labeledParent
+        val calleeExpression = labelTarget.getCalleeByLambdaArgument() ?: return null
-        }
+        val descriptor = context[BindingContext.REFERENCE_TARGET, calleeExpression] as? FunctionDescriptor ?: return null
-        else {
+        return DescriptorToSourceUtilsIde.getAnyDeclaration(dataContext.project, descriptor)
-            val calleeExpression = lambda.getCalleeByLambdaArgument() ?: return null
-            val descriptor = context[BindingContext.REFERENCE_TARGET, calleeExpression] as? FunctionDescriptor ?: return null
-            DescriptorToSourceUtilsIde.getAnyDeclaration(dataContext.project, descriptor)
-        }
     }
-
 }

idea/testData/refactoring/rename/labeledLoopByLabelRefInBreak2/after/test.kt

@@ -0,0 +1,6 @@
+fun test() {
+    bar@ for (n in 1..10) {
+        if (n == 5) continue@bar
+        if (n > 8) break@bar
+    }
+}

idea/testData/refactoring/rename/labeledLoopByLabelRefInBreak2/before/test.kt

@@ -0,0 +1,6 @@
+fun test() {
+    foo@ for (n in 1..10) {
+        if (n == 5) continue@foo
+        if (n > 8) break@/*rename*/foo
+    }
+}

idea/testData/refactoring/rename/labeledLoopByLabelRefInBreak2/labeledLoopByLabelRefInBreak.test

@@ -0,0 +1,5 @@
+{
+  "type": "AUTO_DETECT",
+  "mainFile": "test.kt",
+  "newName": "bar"
+}

idea/testData/refactoring/rename/labeledLoopByLabelRefInContinue2/after/test.kt

@@ -0,0 +1,6 @@
+fun test() {
+    bar@ for (n in 1..10) {
+        if (n == 5) continue@bar
+        if (n > 8) break@bar
+    }
+}

idea/testData/refactoring/rename/labeledLoopByLabelRefInContinue2/before/test.kt

@@ -0,0 +1,6 @@
+fun test() {
+    foo@ for (n in 1..10) {
+        if (n == 5) continue@/*rename*/foo
+        if (n > 8) break@foo
+    }
+}

idea/testData/refactoring/rename/labeledLoopByLabelRefInContinue2/labeledLoopByLabelRefInContinue.test

@@ -0,0 +1,5 @@
+{
+  "type": "AUTO_DETECT",
+  "mainFile": "test.kt",
+  "newName": "bar"
+}

idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java

@@ -289,11 +289,21 @@ public class RenameTestGenerated extends AbstractRenameTest {
         runTest("idea/testData/refactoring/rename/labeledLoopByLabel/labeledLoopByLabel.test");
     }
 
+    @TestMetadata("labeledLoopByLabelRefInBreak2/labeledLoopByLabelRefInBreak.test")
+    public void testLabeledLoopByLabelRefInBreak2_LabeledLoopByLabelRefInBreak() throws Exception {
+        runTest("idea/testData/refactoring/rename/labeledLoopByLabelRefInBreak2/labeledLoopByLabelRefInBreak.test");
+    }
+
     @TestMetadata("labeledLoopByLabelRefInBreak/labeledLoopByLabelRefInBreak.test")
     public void testLabeledLoopByLabelRefInBreak_LabeledLoopByLabelRefInBreak() throws Exception {
         runTest("idea/testData/refactoring/rename/labeledLoopByLabelRefInBreak/labeledLoopByLabelRefInBreak.test");
     }
 
+    @TestMetadata("labeledLoopByLabelRefInContinue2/labeledLoopByLabelRefInContinue.test")
+    public void testLabeledLoopByLabelRefInContinue2_LabeledLoopByLabelRefInContinue() throws Exception {
+        runTest("idea/testData/refactoring/rename/labeledLoopByLabelRefInContinue2/labeledLoopByLabelRefInContinue.test");
+    }
+
     @TestMetadata("labeledLoopByLabelRefInContinue/labeledLoopByLabelRefInContinue.test")
     public void testLabeledLoopByLabelRefInContinue_LabeledLoopByLabelRefInContinue() throws Exception {
         runTest("idea/testData/refactoring/rename/labeledLoopByLabelRefInContinue/labeledLoopByLabelRefInContinue.test");