[kotlin] Port ChangeVisibilityFix to K2

#KTIJ-29583 Fixed

GitOrigin-RevId: 5bff729277bf584e3234da8a1e8ca0a2b0d199ed

plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddDataModifierFixFactory.kt

@@ -3,17 +3,18 @@ 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.annotations.ApiStatus
 import org.jetbrains.kotlin.analysis.api.KaExperimentalApi
 import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic
 import org.jetbrains.kotlin.analysis.api.resolution.KaCallableMemberCall
 import org.jetbrains.kotlin.analysis.api.resolution.successfulCallOrNull
 import org.jetbrains.kotlin.analysis.api.resolution.symbol
-import org.jetbrains.kotlin.analysis.api.symbols.KaNamedClassOrObjectSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaDeclarationSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaNamedClassSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaSymbolModality
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KaSymbolWithVisibility
 import org.jetbrains.kotlin.analysis.api.types.KaClassType
-import org.jetbrains.kotlin.descriptors.Modality
 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
@@ -25,7 +26,7 @@ internal object AddDataModifierFixFactory {
         val element = diagnostic.psi as? KtExpression ?: return@ModCommandBased emptyList()
 
         val callableSymbol = if (element is KtParameter && element.firstChild is KtDestructuringDeclaration) {
-            (element as? KtParameter)?.getParameterSymbol()
+            element.symbol
         } else {
             element.resolveToCall()?.successfulCallOrNull<KaCallableMemberCall<*, *>>()?.symbol
         }
@@ -33,7 +34,7 @@ internal object AddDataModifierFixFactory {
         val type = (callableSymbol?.returnType as? KaClassType)?.typeArguments?.firstOrNull()?.type
             ?: callableSymbol?.returnType
 
-        val classSymbol = (type as? KaClassType)?.symbol as? KaNamedClassOrObjectSymbol
+        val classSymbol = (type as? KaClassType)?.symbol as? KaNamedClassSymbol
             ?: return@ModCommandBased emptyList()
 
         val modality = classSymbol.modality
@@ -79,8 +80,9 @@ internal object AddDataModifierFixFactory {
 }
 
 context(KaSession)
+@ApiStatus.Internal
 @OptIn(KaExperimentalApi::class)
-private fun KaSymbolWithVisibility.isVisible(position: KtElement): Boolean {
-    val file = position.containingKtFile.getFileSymbol()
+fun KaDeclarationSymbol.isVisible(position: PsiElement): Boolean {
+    val file = (position.containingFile as? KtFile)?.symbol ?: return false
     return isVisible(this, file, position = position)
 }

plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeVisibilityFixFactories.kt

@@ -1,24 +1,58 @@
 // 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.codeInsight.intention.HighPriorityAction
 import com.intellij.modcommand.ActionContext
 import com.intellij.modcommand.ModPsiUpdater
 import com.intellij.modcommand.Presentation
+import com.intellij.psi.PsiElement
+import com.intellij.psi.util.parentOfTypes
+import com.intellij.util.containers.addIfNotNull
 import org.jetbrains.kotlin.analysis.api.KaSession
+import org.jetbrains.kotlin.analysis.api.analyze
 import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic
+import org.jetbrains.kotlin.analysis.api.symbols.KaClassSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaDeclarationSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaNamedClassSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.name
+import org.jetbrains.kotlin.analysis.api.types.symbol
+import org.jetbrains.kotlin.descriptors.EffectiveVisibility
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
+import org.jetbrains.kotlin.idea.base.util.module
 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.canBeInternal
+import org.jetbrains.kotlin.idea.codeinsight.utils.canBePrivate
+import org.jetbrains.kotlin.idea.codeinsight.utils.canBeProtected
+import org.jetbrains.kotlin.idea.codeinsight.utils.canBePublic
 import org.jetbrains.kotlin.idea.codeinsight.utils.isRedundantSetter
 import org.jetbrains.kotlin.idea.codeinsight.utils.removeRedundantSetter
+import org.jetbrains.kotlin.idea.codeinsight.utils.toVisibility
 import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.SpecialNames
+import org.jetbrains.kotlin.name.StandardClassIds
+import org.jetbrains.kotlin.psi.KtCallableDeclaration
 import org.jetbrains.kotlin.psi.KtConstructor
 import org.jetbrains.kotlin.psi.KtDeclaration
+import org.jetbrains.kotlin.psi.KtElement
+import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
+import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.psi.KtParameter
+import org.jetbrains.kotlin.psi.KtPrimaryConstructor
+import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.psi.KtPropertyAccessor
+import org.jetbrains.kotlin.psi.KtTypeParameter
+import org.jetbrains.kotlin.psi.psiUtil.containingClass
+import org.jetbrains.kotlin.psi.psiUtil.isPrivate
+import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 object ChangeVisibilityFixFactories {
 
@@ -26,7 +60,7 @@ object ChangeVisibilityFixFactories {
         val elementName: String,
     )
 
-    private class ChangeVisibilityModCommandAction(
+    private open class ChangeVisibilityModCommandAction(
         element: KtDeclaration,
         elementContext: ElementContext,
         private val forceUsingExplicitModifier: Boolean,
@@ -73,6 +107,18 @@ object ChangeVisibilityFixFactories {
         }
     }
 
+    private class ChangeToPrivateModCommandAction(element: KtDeclaration, elementName: String):
+        ChangeVisibilityModCommandAction(element, ElementContext(elementName), false, KtTokens.PRIVATE_KEYWORD), HighPriorityAction
+
+    private class ChangeToInternalModCommandAction(element: KtDeclaration, elementName: String):
+        ChangeVisibilityModCommandAction(element, ElementContext(elementName), false, KtTokens.INTERNAL_KEYWORD)
+
+    private class ChangeToProtectedModCommandAction(element: KtDeclaration, elementName: String):
+        ChangeVisibilityModCommandAction(element, ElementContext(elementName), false, KtTokens.PROTECTED_KEYWORD)
+
+    private class ChangeToPublicModCommandAction(element: KtDeclaration, elementName: String, forceUsingExplicitModifier: Boolean = true):
+        ChangeVisibilityModCommandAction(element, ElementContext(elementName), forceUsingExplicitModifier, KtTokens.PUBLIC_KEYWORD), HighPriorityAction
+
     val noExplicitVisibilityInApiMode =
         KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.NoExplicitVisibilityInApiMode ->
             createFixForNoExplicitVisibilityInApiMode(diagnostic.psi)
@@ -83,6 +129,88 @@ object ChangeVisibilityFixFactories {
             createFixForNoExplicitVisibilityInApiMode(diagnostic.psi)
         }
 
+    val exposedTypealiasExpandedType =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ExposedTypealiasExpandedType ->
+            createChangeVisibilityFixOnExposure(diagnostic.psi, diagnostic.elementVisibility, diagnostic.restrictingDeclaration, diagnostic.restrictingVisibility)
+        }
+
+    val exposedFunctionReturnType =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ExposedFunctionReturnType ->
+            createChangeVisibilityFixOnExposure(diagnostic.psi, diagnostic.elementVisibility, diagnostic.restrictingDeclaration, diagnostic.restrictingVisibility)
+        }
+
+    val exposedReceiverType =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ExposedReceiverType ->
+            createChangeVisibilityFixOnExposure(diagnostic.psi, diagnostic.elementVisibility, diagnostic.restrictingDeclaration, diagnostic.restrictingVisibility)
+        }
+
+    val exposedPropertyType =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ExposedPropertyType ->
+            createChangeVisibilityFixOnExposure(diagnostic.psi, diagnostic.elementVisibility, diagnostic.restrictingDeclaration, diagnostic.restrictingVisibility)
+        }
+
+    val exposedPropertyTypeInConstructorError =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ExposedPropertyTypeInConstructorError ->
+            createChangeVisibilityFixOnExposure(diagnostic.psi, diagnostic.elementVisibility, diagnostic.restrictingDeclaration, diagnostic.restrictingVisibility)
+        }
+
+    val exposedPropertyTypeInConstructorWarning =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ExposedPropertyTypeInConstructorWarning ->
+            createChangeVisibilityFixOnExposure(diagnostic.psi, diagnostic.elementVisibility, diagnostic.restrictingDeclaration, diagnostic.restrictingVisibility)
+        }
+
+    val exposedParameterType =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ExposedParameterType ->
+            createChangeVisibilityFixOnExposure(diagnostic.psi, diagnostic.elementVisibility, diagnostic.restrictingDeclaration, diagnostic.restrictingVisibility)
+        }
+
+    val exposedSuperInterface =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ExposedSuperInterface ->
+            createChangeVisibilityFixOnExposure(diagnostic.psi, diagnostic.elementVisibility, diagnostic.restrictingDeclaration, diagnostic.restrictingVisibility)
+        }
+
+    val exposedSuperClass =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ExposedSuperClass ->
+            createChangeVisibilityFixOnExposure(diagnostic.psi, diagnostic.elementVisibility, diagnostic.restrictingDeclaration, diagnostic.restrictingVisibility)
+        }
+
+    val exposedTypeParameterBound =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ExposedTypeParameterBound ->
+            createChangeVisibilityFixOnExposure(diagnostic.psi, diagnostic.elementVisibility, diagnostic.restrictingDeclaration, diagnostic.restrictingVisibility)
+        }
+
+    val invisibleReference =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.InvisibleReference ->
+            createChangeVisibilityFixOnInvisibleReference(diagnostic.psi, diagnostic.visible, diagnostic.reference)
+        }
+
+    val invisibleSetter =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.InvisibleSetter ->
+            createChangeVisibilityFixOnInvisibleReference(diagnostic.psi, diagnostic.visibility, diagnostic.property,
+                                                          declaration = (diagnostic.property.psi as? KtProperty)?.setter)
+        }
+
+    val superCallFromPublicInline =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.SuperCallFromPublicInline ->
+            createChangeVisibilityFixOnSuperCallFromPublicInline(diagnostic.psi, diagnostic.symbol)
+        }
+
+    val nonPublicCallFromPublicInline =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.NonPublicCallFromPublicInline ->
+            createChangeVisibilityFixOnProtectedCallFromPublicInlineError(
+                diagnostic.referencedDeclaration,
+                diagnostic.inlineDeclaration
+            )
+        }
+
+    val protectedCallFromPublicInlineError =
+        KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ProtectedCallFromPublicInlineError ->
+            createChangeVisibilityFixOnProtectedCallFromPublicInlineError(
+                diagnostic.referencedDeclaration,
+                diagnostic.inlineDeclaration
+            )
+        }
+
     context(KaSession)
     private fun createFixForNoExplicitVisibilityInApiMode(
         element: KtDeclaration,
@@ -93,13 +221,196 @@ object ChangeVisibilityFixFactories {
             else -> null
         } ?: return emptyList()
 
-        return listOf(
-            ChangeVisibilityModCommandAction(
-                element = element,
-                elementContext = ElementContext(elementName),
-                forceUsingExplicitModifier = true,
-                visibilityModifier = KtTokens.PUBLIC_KEYWORD,
-            )
+        return listOf(ChangeToPublicModCommandAction(element, elementName))
+    }
+
+    context(KaSession)
+    private fun createChangeVisibilityFixOnSuperCallFromPublicInline(
+        element: KtElement,
+        referencedDeclaration: KaSymbol,
+    ): List<ChangeVisibilityModCommandAction> {
+        val declaration = (element as? KtExpression)?.containingDeclaration() ?: return emptyList()
+        return listOfNotNull(
+            createFixToTargetVisibility(referencedDeclaration, declaration, Visibilities.Internal),
+            createFixToTargetVisibility(referencedDeclaration, declaration, Visibilities.Private),
         )
     }
-}
+
+    context(KaSession)
+    private fun createChangeVisibilityFixOnProtectedCallFromPublicInlineError(
+        referencedSymbol: KaSymbol,
+        inlineSymbol: KaSymbol
+    ): List<ChangeVisibilityModCommandAction> {
+        val inlineDeclaration = inlineSymbol.psi as? KtDeclaration ?: return emptyList()
+        val referencedDeclaration = referencedSymbol.psi as? KtDeclaration
+        return buildList {
+            if (referencedDeclaration != null) {
+                addIfNotNull(createFixToTargetVisibility(referencedSymbol, referencedDeclaration, Visibilities.Private))
+                addIfNotNull(createFixToTargetVisibility(referencedSymbol, referencedDeclaration, Visibilities.Internal))
+                val visibilityModifierType = referencedDeclaration.visibilityModifierType() ?: KtTokens.PUBLIC_KEYWORD
+                if (inlineDeclaration is KtPropertyAccessor) {
+                    addIfNotNull(createFixToTargetVisibility(inlineSymbol, inlineDeclaration.property, visibilityModifierType.toVisibility()))
+                } else {
+                    addIfNotNull(createFixToTargetVisibility(inlineSymbol, inlineDeclaration, visibilityModifierType.toVisibility()))
+                }
+                if (visibilityModifierType != KtTokens.PUBLIC_KEYWORD) {
+                    addIfNotNull(createFixToTargetVisibility(referencedSymbol, referencedDeclaration, Visibilities.Public))
+                }
+            }
+        }
+    }
+
+    private fun KtExpression.containingDeclaration(): KtCallableDeclaration? {
+        val declaration = parentOfTypes(KtNamedFunction::class, KtProperty::class)
+            ?.safeAs<KtCallableDeclaration>()
+            ?.takeIf { it.hasModifier(KtTokens.INLINE_KEYWORD) }
+        return declaration?.takeIf { it.name != null }
+    }
+
+    context(KaSession)
+    private fun createChangeVisibilityFixOnInvisibleReference(
+        element: PsiElement,
+        visibility: Visibility,
+        reference: KaSymbol,
+        declaration: KtDeclaration? = reference.psi as? KtDeclaration
+    ): List<ChangeVisibilityModCommandAction> {
+        if (declaration == null) return emptyList()
+
+        if (declaration.hasModifier(KtTokens.SEALED_KEYWORD) && reference is KaClassSymbol) return emptyList()
+
+        val targetVisibilities = when (visibility) {
+            Visibilities.Private, Visibilities.InvisibleFake -> buildList<Visibility> {
+                this += Visibilities.Public
+                if (declaration.module == element.module) this += Visibilities.Internal
+                (element as? KtElement)?.containingClass()?.let { containingClass ->
+                    val protectedAllowed = analyze(containingClass) {
+                        val classId =
+                            (reference as? KaClassSymbol)?.classId ?: ((reference as? KaNamedSymbol)?.containingSymbol as? KaClassSymbol)?.classId ?: return@analyze false
+                        (containingClass.symbol as? KaNamedClassSymbol)?.defaultType?.allSupertypes
+                            ?.mapNotNull { it.symbol?.classId }
+                            ?.filter { it != StandardClassIds.Any }
+                            ?.any { classId == it } == true
+                    }
+                    if (protectedAllowed) this += Visibilities.Protected
+                }
+            }
+            else -> listOf(Visibilities.Public)
+        }
+
+        return targetVisibilities.mapNotNull { createFixToTargetVisibility(reference, declaration, it) }
+    }
+
+    context(KaSession)
+    private fun createChangeVisibilityFixOnExposure(
+        element: PsiElement,
+        elementVisibility: EffectiveVisibility,
+        restrictingSymbol: KaSymbol,
+        restrictingVisibility: EffectiveVisibility,
+    ): List<ChangeVisibilityModCommandAction> {
+        val exposedVisibility = restrictingVisibility.toVisibility()
+        val userVisibility = elementVisibility.toVisibility()
+        val (targetUserVisibility, targetExposedVisibility) =
+            if (exposedVisibility.compareTo(userVisibility)?.let { it < 0 } == true) {
+                exposedVisibility to userVisibility
+            } else {
+                Visibilities.Private to Visibilities.Public
+            }
+
+        val userDeclaration = element.parentsWithSelf.firstOrNull { it is KtDeclaration && it !is KtTypeParameter } as? KtDeclaration
+        val exposedDeclaration = restrictingSymbol.psi
+        val protectedAllowed = exposedDeclaration?.parent == userDeclaration?.parent
+
+        val modCommandActions = arrayListOf<ChangeVisibilityModCommandAction>()
+
+        if (userDeclaration != null && !userDeclaration.isPrivate()) {
+            if ((restrictingSymbol as? KaDeclarationSymbol)?.isVisible(element) == true) {
+                addFixToTargetVisibility(
+                    symbol = restrictingSymbol,
+                    declaration = userDeclaration,
+                    targetVisibility = targetUserVisibility,
+                    boundVisibility = Visibilities.Private,
+                    protectedAllowed = protectedAllowed,
+                    modCommandActions = modCommandActions,
+                )
+            }
+        }
+
+        (restrictingSymbol.psi as? KtDeclaration)?.let {
+            addFixToTargetVisibility(
+                restrictingSymbol,
+                declaration = it,
+                targetVisibility = targetExposedVisibility,
+                boundVisibility = Visibilities.Public,
+                protectedAllowed = protectedAllowed,
+                modCommandActions = modCommandActions,
+            )
+        }
+
+        return modCommandActions
+    }
+
+    private fun addFixToTargetVisibility(
+        symbol: KaSymbol,
+        declaration: KtDeclaration,
+        targetVisibility: Visibility,
+        boundVisibility: Visibility,
+        protectedAllowed: Boolean,
+        modCommandActions: MutableList<ChangeVisibilityModCommandAction>
+    ) {
+        val possibleVisibilities = when (targetVisibility) {
+            Visibilities.Protected -> if (protectedAllowed) listOf(boundVisibility, Visibilities.Protected) else listOf(boundVisibility)
+            Visibilities.Internal -> listOf(boundVisibility, Visibilities.Internal)
+            boundVisibility -> listOf(boundVisibility)
+            else -> listOf()
+        }
+
+        possibleVisibilities.mapNotNullTo(modCommandActions) {
+            createFixToTargetVisibility(symbol, declaration, it)
+        }
+    }
+
+    private fun createFixToTargetVisibility(
+        symbol: KaSymbol,
+        declaration: KtDeclaration,
+        visibility: Visibility
+    ): ChangeVisibilityModCommandAction? {
+        val available: Boolean = when (visibility) {
+            Visibilities.Private -> declaration.canBePrivate()
+            Visibilities.Internal -> declaration.canBeInternal()
+            Visibilities.Protected -> declaration.canBeProtected()
+            Visibilities.Public -> declaration.canBePublic() && declaration.visibilityModifierType() != KtTokens.DEFAULT_VISIBILITY_KEYWORD
+            else -> false
+        }
+
+        if (!available) return null
+        var name = declaration.asDisplayableName(symbol) ?: return null
+
+        return when (visibility) {
+            Visibilities.Private -> ChangeToPrivateModCommandAction(declaration, name)
+            Visibilities.Internal -> ChangeToInternalModCommandAction(declaration, name)
+            Visibilities.Protected -> ChangeToProtectedModCommandAction(declaration, name)
+            Visibilities.Public -> ChangeToPublicModCommandAction(
+                declaration,
+                name,
+                forceUsingExplicitModifier = (declaration as? KtParameter)?.hasModifier(KtTokens.OVERRIDE_KEYWORD) == true
+            )
+
+            else -> null
+        }
+    }
+
+    private fun KtDeclaration.asDisplayableName(symbol: KaSymbol): String? {
+        return when (this) {
+            is KtPrimaryConstructor -> SpecialNames.INIT.asString()
+            is KtPropertyAccessor -> symbol.name?.asString()?.let {
+                when {
+                    isGetter() -> "<get-$it>"
+                    isSetter() -> "<set-$it>"
+                    else -> null
+                }
+            }
+            else -> name
+        }
+    }
+}
+

plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt

@@ -375,6 +375,21 @@ class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() {
         registerFactory(ChangeVisibilityFixFactories.noExplicitVisibilityInApiModeWarning)
         registerFactory(UseInheritedVisibilityFixFactories.cannotChangeAccessPrivilege)
         registerFactory(UseInheritedVisibilityFixFactories.cannotWeakenAccessPrivilege)
+        registerFactory(ChangeVisibilityFixFactories.exposedTypealiasExpandedType)
+        registerFactory(ChangeVisibilityFixFactories.exposedFunctionReturnType)
+        registerFactory(ChangeVisibilityFixFactories.exposedReceiverType)
+        registerFactory(ChangeVisibilityFixFactories.exposedPropertyType)
+        registerFactory(ChangeVisibilityFixFactories.exposedPropertyTypeInConstructorError)
+        registerFactory(ChangeVisibilityFixFactories.exposedPropertyTypeInConstructorWarning)
+        registerFactory(ChangeVisibilityFixFactories.exposedParameterType)
+        registerFactory(ChangeVisibilityFixFactories.exposedSuperInterface)
+        registerFactory(ChangeVisibilityFixFactories.exposedSuperClass)
+        registerFactory(ChangeVisibilityFixFactories.exposedTypeParameterBound)
+        registerFactory(ChangeVisibilityFixFactories.invisibleReference)
+        registerFactory(ChangeVisibilityFixFactories.invisibleSetter)
+        registerFactory(ChangeVisibilityFixFactories.superCallFromPublicInline)
+        registerFactory(ChangeVisibilityFixFactories.protectedCallFromPublicInlineError)
+        registerFactory(ChangeVisibilityFixFactories.nonPublicCallFromPublicInline)
     }
 
     private val other = KtQuickFixesListBuilder.registerPsiQuickFix {

plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java

@@ -6448,7 +6448,131 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
 
 
 
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../../../idea/tests/testData/quickfix/callFromPublicInline")
+    public abstract static class CallFromPublicInline extends AbstractHighLevelQuickFixTest {
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("../../../idea/tests/testData/quickfix/callFromPublicInline/nonPublic")
+        public static class NonPublic extends AbstractHighLevelQuickFixTest {
+            @java.lang.Override
+            @org.jetbrains.annotations.NotNull
+            public final KotlinPluginMode getPluginMode() {
+                return KotlinPluginMode.K2;
+            }
 
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            @TestMetadata("internalFunction.kt")
+            public void testInternalFunction() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction.kt");
+            }
+
+            @TestMetadata("internalFunction2.kt")
+            public void testInternalFunction2() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction2.kt");
+            }
+
+            @TestMetadata("internalFunction3.kt")
+            public void testInternalFunction3() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt");
+            }
+
+            @TestMetadata("privateProperty.kt")
+            public void testPrivateProperty() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty.kt");
+            }
+
+            @TestMetadata("privateProperty2.kt")
+            public void testPrivateProperty2() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty2.kt");
+            }
+
+            @TestMetadata("privateProperty3.kt")
+            public void testPrivateProperty3() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt");
+            }
+
+            @TestMetadata("reifiedTypeParameter.kt")
+            public void testReifiedTypeParameter() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/nonPublic/reifiedTypeParameter.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("../../../idea/tests/testData/quickfix/callFromPublicInline/protected")
+        public static class Protected extends AbstractHighLevelQuickFixTest {
+            @java.lang.Override
+            @org.jetbrains.annotations.NotNull
+            public final KotlinPluginMode getPluginMode() {
+                return KotlinPluginMode.K2;
+            }
+
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            @TestMetadata("infix.kt")
+            public void testInfix() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/protected/infix.kt");
+            }
+
+            @TestMetadata("protectedFunction.kt")
+            public void testProtectedFunction() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction.kt");
+            }
+
+            @TestMetadata("protectedFunction2.kt")
+            public void testProtectedFunction2() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction2.kt");
+            }
+
+            @TestMetadata("protectedFunction3.kt")
+            public void testProtectedFunction3() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt");
+            }
+
+            @TestMetadata("reifiedTypeParameter.kt")
+            public void testReifiedTypeParameter() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/protected/reifiedTypeParameter.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("../../../idea/tests/testData/quickfix/callFromPublicInline/super")
+        public static class Super extends AbstractHighLevelQuickFixTest {
+            @java.lang.Override
+            @org.jetbrains.annotations.NotNull
+            public final KotlinPluginMode getPluginMode() {
+                return KotlinPluginMode.K2;
+            }
+
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            @TestMetadata("reifiedTypeParameter.kt")
+            public void testReifiedTypeParameter() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/super/reifiedTypeParameter.kt");
+            }
+
+            @TestMetadata("superFunction.kt")
+            public void testSuperFunction() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/super/superFunction.kt");
+            }
+
+            @TestMetadata("superFunction2.kt")
+            public void testSuperFunction2() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/super/superFunction2.kt");
+            }
+
+            @TestMetadata("superFunction3.kt")
+            public void testSuperFunction3() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt");
+            }
+        }
+    }
 
 
 
@@ -6720,7 +6844,89 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
 
 
 
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../../../idea/tests/testData/quickfix/decreaseVisibility")
+    public static class DecreaseVisibility extends AbstractHighLevelQuickFixTest {
+        @java.lang.Override
+        @org.jetbrains.annotations.NotNull
+        public final KotlinPluginMode getPluginMode() {
+            return KotlinPluginMode.K2;
+        }
 
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("exposedParameterType.kt")
+        public void testExposedParameterType() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedParameterType.kt");
+        }
+
+        @TestMetadata("exposedPropertyType.kt")
+        public void testExposedPropertyType() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedPropertyType.kt");
+        }
+
+        @TestMetadata("exposedReceiverType.kt")
+        public void testExposedReceiverType() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedReceiverType.kt");
+        }
+
+        @TestMetadata("exposedReceiverTypeInternal.kt")
+        public void testExposedReceiverTypeInternal() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedReceiverTypeInternal.kt");
+        }
+
+        @TestMetadata("exposedReceiverTypePrivate.kt")
+        public void testExposedReceiverTypePrivate() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedReceiverTypePrivate.kt");
+        }
+
+        @TestMetadata("exposedReturnType.kt")
+        public void testExposedReturnType() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedReturnType.kt");
+        }
+
+        @TestMetadata("exposedSuperClass.kt")
+        public void testExposedSuperClass() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedSuperClass.kt");
+        }
+
+        @TestMetadata("exposedSuperClassProtectedBase.kt")
+        public void testExposedSuperClassProtectedBase() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedSuperClassProtectedBase.kt");
+        }
+
+        @TestMetadata("exposedSuperClassProtectedInAnother.kt")
+        public void testExposedSuperClassProtectedInAnother() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedSuperClassProtectedInAnother.kt");
+        }
+
+        @TestMetadata("exposedSuperInterface.kt")
+        public void testExposedSuperInterface() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedSuperInterface.kt");
+        }
+
+        @TestMetadata("exposedSuperInterfacePrivate.kt")
+        public void testExposedSuperInterfacePrivate() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedSuperInterfacePrivate.kt");
+        }
+
+        @TestMetadata("exposedTypeInAnnotation.kt")
+        public void testExposedTypeInAnnotation() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedTypeInAnnotation.kt");
+        }
+
+        @TestMetadata("exposedTypeParameterBound.kt")
+        public void testExposedTypeParameterBound() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedTypeParameterBound.kt");
+        }
+
+        @TestMetadata("exposedTypeParameterBoundNested.kt")
+        public void testExposedTypeParameterBoundNested() throws Exception {
+            runTest("../../../idea/tests/testData/quickfix/decreaseVisibility/exposedTypeParameterBoundNested.kt");
+        }
+    }
 
 
 
@@ -8182,7 +8388,202 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
 
 
 
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../../../idea/tests/testData/quickfix/increaseVisibility")
+    public abstract static class IncreaseVisibility extends AbstractHighLevelQuickFixTest {
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake")
+        public static class InvisibleFake extends AbstractHighLevelQuickFixTest {
+            @java.lang.Override
+            @org.jetbrains.annotations.NotNull
+            public final KotlinPluginMode getPluginMode() {
+                return KotlinPluginMode.K2;
+            }
 
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            @TestMetadata("methodToInternal.kt")
+            public void testMethodToInternal() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToInternal.kt");
+            }
+
+            @TestMetadata("methodToNotProtected.kt")
+            public void testMethodToNotProtected() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToNotProtected.kt");
+            }
+
+            @TestMetadata("methodToProtected.kt")
+            public void testMethodToProtected() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToProtected.kt");
+            }
+
+            @TestMetadata("methodToProtected2.kt")
+            public void testMethodToProtected2() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToProtected2.kt");
+            }
+
+            @TestMetadata("methodToPublic.kt")
+            public void testMethodToPublic() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToPublic.kt");
+            }
+
+            @TestMetadata("propertyToInternal.kt")
+            public void testPropertyToInternal() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToInternal.kt");
+            }
+
+            @TestMetadata("propertyToNotProtected.kt")
+            public void testPropertyToNotProtected() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToNotProtected.kt");
+            }
+
+            @TestMetadata("propertyToProtected.kt")
+            public void testPropertyToProtected() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToProtected.kt");
+            }
+
+            @TestMetadata("propertyToProtected2.kt")
+            public void testPropertyToProtected2() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToProtected2.kt");
+            }
+
+            @TestMetadata("propertyToPublic.kt")
+            public void testPropertyToPublic() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToPublic.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("../../../idea/tests/testData/quickfix/increaseVisibility")
+        public static class Uncategorized extends AbstractHighLevelQuickFixTest {
+            @java.lang.Override
+            @org.jetbrains.annotations.NotNull
+            public final KotlinPluginMode getPluginMode() {
+                return KotlinPluginMode.K2;
+            }
+
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            @TestMetadata("exposedParameterType.kt")
+            public void testExposedParameterType() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedParameterType.kt");
+            }
+
+            @TestMetadata("exposedParameterTypePublic.kt")
+            public void testExposedParameterTypePublic() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedParameterTypePublic.kt");
+            }
+
+            @TestMetadata("exposedPropertyType.kt")
+            public void testExposedPropertyType() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedPropertyType.kt");
+            }
+
+            @TestMetadata("exposedReceiverType.kt")
+            public void testExposedReceiverType() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedReceiverType.kt");
+            }
+
+            @TestMetadata("exposedReturnType.kt")
+            public void testExposedReturnType() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedReturnType.kt");
+            }
+
+            @TestMetadata("exposedSuperClass.kt")
+            public void testExposedSuperClass() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedSuperClass.kt");
+            }
+
+            @TestMetadata("exposedSuperClassProtectedBase.kt")
+            public void testExposedSuperClassProtectedBase() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedSuperClassProtectedBase.kt");
+            }
+
+            @TestMetadata("exposedSuperClassProtectedInAnother.kt")
+            public void testExposedSuperClassProtectedInAnother() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedSuperClassProtectedInAnother.kt");
+            }
+
+            @TestMetadata("exposedSuperClassProtectedInAnotherFromPrivate.kt")
+            public void testExposedSuperClassProtectedInAnotherFromPrivate() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedSuperClassProtectedInAnotherFromPrivate.kt");
+            }
+
+            @TestMetadata("exposedSuperInterface.kt")
+            public void testExposedSuperInterface() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedSuperInterface.kt");
+            }
+
+            @TestMetadata("exposedTypeParameterBound.kt")
+            public void testExposedTypeParameterBound() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBound.kt");
+            }
+
+            @TestMetadata("exposedTypeParameterBoundNested.kt")
+            public void testExposedTypeParameterBoundNested() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBoundNested.kt");
+            }
+
+            @TestMetadata("invalidSealedClassInheritance.kt")
+            public void testInvalidSealedClassInheritance() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/invalidSealedClassInheritance.kt");
+            }
+
+            @TestMetadata("overriddenProtectedMemberToPublicSingleFile.kt")
+            public void testOverriddenProtectedMemberToPublicSingleFile() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.kt");
+            }
+
+            @TestMetadata("privateEmptyPrimaryConstructorToPublic.kt")
+            public void testPrivateEmptyPrimaryConstructorToPublic() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/privateEmptyPrimaryConstructorToPublic.kt");
+            }
+
+            @TestMetadata("privateInFileExposesPrivateInFile.kt")
+            public void testPrivateInFileExposesPrivateInFile() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/privateInFileExposesPrivateInFile.kt");
+            }
+
+            @TestMetadata("privateMemberToInternalSingleFile.kt")
+            public void testPrivateMemberToInternalSingleFile() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/privateMemberToInternalSingleFile.kt");
+            }
+
+            @TestMetadata("privateMemberToInternalWithExposed.kt")
+            public void testPrivateMemberToInternalWithExposed() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/privateMemberToInternalWithExposed.kt");
+            }
+
+            @TestMetadata("privateMemberToPublicSingleFile.kt")
+            public void testPrivateMemberToPublicSingleFile() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt");
+            }
+
+            @TestMetadata("privateSealedClassInheritance.kt")
+            public void testPrivateSealedClassInheritance() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/privateSealedClassInheritance.kt");
+            }
+
+            @TestMetadata("privateSetterToInternal.kt")
+            public void testPrivateSetterToInternal() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/privateSetterToInternal.kt");
+            }
+
+            @TestMetadata("privateSetterToPublic.kt")
+            public void testPrivateSetterToPublic() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/privateSetterToPublic.kt");
+            }
+
+            @TestMetadata("protectedMemberToPublicSingleFile.kt")
+            public void testProtectedMemberToPublicSingleFile() throws Exception {
+                runTest("../../../idea/tests/testData/quickfix/increaseVisibility/protectedMemberToPublicSingleFile.kt");
+            }
+        }
+    }
 
 
 

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction.kt

@@ -8,4 +8,5 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction.kt.after

@@ -8,4 +8,5 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction2.kt

@@ -8,4 +8,5 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction2.kt.after

@@ -8,4 +8,5 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt

@@ -8,4 +8,6 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// TODO: KTIJ-30589
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt.after

@@ -8,4 +8,6 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// TODO: KTIJ-30589
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty.kt

@@ -8,4 +8,5 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty.kt.after

@@ -8,4 +8,5 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty2.kt

@@ -8,4 +8,5 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty2.kt.after

@@ -8,4 +8,5 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt

@@ -8,4 +8,6 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// TODO: KTIJ-30589
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt.after

@@ -8,4 +8,6 @@ class C {
         }
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// TODO: KTIJ-30589
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/infix.kt

@@ -8,4 +8,5 @@ open class A {
     }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/infix.kt.after

@@ -8,4 +8,5 @@ open class A {
     }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction.kt

@@ -7,4 +7,5 @@ open class Foo {
     }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction.kt.after

@@ -7,4 +7,5 @@ open class Foo {
     }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction2.kt

@@ -9,4 +9,5 @@ open class Foo {
         }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction2.kt.after

@@ -9,4 +9,5 @@ open class Foo {
         }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt

@@ -9,4 +9,6 @@ open class Foo {
         }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// TODO: KTIJ-30589
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt.after

@@ -9,4 +9,6 @@ open class Foo {
         }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// TODO: KTIJ-30589
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction.kt

@@ -8,4 +8,5 @@ open class Derived : Base() {
         <caret>super.baseFun("123")
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction.kt.after

@@ -8,4 +8,5 @@ open class Derived : Base() {
         super.baseFun("123")
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction2.kt

@@ -9,4 +9,5 @@ open class Derived : Base() {
             <caret>super.baseFun("123")
         }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction2.kt.after

@@ -9,4 +9,5 @@ open class Derived : Base() {
             super.baseFun("123")
         }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt

@@ -9,4 +9,6 @@ open class Derived : Base() {
             <caret>super.baseFun("123")
         }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// TODO: KTIJ-30589
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt.after

@@ -9,4 +9,6 @@ open class Derived : Base() {
             super.baseFun("123")
         }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
+// TODO: KTIJ-30589
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedPropertyType.kt

@@ -16,4 +16,5 @@ class First {
     val <caret>foo = Data(13)
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedPropertyType.kt.after

@@ -16,4 +16,5 @@ class First {
     private val foo = Data(13)
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedReceiverTypeInternal.kt

@@ -2,4 +2,5 @@
 internal class A
 
 fun <caret>A.foo() {}
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedReceiverTypeInternal.kt.after

@@ -2,4 +2,5 @@
 internal class A
 
 internal fun A.foo() {}
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedReceiverTypePrivate.kt

@@ -2,4 +2,5 @@
 internal class A
 
 fun <caret>A.foo() {}
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedReceiverTypePrivate.kt.after

@@ -2,4 +2,5 @@
 internal class A
 
 private fun A.foo() {}
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedReturnType.kt

@@ -14,4 +14,5 @@ class First {
     internal fun <caret>bar(x: Int) = Data(x)
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedReturnType.kt.after

@@ -14,4 +14,5 @@ class First {
     private fun bar(x: Int) = Data(x)
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedSuperClass.kt

@@ -12,4 +12,5 @@ class Outer {
 
     protected class First : <caret>Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedSuperClass.kt.after

@@ -12,4 +12,5 @@ class Outer {
 
     private class First : Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedSuperClassProtectedBase.kt

@@ -10,4 +10,5 @@ private open class Data(val x: Int)
 class Outer {
     protected class First : <caret>Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedSuperClassProtectedBase.kt.after

@@ -10,4 +10,5 @@ private open class Data(val x: Int)
 class Outer {
     private class First : Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedSuperClassProtectedInAnother.kt

@@ -12,4 +12,5 @@ class Other {
 class Another {
     protected class First : Other.<caret>Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedSuperClassProtectedInAnother.kt.after

@@ -12,4 +12,5 @@ class Other {
 class Another {
     private class First : Other.Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedSuperInterface.kt

@@ -15,4 +15,5 @@ internal class Outer {
 class Container {
     interface Derived : <caret>Base
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedSuperInterface.kt.after

@@ -15,4 +15,5 @@ internal class Outer {
 class Container {
     internal interface Derived : Base
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedSuperInterfacePrivate.kt

@@ -15,4 +15,5 @@ internal class Outer {
 class Container {
     interface Derived : <caret>Base
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedSuperInterfacePrivate.kt.after

@@ -15,4 +15,5 @@ internal class Outer {
 class Container {
     private interface Derived : Base
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPrivateFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPrivateModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedTypeParameterBound.kt

@@ -9,4 +9,5 @@
 internal open class InternalString
 
 class User<T : <caret>User<T, InternalString>, R>
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedTypeParameterBound.kt.after

@@ -9,4 +9,5 @@
 internal open class InternalString
 
 internal class User<T : User<T, InternalString>, R>
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedParameterType.kt

@@ -12,4 +12,5 @@ class Outer {
 class Generic<T>
 
 internal fun foo(<caret>arg: Generic<Outer.Nested>) {}
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedParameterType.kt.after

@@ -12,4 +12,5 @@ class Outer {
 class Generic<T>
 
 internal fun foo(arg: Generic<Outer.Nested>) {}
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedParameterTypePublic.kt

@@ -12,4 +12,5 @@ class Outer {
 class Generic<T>
 
 internal fun foo(<caret>arg: Generic<Outer.Nested>) {}
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedParameterTypePublic.kt.after

@@ -12,4 +12,5 @@ class Outer {
 class Generic<T>
 
 internal fun foo(arg: Generic<Outer.Nested>) {}
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedPropertyType.kt

@@ -16,4 +16,5 @@ class First {
     val <caret>foo = Data(13)
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedPropertyType.kt.after

@@ -16,4 +16,5 @@ class First {
     val foo = Data(13)
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedReceiverType.kt

@@ -11,4 +11,5 @@ abstract class My {
 
     abstract protected fun <caret>Receiver<Private>.foo()
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedReceiverType.kt.after

@@ -11,4 +11,5 @@ abstract class My {
 
     abstract protected fun Receiver<Private>.foo()
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedReturnType.kt

@@ -14,4 +14,5 @@ class First {
     internal fun <caret>bar(x: Int) = Data(x)
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedReturnType.kt.after

@@ -14,4 +14,5 @@ class First {
     internal fun bar(x: Int) = Data(x)
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedSuperClass.kt

@@ -12,4 +12,5 @@ class Outer {
 
     protected class First : <caret>Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedSuperClass.kt.after

@@ -12,4 +12,5 @@ class Outer {
 
     protected class First : Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedSuperClassProtectedBase.kt

@@ -10,4 +10,5 @@ private open class Data(val x: Int)
 class Outer {
     protected class First : <caret>Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedSuperClassProtectedBase.kt.after

@@ -10,4 +10,5 @@ open class Data(val x: Int)
 class Outer {
     protected class First : Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedSuperClassProtectedInAnother.kt

@@ -12,4 +12,5 @@ class Other {
 class Another {
     protected class First : Other.<caret>Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedSuperClassProtectedInAnother.kt.after

@@ -12,4 +12,5 @@ class Other {
 class Another {
     protected class First : Other.<caret>Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedSuperClassProtectedInAnotherFromPrivate.kt

@@ -7,4 +7,5 @@ class Other {
 class Another {
     protected class First : Other.<caret>Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedSuperClassProtectedInAnotherFromPrivate.kt.after

@@ -7,4 +7,5 @@ class Other {
 class Another {
     protected class First : Other.Data(42)
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedSuperInterface.kt

@@ -15,4 +15,6 @@ internal class Outer {
 class Container {
     interface Derived : <caret>Base
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// TODO: KT-69794
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedSuperInterface.kt.after

@@ -15,4 +15,6 @@ class Outer {
 class Container {
     interface Derived : Base
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// TODO: KT-69794
+/* IGNORE_K2 */

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBound.kt

@@ -9,4 +9,5 @@
 internal open class InternalString
 
 class User<T : <caret>User<T, InternalString>, R>
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBound.kt.after

@@ -9,4 +9,5 @@
 open class InternalString
 
 class User<T : User<T, InternalString>, R>
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBoundNested.kt

@@ -13,3 +13,4 @@ private class PrivateInFileClass<T : <caret>PrivateInFileClass.PrivateInnerClass
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBoundNested.kt.after

@@ -13,3 +13,4 @@ private class PrivateInFileClass<T : <caret>PrivateInFileClass.PrivateInnerClass
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToInternal.kt

@@ -10,4 +10,5 @@ class B : A() {
         <caret>doSth()
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToInternal.kt.after

@@ -10,4 +10,5 @@ class B : A() {
         doSth()
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToProtected.kt

@@ -10,4 +10,5 @@ class B : A() {
         <caret>doSth()
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToProtected.kt.after

@@ -10,4 +10,5 @@ class B : A() {
         doSth()
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToProtected2.kt

@@ -12,4 +12,5 @@ class C : B() {
         <caret>doSth()
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToProtected2.kt.after

@@ -12,4 +12,5 @@ class C : B() {
         doSth()
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToPublic.kt

@@ -10,4 +10,5 @@ class B : A() {
         <caret>doSth()
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/methodToPublic.kt.after

@@ -10,4 +10,5 @@ class B : A() {
         doSth()
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToInternal.kt

@@ -9,4 +9,5 @@ class B : A() {
         <caret>foo
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToInternal.kt.after

@@ -9,4 +9,5 @@ class B : A() {
         foo
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToProtected.kt

@@ -9,4 +9,5 @@ class B : A() {
         <caret>foo
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToProtected.kt.after

@@ -9,4 +9,5 @@ class B : A() {
         foo
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToProtected2.kt

@@ -11,4 +11,5 @@ class C : B() {
         <caret>foo
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToProtected2.kt.after

@@ -11,4 +11,5 @@ class C : B() {
         foo
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToProtectedFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToProtectedModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToPublic.kt

@@ -9,4 +9,5 @@ class B : A() {
         <caret>foo
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/invisibleFake/propertyToPublic.kt.after

@@ -9,4 +9,5 @@ class B : A() {
         foo
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.fir.kt

@@ -0,0 +1,12 @@
+// "Make 'x' public explicitly" "true"
+
+open class Base(protected open val x: Int)
+
+class First(override val x: Int) : Base(x)
+
+class Second(f: First) {
+    val y = f.<caret>x
+}
+
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.fir.kt.after

@@ -0,0 +1,12 @@
+// "Make 'x' public explicitly" "true"
+
+open class Base(protected open val x: Int)
+
+class First(public override val x: Int) : Base(x)
+
+class Second(f: First) {
+    val y = f.<caret>x
+}
+
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateEmptyPrimaryConstructorToPublic.fir.kt.after

@@ -0,0 +1,10 @@
+// "Make '<init>' public" "true"
+
+private class Marker()
+
+fun foo(): Any {
+    return Marker()
+}
+
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateEmptyPrimaryConstructorToPublic.kt

@@ -6,4 +6,5 @@ fun foo(): Any {
     return <caret>Marker()
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateEmptyPrimaryConstructorToPublic.kt.after

@@ -6,4 +6,5 @@ fun foo(): Any {
     return Marker()
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateInFileExposesPrivateInFile.kt

@@ -4,4 +4,5 @@ private interface I2 {
     private class Private
     fun <caret>pp() = Private()
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateInFileExposesPrivateInFile.kt.after

@@ -4,4 +4,5 @@ private interface I2 {
     class Private
     fun <caret>pp() = Private()
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateMemberToInternalSingleFile.kt

@@ -5,4 +5,5 @@ class Second(f: First) {
     val y = f.<caret>x
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateMemberToInternalSingleFile.kt.after

@@ -5,4 +5,5 @@ class Second(f: First) {
     val y = f.x
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToInternalFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToInternalModCommandAction

plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateMemberToPublicSingleFile.kt

@@ -5,4 +5,5 @@ class Second(f: First) {
     val y = f.<caret>x
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityFix$ChangeToPublicFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories$ChangeToPublicModCommandAction