From 1bf8661125cd453159d0512cfef407b85f66bbac Mon Sep 17 00:00:00 2001 From: Andrey Cherkasov Date: Thu, 23 May 2024 03:28:33 +0400 Subject: [PATCH] [kotlin] Share AddStarProjectionsFix and ChangeToStarProjectionFix between K1 and K2 ^KTIJ-29570 GitOrigin-RevId: a3d1f3098798ba6c60241fd306b45df9b10cc815 --- .../fixes/AddStarProjectionsFixFactory.kt | 23 +---- .../fixes/ChangeToStarProjectionFixFactory.kt | 25 +---- .../idea/quickfix/AddStarProjectionsFix.kt | 35 +++++++ .../quickfix/ChangeToStarProjectionFix.kt | 35 +++++++ .../idea/quickfix/StarProjectionUtils.kt | 26 ------ .../idea/quickfix/AddStarProjectionsFix.kt | 18 +--- .../quickfix/ChangeToStarProjectionFix.kt | 92 ++++++++----------- .../kotlin/idea/quickfix/QuickFixRegistrar.kt | 4 +- .../cast/changeToStarProjection.kt | 2 +- .../cast/changeToStarProjection.kt.after | 2 +- .../cast/changeToStarProjectionNullable.kt | 2 +- .../changeToStarProjectionNullable.kt.after | 2 +- .../cast/extensionReceiver3.kt | 2 +- .../cast/extensionReceiver3.kt.after | 2 +- .../cast/extensionReceiver4.kt | 2 +- .../cast/extensionReceiver4.kt.after | 2 +- .../cast/extensionReceiver5.kt | 2 +- .../cast/extensionReceiver5.kt.after | 2 +- .../cast/genericTypeParameter3.kt | 2 +- .../cast/genericTypeParameter3.kt.after | 2 +- .../cast/genericTypeParameter4.kt | 2 +- .../cast/genericTypeParameter4.kt.after | 2 +- .../cast/genericTypeParameter6.kt | 2 +- .../cast/genericTypeParameter6.kt.after | 2 +- .../cast/genericTypeParameter7.kt | 2 +- .../cast/genericTypeParameter7.kt.after | 2 +- .../addStarProjections/cast/valueArgument3.kt | 2 +- .../cast/valueArgument3.kt.after | 2 +- .../addStarProjections/cast/valueArgument4.kt | 2 +- .../cast/valueArgument4.kt.after | 2 +- .../addStarProjections/cast/valueArgument5.kt | 2 +- .../cast/valueArgument5.kt.after | 2 +- .../checkType/arrayInWhen.kt | 2 +- .../checkType/arrayInWhen.kt.after | 2 +- ...hangeToStarProjectionMultipleParameters.kt | 2 +- ...oStarProjectionMultipleParameters.kt.after | 2 +- .../changeToStarProjectionNullable.kt | 2 +- .../changeToStarProjectionNullable.kt.after | 2 +- .../changeToStarProjectionSingleParameter.kt | 2 +- ...geToStarProjectionSingleParameter.kt.after | 2 +- .../addStarProjections/qualifiedArrayList.kt | 2 +- .../qualifiedArrayList.kt.after | 2 +- .../addStarProjections/qualifiedList.kt | 2 +- .../addStarProjections/qualifiedList.kt.after | 2 +- .../addStarProjections/qualifiedMap.kt | 2 +- .../addStarProjections/qualifiedMap.kt.after | 2 +- .../addStarProjections/unqualifiedList.kt | 2 +- .../unqualifiedList.kt.after | 2 +- .../addStarProjections/unqualifiedMap.kt | 2 +- .../unqualifiedMap.kt.after | 2 +- .../when/qualifiedArrayList.kt | 2 +- .../when/qualifiedArrayList.kt.after | 2 +- .../addStarProjections/when/qualifiedList.kt | 2 +- .../when/qualifiedList.kt.after | 2 +- .../addStarProjections/when/qualifiedMap.kt | 2 +- .../when/qualifiedMap.kt.after | 2 +- .../when/unqualifiedList.kt | 2 +- .../when/unqualifiedList.kt.after | 2 +- .../addStarProjections/when/unqualifiedMap.kt | 2 +- .../when/unqualifiedMap.kt.after | 2 +- 60 files changed, 165 insertions(+), 197 deletions(-) create mode 100644 plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt create mode 100644 plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddStarProjectionsFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddStarProjectionsFixFactory.kt index 9f07d3409bfd..cbb44f90ccc4 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddStarProjectionsFixFactory.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddStarProjectionsFixFactory.kt @@ -10,11 +10,11 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol 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.quickfix.AddStarProjectionsFix import org.jetbrains.kotlin.idea.quickfix.StarProjectionUtils import org.jetbrains.kotlin.idea.quickfix.StarProjectionUtils.starProjectionFixFamilyName import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtTypeReference -import org.jetbrains.kotlin.psi.KtUserType internal object AddStarProjectionsFixFactory { val addStarProjectionsFixFactory = KotlinQuickFixFactory.ModCommandBased { diagnostic: KtFirDiagnostic.NoTypeArgumentsOnRhs -> @@ -56,27 +56,6 @@ internal object AddStarProjectionsFixFactory { override fun getFamilyName(): String = starProjectionFixFamilyName } - - private class AddStarProjectionsFix( - element: KtUserType, - private val argumentCount: Int, - ) : KotlinPsiUpdateModCommandAction.ElementBased(element, Unit) { - - override fun invoke( - actionContext: ActionContext, - element: KtUserType, - elementContext: Unit, - updater: ModPsiUpdater, - ) = StarProjectionUtils.addStarProjections(actionContext.project, element, argumentCount) - - override fun getFamilyName() = starProjectionFixFamilyName - - override fun getActionName( - actionContext: ActionContext, - element: KtUserType, - elementContext: Unit, - ): String = StarProjectionUtils.addStarProjectionsActionName(argumentCount) - } } context(KtAnalysisSession) diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeToStarProjectionFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeToStarProjectionFixFactory.kt index 4f48da206716..4c5b5c3befac 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeToStarProjectionFixFactory.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeToStarProjectionFixFactory.kt @@ -1,8 +1,6 @@ // 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.KtStarTypeProjection @@ -12,9 +10,8 @@ import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KtFirDiagnostic import org.jetbrains.kotlin.analysis.api.types.KtNonErrorClassType import org.jetbrains.kotlin.analysis.api.types.KtTypeParameterType import org.jetbrains.kotlin.idea.base.psi.typeArguments -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.quickfix.ChangeToStarProjectionFix import org.jetbrains.kotlin.idea.quickfix.StarProjectionUtils import org.jetbrains.kotlin.idea.quickfix.StarProjectionUtils.isAsKeyword import org.jetbrains.kotlin.idea.quickfix.StarProjectionUtils.isOnJvm @@ -76,24 +73,4 @@ internal object ChangeToStarProjectionFixFactory { return if (typeElement.typeArgumentsAsTypes.isEmpty()) null else ChangeToStarProjectionFix(typeElement) } - - private class ChangeToStarProjectionFix( - element: KtTypeElement, - ) : KotlinPsiUpdateModCommandAction.ElementBased(element, Unit) { - - override fun invoke( - actionContext: ActionContext, - element: KtTypeElement, - elementContext: Unit, - updater: ModPsiUpdater, - ) = StarProjectionUtils.changeToStarProjection(actionContext.project, element) - - override fun getActionName( - actionContext: ActionContext, - element: KtTypeElement, - elementContext: Unit, - ): String = StarProjectionUtils.changeToStarProjectionActionName(element) - - override fun getFamilyName(): String = KotlinBundle.message("fix.change.to.star.projection.family") - } } diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt new file mode 100644 index 000000000000..23c969489801 --- /dev/null +++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt @@ -0,0 +1,35 @@ +// 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.KtUserType +import org.jetbrains.kotlin.utils.sure + +class AddStarProjectionsFix( + element: KtUserType, + private val argumentCount: Int, +) : KotlinPsiUpdateModCommandAction.ElementBased(element, Unit) { + + override fun invoke( + actionContext: ActionContext, + element: KtUserType, + elementContext: Unit, + updater: ModPsiUpdater, + ) { + assert(element.typeArguments.isEmpty()) + val typeString = StarProjectionUtils.getTypeNameAndStarProjectionsString(element.text, argumentCount) + val psiFactory = KtPsiFactory(actionContext.project) + val replacement = psiFactory.createType(typeString).typeElement.sure { "No type element after parsing $typeString" } + element.replace(replacement) + } + + override fun getFamilyName(): String { + return KotlinBundle.message( + "fix.add.star.projection.text", + StarProjectionUtils.getTypeNameAndStarProjectionsString("", argumentCount)) + } +} diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt new file mode 100644 index 000000000000..f64277abdff3 --- /dev/null +++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt @@ -0,0 +1,35 @@ +// 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.KtTypeElement + +class ChangeToStarProjectionFix( + element: KtTypeElement, +) : KotlinPsiUpdateModCommandAction.ElementBased(element, Unit) { + + override fun invoke( + actionContext: ActionContext, + element: KtTypeElement, + elementContext: Unit, + updater: ModPsiUpdater, + ) { + val star = KtPsiFactory(actionContext.project).createStar() + element.typeArgumentsAsTypes.forEach { it?.replace(star) } + } + + override fun getActionName( + actionContext: ActionContext, + element: KtTypeElement, + elementContext: Unit, + ): String { + val type = element.typeArgumentsAsTypes.joinToString { "*" } + return KotlinBundle.message("fix.change.to.star.projection.text", "<$type>") + } + + override fun getFamilyName(): String = KotlinBundle.message("fix.change.to.star.projection.family") +} diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/StarProjectionUtils.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/StarProjectionUtils.kt index e5e3c0d3dffc..52968e7c5016 100644 --- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/StarProjectionUtils.kt +++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/StarProjectionUtils.kt @@ -2,8 +2,6 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInspection.util.IntentionFamilyName -import com.intellij.codeInspection.util.IntentionName -import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import org.jetbrains.kotlin.idea.base.facet.platform.platform import org.jetbrains.kotlin.idea.base.resources.KotlinBundle @@ -12,35 +10,11 @@ import org.jetbrains.kotlin.platform.jvm.isJvm import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.utils.addToStdlib.safeAs -import org.jetbrains.kotlin.utils.sure object StarProjectionUtils { @IntentionFamilyName val starProjectionFixFamilyName = KotlinBundle.message("fix.add.star.projection.family") - @IntentionName - fun addStarProjectionsActionName(argumentCount: Int): String { - return KotlinBundle.message("fix.add.star.projection.text", getTypeNameAndStarProjectionsString("", argumentCount)) - } - - fun addStarProjections(project: Project, element: KtUserType, argumentCount: Int) { - val typeString = getTypeNameAndStarProjectionsString(element.text, argumentCount) - val psiFactory = KtPsiFactory(project) - val replacement = psiFactory.createType(typeString).typeElement.sure { "No type element after parsing $typeString" } - element.replace(replacement) - } - - @IntentionName - fun changeToStarProjectionActionName(element: KtTypeElement): String { - val type = element.typeArgumentsAsTypes.joinToString { "*" } - return KotlinBundle.message("fix.change.to.star.projection.text", "<$type>") - } - - fun changeToStarProjection(project: Project, element: KtTypeElement) { - val star = KtPsiFactory(project).createStar() - element.typeArgumentsAsTypes.forEach { it?.replace(star) } - } - data class ChangeToStarProjectionFixInfo( val binaryExpr: KtBinaryExpressionWithTypeRHS?, val typeReference: KtTypeReference?, diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt index e1bd3abbb6e0..1a09b44821d5 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.kt @@ -16,13 +16,12 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtTypeReference -import org.jetbrains.kotlin.psi.KtUserType import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.descriptorUtil.parentsWithSelf import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier -object AddStarProjectionsFixFactory : KotlinSingleIntentionActionFactory() { +internal object AddStarProjectionsFixFactory : KotlinSingleIntentionActionFactory() { public override fun createAction(diagnostic: Diagnostic): IntentionAction? { val diagnosticWithParameters = Errors.NO_TYPE_ARGUMENTS_ON_RHS.cast(diagnostic) val typeReference = diagnosticWithParameters.psiElement @@ -32,24 +31,11 @@ object AddStarProjectionsFixFactory : KotlinSingleIntentionActionFactory() { else { val typeElement = typeReference.typeElement ?: return null val unwrappedType = StarProjectionUtils.getUnwrappedType(typeElement) ?: return null - return AddStarProjectionsFix(unwrappedType, diagnosticWithParameters.a) + return AddStarProjectionsFix(unwrappedType, diagnosticWithParameters.a).asIntention() } } } -class AddStarProjectionsFix(element: KtUserType, private val argumentCount: Int) : KotlinQuickFixAction(element) { - - override fun getFamilyName() = starProjectionFixFamilyName - - override fun getText() = StarProjectionUtils.addStarProjectionsActionName(argumentCount) - - override fun invoke(project: Project, editor: Editor?, file: KtFile) { - val element = element ?: return - assert(element.typeArguments.isEmpty()) - StarProjectionUtils.addStarProjections(project, element, argumentCount) - } -} - class AddStartProjectionsForInnerClass(element: KtTypeReference) : KotlinQuickFixAction(element) { override fun getFamilyName() = text diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt index 427cf8734c17..fb2c197ab58f 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.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 org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.idea.base.psi.typeArguments -import org.jetbrains.kotlin.idea.base.resources.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall -import org.jetbrains.kotlin.idea.codeinsight.api.classic.quickfixes.KotlinQuickFixAction import org.jetbrains.kotlin.idea.quickfix.StarProjectionUtils.isAsKeyword import org.jetbrains.kotlin.idea.quickfix.StarProjectionUtils.isOnJvm import org.jetbrains.kotlin.psi.* @@ -23,63 +19,49 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext.isArrayOrNullableArray import org.jetbrains.kotlin.types.typeUtil.isTypeParameter -class ChangeToStarProjectionFix(element: KtTypeElement) : KotlinQuickFixAction(element) { - override fun getFamilyName() = KotlinBundle.message("fix.change.to.star.projection.family") +internal object ChangeToStarProjectionFixFactory : KotlinSingleIntentionActionFactory() { + override fun createAction(diagnostic: Diagnostic): IntentionAction? { + val psiElement = diagnostic.psiElement - override fun getText(): String { - val element = this.element ?: return "" - return StarProjectionUtils.changeToStarProjectionActionName(element) - } + // We don't suggest this quick-fix for array instance checks because there is ConvertToIsArrayOfCallFix + if (psiElement.parent is KtIsExpression && diagnostic.isArrayInstanceCheck() && psiElement.isOnJvm()) return null - public override fun invoke(project: Project, editor: Editor?, file: KtFile) { - val element = this.element ?: return - return StarProjectionUtils.changeToStarProjection(project, element) - } + val (binaryExpr, typeReference, typeElement) = StarProjectionUtils.getChangeToStarProjectionFixInfo(psiElement) ?: return null - companion object : KotlinSingleIntentionActionFactory() { - override fun createAction(diagnostic: Diagnostic): IntentionAction? { - val psiElement = diagnostic.psiElement - - // We don't suggest this quick-fix for array instance checks because there is ConvertToIsArrayOfCallFix - if (psiElement.parent is KtIsExpression && diagnostic.isArrayInstanceCheck() && psiElement.isOnJvm()) return null - - val (binaryExpr, typeReference, typeElement) = StarProjectionUtils.getChangeToStarProjectionFixInfo(psiElement) ?: return null - - if (binaryExpr?.operationReference?.isAsKeyword() == true) { - val parent = binaryExpr.getParentOfTypes( - true, - KtValueArgument::class.java, - KtQualifiedExpression::class.java, - KtCallableDeclaration::class.java - ) - if (parent is KtCallableDeclaration - && parent.typeReference.typeArguments().any { it.projectionKind != KtProjectionKind.STAR } - && typeReference.typeArguments().isNotEmpty() - && binaryExpr.isUsedAsExpression(binaryExpr.analyze(BodyResolveMode.PARTIAL_WITH_CFA)) - ) return null - val type = when (parent) { - is KtValueArgument -> { - val callExpr = parent.getStrictParentOfType() - (callExpr?.resolveToCall()?.getArgumentMapping(parent) as? ArgumentMatch)?.valueParameter?.original?.type - } - is KtQualifiedExpression -> - if (KtPsiUtil.safeDeparenthesize(parent.receiverExpression) == binaryExpr) - parent.resolveToCall()?.resultingDescriptor?.extensionReceiverParameter?.value?.original?.type - else - null - else -> - null + if (binaryExpr?.operationReference?.isAsKeyword() == true) { + val parent = binaryExpr.getParentOfTypes( + true, + KtValueArgument::class.java, + KtQualifiedExpression::class.java, + KtCallableDeclaration::class.java + ) + if (parent is KtCallableDeclaration + && parent.typeReference.typeArguments().any { it.projectionKind != KtProjectionKind.STAR } + && typeReference.typeArguments().isNotEmpty() + && binaryExpr.isUsedAsExpression(binaryExpr.analyze(BodyResolveMode.PARTIAL_WITH_CFA)) + ) return null + val type = when (parent) { + is KtValueArgument -> { + val callExpr = parent.getStrictParentOfType() + (callExpr?.resolveToCall()?.getArgumentMapping(parent) as? ArgumentMatch)?.valueParameter?.original?.type } - if (type?.arguments?.any { !it.isStarProjection && !it.type.isTypeParameter() } == true) return null + is KtQualifiedExpression -> + if (KtPsiUtil.safeDeparenthesize(parent.receiverExpression) == binaryExpr) + parent.resolveToCall()?.resultingDescriptor?.extensionReceiverParameter?.value?.original?.type + else + null + else -> + null } - - if (typeElement.typeArgumentsAsTypes.isNotEmpty()) { - return ChangeToStarProjectionFix(typeElement) - } - return null + if (type?.arguments?.any { !it.isStarProjection && !it.type.isTypeParameter() } == true) return null } - private fun Diagnostic.isArrayInstanceCheck(): Boolean = - factory == Errors.CANNOT_CHECK_FOR_ERASED && Errors.CANNOT_CHECK_FOR_ERASED.cast(this).a.isArrayOrNullableArray() + if (typeElement.typeArgumentsAsTypes.isNotEmpty()) { + return ChangeToStarProjectionFix(typeElement).asIntention() + } + return null } + + private fun Diagnostic.isArrayInstanceCheck(): Boolean = + factory == Errors.CANNOT_CHECK_FOR_ERASED && Errors.CANNOT_CHECK_FOR_ERASED.cast(this).a.isArrayOrNullableArray() } 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 fc1dbcef2f3c..0e0a2ed04a07 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 @@ -337,8 +337,8 @@ class QuickFixRegistrar : QuickFixContributor { LOCAL_VARIABLE_WITH_TYPE_PARAMETERS.registerFactory(RemovePsiElementSimpleFix.RemoveTypeParametersFactory) LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING.registerFactory(RemovePsiElementSimpleFix.RemoveTypeParametersFactory) - UNCHECKED_CAST.registerFactory(ChangeToStarProjectionFix) - CANNOT_CHECK_FOR_ERASED.registerFactory(ChangeToStarProjectionFix) + UNCHECKED_CAST.registerFactory(ChangeToStarProjectionFixFactory) + CANNOT_CHECK_FOR_ERASED.registerFactory(ChangeToStarProjectionFixFactory) CANNOT_CHECK_FOR_ERASED.registerFactory(ConvertToIsArrayOfCallFix) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt index 18e4c6cd4ef8..dfd52d5bd6bc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt @@ -4,4 +4,4 @@ public fun foo(a: Any) { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt.after index 1a47cfa50002..2f612cdfc9d0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt.after @@ -4,4 +4,4 @@ public fun foo(a: Any) { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt index 343cca187263..0def12474e22 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt @@ -4,4 +4,4 @@ public fun foo(a: Any?) { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt.after index 0c88087b2fc6..95ce6a4e41d9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt.after @@ -4,4 +4,4 @@ public fun foo(a: Any?) { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver3.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver3.kt index 5fe6096e5451..10812fcfca24 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver3.kt @@ -5,4 +5,4 @@ fun test(a: Any) { fun List<*>.bar() {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver3.kt.after index ffe8ebe6e0c7..4d952ad7a91c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver3.kt.after @@ -5,4 +5,4 @@ fun test(a: Any) { fun List<*>.bar() {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver4.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver4.kt index 42fdc9ab28c2..7e977bae217b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver4.kt @@ -5,4 +5,4 @@ fun test(a: Any) { fun List.bar() {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver4.kt.after index 79a82b472440..0c814d70fe8a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver4.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver4.kt.after @@ -5,4 +5,4 @@ fun test(a: Any) { fun List.bar() {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver5.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver5.kt index 3686d71244f3..1a68c788a5c1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver5.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver5.kt @@ -5,4 +5,4 @@ fun test(a: Any) { fun Map.bar() {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver5.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver5.kt.after index 865aca3742f9..97442947f8c1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver5.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/extensionReceiver5.kt.after @@ -5,4 +5,4 @@ fun test(a: Any) { fun Map.bar() {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter3.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter3.kt index 8febfbbccc3e..c015b154dba0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter3.kt @@ -3,4 +3,4 @@ fun test(list: List<*>): List<*> { return list as List } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter3.kt.after index 0543c40d37e5..ba54c1b0ad35 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter3.kt.after @@ -3,4 +3,4 @@ fun test(list: List<*>): List<*> { return list as List<*> } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter4.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter4.kt index 1c19a02785c1..8f0c340f3064 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter4.kt @@ -4,4 +4,4 @@ fun test(list: List<*>): List { return list as List } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter4.kt.after index 2b8250cc19e5..2e36e8d2d7da 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter4.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter4.kt.after @@ -4,4 +4,4 @@ fun test(list: List<*>): List { return list as List } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter6.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter6.kt index e3d1812297c5..731be2297b89 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter6.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter6.kt @@ -3,4 +3,4 @@ fun test6(list: List<*>) { val a: List<*> = list as List } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter6.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter6.kt.after index b54be28ea933..5270a8e8f2ad 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter6.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter6.kt.after @@ -3,4 +3,4 @@ fun test6(list: List<*>) { val a: List<*> = list as List<*> } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter7.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter7.kt index f159a9cec401..aebb6f688e81 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter7.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter7.kt @@ -3,4 +3,4 @@ fun test7(list: List<*>) { val a = list as List } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter7.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter7.kt.after index 44c2d9332c3c..ccd7cdc4fd75 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter7.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/genericTypeParameter7.kt.after @@ -3,4 +3,4 @@ fun test7(list: List<*>) { val a = list as List<*> } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument3.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument3.kt index 791397c602cd..f8dd1f313e95 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument3.kt @@ -5,4 +5,4 @@ fun test(a: Any) { fun foo(list: List<*>) {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument3.kt.after index c1e823cf5713..3fb535dcb9e4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument3.kt.after @@ -5,4 +5,4 @@ fun test(a: Any) { fun foo(list: List<*>) {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument4.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument4.kt index c0bf7458d13e..9b8c0378d52b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument4.kt @@ -5,4 +5,4 @@ fun test(a: Any) { fun foo(list: List) {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument4.kt.after index cbba20602b70..135f88d2e5cd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument4.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument4.kt.after @@ -5,4 +5,4 @@ fun test(a: Any) { fun foo(list: List) {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument5.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument5.kt index 5d3c65754b44..4c7ccf1a5e16 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument5.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument5.kt @@ -5,4 +5,4 @@ fun test(a: Any) { fun foo(map: Map) {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument5.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument5.kt.after index 46fa574cba3f..c6684f61e497 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument5.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/cast/valueArgument5.kt.after @@ -5,4 +5,4 @@ fun test(a: Any) { fun foo(map: Map) {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/arrayInWhen.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/arrayInWhen.kt index 944b4878137f..1d97fd790658 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/arrayInWhen.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/arrayInWhen.kt @@ -5,4 +5,4 @@ fun test(a: Any) = when (a) { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/arrayInWhen.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/arrayInWhen.kt.after index d0bbbf69783f..f84c3f6cfc58 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/arrayInWhen.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/arrayInWhen.kt.after @@ -5,4 +5,4 @@ fun test(a: Any) = when (a) { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt index a78d2cb43aef..e86503aade98 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt @@ -1,4 +1,4 @@ // "Change type arguments to <*, *>" "true" fun isStringToIntMap(map : Any) = map is Map<String, Int> // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt.after index e8a036c6f75b..a1ff92ebed00 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt.after @@ -1,4 +1,4 @@ // "Change type arguments to <*, *>" "true" fun isStringToIntMap(map : Any) = map is Map<*, *> // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt index d53537fe4802..3c4917a8e937 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt @@ -1,4 +1,4 @@ // "Change type arguments to <*>" "true" fun isStringList(list : Any) = list is List<String>? // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt.after index b8396e700428..100c4816b9e2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt.after @@ -1,4 +1,4 @@ // "Change type arguments to <*>" "true" fun isStringList(list : Any) = list is List<*>? // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt index dd260ba5fa7f..8df31390fef1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt @@ -1,4 +1,4 @@ // "Change type arguments to <*>" "true" fun isStringList(list : Any?) = list is (List<String>) // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt.after index 0a674203e3c3..17d43a535e37 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt.after @@ -1,4 +1,4 @@ // "Change type arguments to <*>" "true" fun isStringList(list : Any?) = list is (List<*>) // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeToStarProjectionFixFactory$ChangeToStarProjectionFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeToStarProjectionFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedArrayList.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedArrayList.kt index 2649bb437e8c..a0ba3381ab0e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedArrayList.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedArrayList.kt @@ -3,4 +3,4 @@ public fun foo(a: Any) { a is java.util.ArrayList } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedArrayList.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedArrayList.kt.after index 713b169931c2..f28d59d95118 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedArrayList.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedArrayList.kt.after @@ -3,4 +3,4 @@ public fun foo(a: Any) { a is java.util.ArrayList<*> } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedList.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedList.kt index 28bb2b92c2ec..23e9135301a6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedList.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedList.kt @@ -3,4 +3,4 @@ public fun foo(a: Any) { a is kotlin.collections.List } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedList.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedList.kt.after index 68e4e943949e..54d528cf6ff7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedList.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedList.kt.after @@ -3,4 +3,4 @@ public fun foo(a: Any) { a is kotlin.collections.List<*> } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedMap.kt index 55006082e855..84d52a206467 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedMap.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedMap.kt @@ -3,4 +3,4 @@ public fun foo(a: Any) { a is kotlin.collections.Map } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedMap.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedMap.kt.after index 8811c793f8e3..74dfe405f13e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedMap.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/qualifiedMap.kt.after @@ -3,4 +3,4 @@ public fun foo(a: Any) { a is kotlin.collections.Map<*, *> } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedList.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedList.kt index 55ca38b52ad4..2813b54a3c5b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedList.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedList.kt @@ -3,4 +3,4 @@ public fun foo(a: Any) { a is List } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedList.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedList.kt.after index f0654bfc7470..d85a47279213 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedList.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedList.kt.after @@ -3,4 +3,4 @@ public fun foo(a: Any) { a is List<*> } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedMap.kt index 4fa9cc750d57..65c5c6be363f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedMap.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedMap.kt @@ -3,4 +3,4 @@ public fun foo(a: Any) { a is Map } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedMap.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedMap.kt.after index b4788ddc076d..b675b2c6c3a3 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedMap.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/unqualifiedMap.kt.after @@ -3,4 +3,4 @@ public fun foo(a: Any) { a is Map<*, *> } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt index 0ecb9a83d6f1..4dd1fb500222 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt @@ -6,4 +6,4 @@ public fun foo(a: Any) { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt.after index 8122f628d242..e86b94a1b0ef 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt.after @@ -6,4 +6,4 @@ public fun foo(a: Any) { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedList.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedList.kt index f67ac6070c1d..effb74e3cb2d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedList.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedList.kt @@ -6,4 +6,4 @@ public fun foo(a: Any) { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedList.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedList.kt.after index f721a1678871..dc60cedd6aef 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedList.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedList.kt.after @@ -6,4 +6,4 @@ public fun foo(a: Any) { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedMap.kt index 5bd7a33fe2be..87518fc0e28a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedMap.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedMap.kt @@ -6,4 +6,4 @@ public fun foo(a: Any) { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after index 987abd4ea23a..5f610372c13f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after @@ -6,4 +6,4 @@ public fun foo(a: Any) { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedList.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedList.kt index 2ff0beb66c64..02879676732e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedList.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedList.kt @@ -6,4 +6,4 @@ public fun foo(a: Any) { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedList.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedList.kt.after index 6de758a9acc2..70351e862bda 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedList.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedList.kt.after @@ -6,4 +6,4 @@ public fun foo(a: Any) { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedMap.kt index b8a5c3f16e71..c5bfd7622a1b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedMap.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedMap.kt @@ -6,4 +6,4 @@ public fun foo(a: Any) { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedMap.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedMap.kt.after index d810d285dfa4..db0a173b41f1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedMap.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/when/unqualifiedMap.kt.after @@ -6,4 +6,4 @@ public fun foo(a: Any) { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddStarProjectionsFixFactory$AddStarProjectionsFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix \ No newline at end of file