diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeToLabeledReturnFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeToLabeledReturnFixFactory.kt index a626383f289d..db988a3c60de 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeToLabeledReturnFixFactory.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeToLabeledReturnFixFactory.kt @@ -1,16 +1,12 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.k2.codeinsight.fixes -import com.intellij.modcommand.ActionContext -import com.intellij.modcommand.ModPsiUpdater import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KtFirDiagnostic import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol -import org.jetbrains.kotlin.idea.base.resources.KotlinBundle -import org.jetbrains.kotlin.idea.codeinsight.api.applicable.intentions.KotlinPsiUpdateModCommandAction import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinQuickFixFactory -import org.jetbrains.kotlin.idea.codeinsight.utils.ChangeToLabeledReturnUtils +import org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* @@ -77,25 +73,4 @@ internal object ChangeToLabeledReturnFixFactory { if (!returnType.isSubTypeOf(lambdaReturnType)) return null return returnExpression } - - private class ChangeToLabeledReturnFix( - element: KtReturnExpression, - private val labeledReturn: String, - ) : KotlinPsiUpdateModCommandAction.ElementBased(element, Unit) { - - override fun invoke( - actionContext: ActionContext, - element: KtReturnExpression, - elementContext: Unit, - updater: ModPsiUpdater, - ) = ChangeToLabeledReturnUtils.applyTo(actionContext.project, element, labeledReturn) - - override fun getFamilyName(): String = KotlinBundle.message("fix.change.to.labeled.return.family") - - override fun getActionName( - actionContext: ActionContext, - element: KtReturnExpression, - elementContext: Unit, - ): String = KotlinBundle.message("fix.change.to.labeled.return.text", labeledReturn) - } } diff --git a/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/ChangeToLabeledReturnUtils.kt b/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/ChangeToLabeledReturnUtils.kt deleted file mode 100644 index 59aebc0d6fc0..000000000000 --- a/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/ChangeToLabeledReturnUtils.kt +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.idea.codeinsight.utils - -import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.psi.KtPsiFactory -import org.jetbrains.kotlin.psi.KtReturnExpression -import org.jetbrains.kotlin.psi.createExpressionByPattern - -object ChangeToLabeledReturnUtils { - - fun applyTo( - project: Project, - returnExpression: KtReturnExpression, - labeledReturn: String, - ) { - val factory = KtPsiFactory(project) - val returnedExpression = returnExpression.returnedExpression - val newExpression = if (returnedExpression == null) - factory.createExpression(labeledReturn) - else - factory.createExpressionByPattern("$0 $1", labeledReturn, returnedExpression) - returnExpression.replace(newExpression) - } -} \ No newline at end of file diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ChangeToLabeledReturnFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ChangeToLabeledReturnFix.kt new file mode 100644 index 000000000000..542c7696147f --- /dev/null +++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ChangeToLabeledReturnFix.kt @@ -0,0 +1,39 @@ +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package org.jetbrains.kotlin.idea.quickfix + +import com.intellij.modcommand.ActionContext +import com.intellij.modcommand.ModPsiUpdater +import org.jetbrains.kotlin.idea.base.resources.KotlinBundle +import org.jetbrains.kotlin.idea.codeinsight.api.applicable.intentions.KotlinPsiUpdateModCommandAction +import org.jetbrains.kotlin.psi.KtPsiFactory +import org.jetbrains.kotlin.psi.KtReturnExpression +import org.jetbrains.kotlin.psi.createExpressionByPattern + +class ChangeToLabeledReturnFix( + element: KtReturnExpression, + private val labeledReturn: String, +) : KotlinPsiUpdateModCommandAction.ElementBased(element, Unit) { + + override fun invoke( + actionContext: ActionContext, + element: KtReturnExpression, + elementContext: Unit, + updater: ModPsiUpdater, + ) { + val factory = KtPsiFactory(actionContext.project) + val returnedExpression = element.returnedExpression + val newExpression = if (returnedExpression == null) + factory.createExpression(labeledReturn) + else + factory.createExpressionByPattern("$0 $1", labeledReturn, returnedExpression) + element.replace(newExpression) + } + + override fun getFamilyName(): String = KotlinBundle.message("fix.change.to.labeled.return.family") + + override fun getActionName( + actionContext: ActionContext, + element: KtReturnExpression, + elementContext: Unit, + ): String = KotlinBundle.message("fix.change.to.labeled.return.text", labeledReturn) +} diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnlabeledReturnInsideLambdaInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnlabeledReturnInsideLambdaInspection.kt index 5bb7301d5009..22d743292b3e 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnlabeledReturnInsideLambdaInspection.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnlabeledReturnInsideLambdaInspection.kt @@ -9,6 +9,7 @@ import com.intellij.psi.PsiElementVisitor import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.idea.base.resources.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze +import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractKotlinInspection import org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix import org.jetbrains.kotlin.psi.KtLambdaExpression import org.jetbrains.kotlin.psi.KtNamedFunction @@ -17,8 +18,6 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.psi.returnExpressionVisitor -import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractKotlinInspection - class UnlabeledReturnInsideLambdaInspection : AbstractKotlinInspection() { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor = returnExpressionVisitor(fun(returnExpression: KtReturnExpression) { @@ -26,11 +25,12 @@ class UnlabeledReturnInsideLambdaInspection : AbstractKotlinInspection() { val lambda = returnExpression.getParentOfType(true, KtNamedFunction::class.java) ?: return val parentFunction = lambda.getStrictParentOfType() ?: return if (returnExpression.analyze().diagnostics.forElement(returnExpression).any { it.severity == Severity.ERROR }) return + val action = ChangeToLabeledReturnFix(returnExpression, labeledReturn = "return@${parentFunction.name}") holder.registerProblem( returnExpression.returnKeyword, KotlinBundle.message("unlabeled.return.inside.lambda"), ProblemHighlightType.GENERIC_ERROR_OR_WARNING, - IntentionWrapper(ChangeToLabeledReturnFix(returnExpression, labeledReturn = "return@${parentFunction.name}")) + IntentionWrapper(action.asIntention()) ) }) } \ No newline at end of file diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToLabeledReturnFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToLabeledReturnFix.kt index afa356442dc5..0894bb53a0e8 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToLabeledReturnFix.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToLabeledReturnFix.kt @@ -3,15 +3,11 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.intention.IntentionAction -import com.intellij.openapi.editor.Editor -import com.intellij.openapi.project.Project +import com.intellij.modcommand.ModCommandAction import com.intellij.psi.PsiElement import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Errors -import org.jetbrains.kotlin.idea.base.resources.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze -import org.jetbrains.kotlin.idea.codeinsight.api.classic.quickfixes.KotlinQuickFixAction -import org.jetbrains.kotlin.idea.codeinsight.utils.ChangeToLabeledReturnUtils import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.findLabelAndCall @@ -23,66 +19,55 @@ import org.jetbrains.kotlin.resolve.calls.util.getType import org.jetbrains.kotlin.resolve.inline.InlineUtil import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf -class ChangeToLabeledReturnFix( - element: KtReturnExpression, val labeledReturn: String -) : KotlinQuickFixAction(element) { +internal object ChangeToLabeledReturnFixFactory: KotlinIntentionActionsFactory() { + private fun findAccessibleLabels(bindingContext: BindingContext, position: KtReturnExpression): List { + val result = mutableListOf() + for (parent in position.parentsWithSelf) { + when (parent) { + is KtClassOrObject -> break + is KtFunctionLiteral -> { + val (label, call) = parent.findLabelAndCall() + if (label != null) { + result.add(label) + } - override fun getFamilyName() = KotlinBundle.message("fix.change.to.labeled.return.family") - override fun getText() = KotlinBundle.message("fix.change.to.labeled.return.text", labeledReturn) - - override fun invoke(project: Project, editor: Editor?, file: KtFile) { - val returnExpression = element ?: return - return ChangeToLabeledReturnUtils.applyTo(project, returnExpression, labeledReturn) + // check if the current function literal is inlined and stop processing outer declarations if it's not + val callee = call?.calleeExpression as? KtReferenceExpression ?: break + if (!InlineUtil.isInline(bindingContext[BindingContext.REFERENCE_TARGET, callee])) break + } + else -> {} + } + } + return result } - companion object : KotlinIntentionActionsFactory() { - private fun findAccessibleLabels(bindingContext: BindingContext, position: KtReturnExpression): List { - val result = mutableListOf() - for (parent in position.parentsWithSelf) { - when (parent) { - is KtClassOrObject -> break - is KtFunctionLiteral -> { - val (label, call) = parent.findLabelAndCall() - if (label != null) { - result.add(label) - } + override fun doCreateActions(diagnostic: Diagnostic): List { + val element = diagnostic.psiElement as? KtElement ?: return emptyList() + val context by lazy { element.analyze() } - // check if the current function literal is inlined and stop processing outer declarations if it's not - val callee = call?.calleeExpression as? KtReferenceExpression ?: break - if (!InlineUtil.isInline(bindingContext[BindingContext.REFERENCE_TARGET, callee])) break - } - else -> {} - } - } - return result - } + val returnExpression = when (diagnostic.factory) { + Errors.RETURN_NOT_ALLOWED -> + diagnostic.psiElement as? KtReturnExpression + Errors.TYPE_MISMATCH, + Errors.TYPE_MISMATCH_WARNING, + Errors.CONSTANT_EXPECTED_TYPE_MISMATCH, + Errors.NULL_FOR_NONNULL_TYPE -> + getLambdaReturnExpression(diagnostic.psiElement, context) + else -> null + } ?: return emptyList() - override fun doCreateActions(diagnostic: Diagnostic): List { - val element = diagnostic.psiElement as? KtElement ?: return emptyList() - val context by lazy { element.analyze() } + val candidates = findAccessibleLabels(context, returnExpression) + return candidates + .map { ChangeToLabeledReturnFix(returnExpression, labeledReturn = "return@${it.render()}") } + .map(ModCommandAction::asIntention) + } - val returnExpression = when (diagnostic.factory) { - Errors.RETURN_NOT_ALLOWED -> - diagnostic.psiElement as? KtReturnExpression - Errors.TYPE_MISMATCH, - Errors.TYPE_MISMATCH_WARNING, - Errors.CONSTANT_EXPECTED_TYPE_MISMATCH, - Errors.NULL_FOR_NONNULL_TYPE -> - getLambdaReturnExpression(diagnostic.psiElement, context) - else -> null - } ?: return emptyList() - - val candidates = findAccessibleLabels(context, returnExpression) - return candidates.map { ChangeToLabeledReturnFix(returnExpression, labeledReturn = "return@${it.render()}") } - } - - private fun getLambdaReturnExpression(element: PsiElement, bindingContext: BindingContext): KtReturnExpression? { - val returnExpression = element.getStrictParentOfType() ?: return null - val lambda = returnExpression.getStrictParentOfType() ?: return null - val lambdaReturnType = bindingContext[BindingContext.FUNCTION, lambda.functionLiteral]?.returnType ?: return null - val returnType = returnExpression.returnedExpression?.getType(bindingContext) ?: return null - if (!returnType.isSubtypeOf(lambdaReturnType)) return null - return returnExpression - } + private fun getLambdaReturnExpression(element: PsiElement, bindingContext: BindingContext): KtReturnExpression? { + val returnExpression = element.getStrictParentOfType() ?: return null + val lambda = returnExpression.getStrictParentOfType() ?: return null + val lambdaReturnType = bindingContext[BindingContext.FUNCTION, lambda.functionLiteral]?.returnType ?: return null + val returnType = returnExpression.returnedExpression?.getType(bindingContext) ?: return null + if (!returnType.isSubtypeOf(lambdaReturnType)) return null + return returnExpression } } \ No newline at end of file diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index 848dfecc7117..f6074d803f00 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -650,11 +650,11 @@ class QuickFixRegistrar : QuickFixContributor { MUST_BE_INITIALIZED_OR_BE_ABSTRACT.registerFactory(AddModifierFixFE10.AddLateinitFactory) - RETURN_NOT_ALLOWED.registerFactory(ChangeToLabeledReturnFix) - TYPE_MISMATCH.registerFactory(ChangeToLabeledReturnFix) - TYPE_MISMATCH_WARNING.registerFactory(ChangeToLabeledReturnFix) - CONSTANT_EXPECTED_TYPE_MISMATCH.registerFactory(ChangeToLabeledReturnFix) - NULL_FOR_NONNULL_TYPE.registerFactory(ChangeToLabeledReturnFix) + RETURN_NOT_ALLOWED.registerFactory(ChangeToLabeledReturnFixFactory) + TYPE_MISMATCH.registerFactory(ChangeToLabeledReturnFixFactory) + TYPE_MISMATCH_WARNING.registerFactory(ChangeToLabeledReturnFixFactory) + CONSTANT_EXPECTED_TYPE_MISMATCH.registerFactory(ChangeToLabeledReturnFixFactory) + NULL_FOR_NONNULL_TYPE.registerFactory(ChangeToLabeledReturnFixFactory) WRONG_ANNOTATION_TARGET.registerFactory(AddAnnotationTargetFix, AddAnnotationUseSiteTargetFix) WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET.registerFactory(MoveReceiverAnnotationFix, AddAnnotationTargetFix) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/constantExpectedTypeMismatch.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/constantExpectedTypeMismatch.kt index c75d9dbc8f3f..746e73d23032 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/constantExpectedTypeMismatch.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/constantExpectedTypeMismatch.kt @@ -8,4 +8,4 @@ fun test() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/constantExpectedTypeMismatch.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/constantExpectedTypeMismatch.kt.after index f3399c2dbccd..5e27708dcfd7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/constantExpectedTypeMismatch.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/constantExpectedTypeMismatch.kt.after @@ -8,4 +8,4 @@ fun test() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleInner.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleInner.kt index 36ccb540f2a9..a0bbc5673b58 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleInner.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleInner.kt @@ -17,4 +17,4 @@ fun bar() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleInner.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleInner.kt.after index 90ff0077611d..e79c1d7b8057 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleInner.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleInner.kt.after @@ -17,4 +17,4 @@ fun bar() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleOuter.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleOuter.kt index ff85ba7bd1dc..a767b337e003 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleOuter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleOuter.kt @@ -16,4 +16,4 @@ fun bar() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleOuter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleOuter.kt.after index 69c1ac6b35ac..1f61524d7264 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleOuter.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/multipleOuter.kt.after @@ -16,4 +16,4 @@ fun bar() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/normal.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/normal.kt index 882007973a6b..cb95fcb28860 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/normal.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/normal.kt @@ -8,4 +8,4 @@ fun bar() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/normal.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/normal.kt.after index 686b6a20f786..51899a16830f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/normal.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/normal.kt.after @@ -8,4 +8,4 @@ fun bar() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/nullForNonnullType.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/nullForNonnullType.kt index 17b959501d04..8f41c81da342 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/nullForNonnullType.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/nullForNonnullType.kt @@ -10,4 +10,4 @@ fun test() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/nullForNonnullType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/nullForNonnullType.kt.after index f69a52de01c4..d44ab34e1f9b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/nullForNonnullType.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/nullForNonnullType.kt.after @@ -10,4 +10,4 @@ fun test() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/typeMismatch.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/typeMismatch.kt index 9144c528306c..d63469329cb3 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/typeMismatch.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/typeMismatch.kt @@ -10,4 +10,4 @@ fun test() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/typeMismatch.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/typeMismatch.kt.after index 9871f389b683..fcaf10ef2094 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/typeMismatch.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeToLabeledReturn/typeMismatch.kt.after @@ -10,4 +10,4 @@ fun test() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToLabeledReturnFixFactory$ChangeToLabeledReturnFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToLabeledReturnFix \ No newline at end of file