From 8da05ed597683285777831121de01c9335820e51 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Wed, 12 Feb 2020 11:46:43 +0700
Subject: [PATCH] RemoveReturnLabelFix: introduce `labelName` parameter

---
 .../idea/inspections/RedundantReturnLabelInspection.kt    | 2 +-
 .../kotlin/idea/quickfix/RemoveReturnLabelFix.kt          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantReturnLabelInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantReturnLabelInspection.kt
index 622f564c7c8..806e01b1b49 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantReturnLabelInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantReturnLabelInspection.kt
@@ -26,7 +26,7 @@ class RedundantReturnLabelInspection : AbstractKotlinInspection() {
                 label,
                 "Redundant '@$labelName'",
                 ProblemHighlightType.LIKE_UNUSED_SYMBOL,
-                IntentionWrapper(RemoveReturnLabelFix(returnExpression), returnExpression.containingKtFile),
+                IntentionWrapper(RemoveReturnLabelFix(returnExpression, labelName), returnExpression.containingKtFile),
             )
         },
     )
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveReturnLabelFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveReturnLabelFix.kt
index ad95fa1519c..ce6bdb840b4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveReturnLabelFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveReturnLabelFix.kt
@@ -11,20 +11,20 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtReturnExpression
 
-class RemoveReturnLabelFix(element: KtReturnExpression) : KotlinQuickFixAction<KtReturnExpression>(element) {
+class RemoveReturnLabelFix(element: KtReturnExpression, private val labelName: String) : KotlinQuickFixAction<KtReturnExpression>(element) {
     override fun invoke(project: Project, editor: Editor?, file: KtFile) {
         element?.labeledExpression?.delete()
     }
 
     override fun getFamilyName(): String = "Remove redundant label"
 
-    override fun getText(): String = "Remove redundant ${element?.getLabelName()?.let { "'@$it'" } ?: "label"}"
+    override fun getText(): String = "Remove redundant '@$labelName'"
 
     companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtReturnExpression>? {
             val returnExpression = diagnostic.psiElement as? KtReturnExpression ?: return null
-            return if (returnExpression.labeledExpression == null) null
-            else RemoveReturnLabelFix(returnExpression)
+            val labelName = returnExpression.getLabelName() ?: return null
+            return RemoveReturnLabelFix(returnExpression, labelName)
         }
     }
 }
\ No newline at end of file