From 5188b1b761fbfde0625830efc83ef48d3f123121 Mon Sep 17 00:00:00 2001 From: Andrey Cherkasov Date: Sat, 7 Sep 2024 21:33:30 +0400 Subject: [PATCH] [kotlin] Port RemoveModifierFixBase to K2 ^KTIJ-30589 GitOrigin-RevId: bdda9f47d4755d5cbba9cc9f0b0c82c67372d1dc --- .../fixes/CallFromPublicInlineFixFactories.kt | 42 +++++ .../fixes/ChangeVisibilityFixFactories.kt | 29 +--- .../fixes/KotlinK2QuickFixRegistrar.kt | 19 +++ .../fixes/HighLevelQuickFixTestGenerated.java | 157 ++++++++++++++++++ .../nonPublic/internalFunction3.kt | 3 +- .../nonPublic/internalFunction3.kt.after | 3 +- .../nonPublic/privateProperty3.kt | 3 +- .../nonPublic/privateProperty3.kt.after | 3 +- .../protected/protectedFunction3.kt | 3 +- .../protected/protectedFunction3.kt.after | 3 +- .../super/superFunction3.kt | 3 +- .../super/superFunction3.kt.after | 3 +- .../quickfix/modifiers/removeConst.kt | 4 +- .../quickfix/modifiers/removeConst.kt.after | 4 +- .../removeInnerForClassInInterface.kt | 4 +- .../removeInnerForClassInInterface.kt.after | 4 +- .../removeModifierFromForbiddenOperatorMod.kt | 4 +- ...eModifierFromForbiddenOperatorMod.kt.after | 4 +- .../removeModifierFromOperatorMod.kt | 4 +- .../removeModifierFromOperatorMod.kt.after | 4 +- .../removeModifierFromOperatorModAssign.kt | 4 +- ...moveModifierFromOperatorModAssign.kt.after | 4 +- .../nothingToOverride/removeOverride.kt | 2 +- .../nothingToOverride/removeOverride.kt.after | 2 +- .../quickfix/redundantConst/simple.kt | 3 +- .../quickfix/redundantConst/simple.kt.after | 3 +- .../testData/quickfix/redundantFun/simple.kt | 3 +- .../quickfix/redundantFun/simple.kt.after | 3 +- .../quickfix/redundantInline/function.kt | 3 +- .../redundantInline/function.kt.after | 3 +- .../quickfix/redundantLateinit/simple.kt | 3 +- .../redundantLateinit/simple.kt.after | 3 +- .../typeProjection/conflictingProjection.kt | 3 +- .../conflictingProjection.kt.after | 3 +- ...rojectionInImmediateArgumentToSupertype.kt | 3 +- ...ionInImmediateArgumentToSupertype.kt.after | 3 +- .../projectionOnNonClassTypeArgument1.kt | 3 +- ...projectionOnNonClassTypeArgument1.kt.after | 3 +- .../projectionOnNonClassTypeArgument2.kt | 3 +- ...projectionOnNonClassTypeArgument2.kt.after | 3 +- .../removeRedundantProjection1.kt | 3 +- .../removeRedundantProjection1.kt.after | 3 +- .../removeRedundantProjection2.kt | 3 +- .../removeRedundantProjection2.kt.after | 3 +- .../quickfix/typeProjection/removeVariance.kt | 3 +- .../typeProjection/removeVariance.kt.after | 3 +- .../lateinitWithConstructor.kt | 3 +- .../lateinitWithConstructor.kt.after | 3 +- .../unnecessaryLateinit/lateinitWithInit.kt | 3 +- .../lateinitWithInit.kt.after | 3 +- .../lateinitWithMultipleConstructors.kt | 3 +- .../lateinitWithMultipleConstructors.kt.after | 3 +- ...itWithMultipleConstructorsAndDelegation.kt | 3 +- ...MultipleConstructorsAndDelegation.kt.after | 3 +- .../lateinitWithMultipleInit.kt | 3 +- .../lateinitWithMultipleInit.kt.after | 3 +- .../secondaryConstructorDelegateItself.kt | 3 +- ...econdaryConstructorDelegateItself.kt.after | 3 +- .../codeinsight/GenerateK2QuickFixTests.kt | 12 +- 59 files changed, 326 insertions(+), 103 deletions(-) create mode 100644 plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/CallFromPublicInlineFixFactories.kt diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/CallFromPublicInlineFixFactories.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/CallFromPublicInlineFixFactories.kt new file mode 100644 index 000000000000..b599f4eaf458 --- /dev/null +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/CallFromPublicInlineFixFactories.kt @@ -0,0 +1,42 @@ +// 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.psi.PsiElement +import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic +import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinQuickFixFactory +import org.jetbrains.kotlin.idea.k2.codeinsight.fixes.ChangeVisibilityFixFactories.containingDeclaration +import org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +import org.jetbrains.kotlin.lexer.KtTokens +import org.jetbrains.kotlin.psi.KtCallableDeclaration +import org.jetbrains.kotlin.psi.KtExpression + +internal object CallFromPublicInlineFixFactories { + + val nonPublicCallFromPublicInlineFixFactory = KotlinQuickFixFactory.IntentionBased { diagnostic: KaFirDiagnostic.NonPublicCallFromPublicInline -> + listOfNotNull( + createFixIfAvailable(diagnostic.psi) + ) + } + + val protectedCallFromPublicInlineErrorFixFactory = KotlinQuickFixFactory.IntentionBased { diagnostic: KaFirDiagnostic.ProtectedCallFromPublicInlineError -> + listOfNotNull( + createFixIfAvailable(diagnostic.psi) + ) + } + + val superCallFromPublicInlineFixFactory = KotlinQuickFixFactory.IntentionBased { diagnostic: KaFirDiagnostic.SuperCallFromPublicInline -> + listOfNotNull( + createFixIfAvailable(diagnostic.psi) + ) + } + + private fun createFixIfAvailable(element: PsiElement?): RemoveModifierFixBase? { + val expression = element as? KtExpression ?: return null + val containingDeclaration = expression.containingDeclaration() ?: return null + if (containingDeclaration.hasReifiedTypeParameter()) return null + + return RemoveModifierFixBase(containingDeclaration, KtTokens.INLINE_KEYWORD, isRedundant = false) + } + + private fun KtCallableDeclaration.hasReifiedTypeParameter() = typeParameters.any { it.hasModifier(KtTokens.REIFIED_KEYWORD) } +} diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeVisibilityFixFactories.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeVisibilityFixFactories.kt index 13dbfd8268b3..8f735aaa0f2d 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeVisibilityFixFactories.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/ChangeVisibilityFixFactories.kt @@ -12,12 +12,8 @@ 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.* 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 @@ -26,29 +22,12 @@ 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.idea.codeinsight.utils.* 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.* import org.jetbrains.kotlin.psi.psiUtil.containingClass import org.jetbrains.kotlin.psi.psiUtil.isPrivate import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType @@ -260,7 +239,7 @@ object ChangeVisibilityFixFactories { } } - private fun KtExpression.containingDeclaration(): KtCallableDeclaration? { + internal fun KtExpression.containingDeclaration(): KtCallableDeclaration? { val declaration = parentOfTypes(KtNamedFunction::class, KtProperty::class) ?.safeAs() ?.takeIf { it.hasModifier(KtTokens.INLINE_KEYWORD) } diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt index 89d4746124bd..5137850062a1 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.idea.k2.codeinsight.fixes.imprt.ImportQuickFixFactor import org.jetbrains.kotlin.idea.k2.codeinsight.fixes.replaceWith.DeprecationFixFactory import org.jetbrains.kotlin.idea.k2.codeinsight.fixes.replaceWith.ReplaceProtectedToPublishedApiCallFixFactory import org.jetbrains.kotlin.idea.quickfix.* +import org.jetbrains.kotlin.lexer.KtTokens.* class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() { private val keywords = KtQuickFixesListBuilder.registerPsiQuickFix { @@ -22,6 +23,21 @@ class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() { registerPsiQuickFixes(KaFirDiagnostic.DeprecatedModifierPair::class, RemoveModifierFixBase.removeRedundantModifier) registerPsiQuickFixes(KaFirDiagnostic.TypeParametersInEnum::class, RemoveModifierFixBase.removeRedundantModifier) registerPsiQuickFixes(KaFirDiagnostic.NonAbstractFunctionWithNoBody::class, AddFunctionBodyFix, AddModifierFix.addAbstractModifier) + registerPsiQuickFixes(KaFirDiagnostic.ConflictingProjection::class, RemoveModifierFixBase.createRemoveProjectionFactory(false)) + registerPsiQuickFixes(KaFirDiagnostic.ProjectionInImmediateArgumentToSupertype::class, RemoveModifierFixBase.createRemoveProjectionFactory(false)) + registerPsiQuickFixes(KaFirDiagnostic.ProjectionOnNonClassTypeArgument::class, RemoveModifierFixBase.createRemoveModifierFromListOwnerPsiBasedFactory(IN_KEYWORD)) + registerPsiQuickFixes(KaFirDiagnostic.ProjectionOnNonClassTypeArgument::class, RemoveModifierFixBase.createRemoveModifierFromListOwnerPsiBasedFactory(OUT_KEYWORD)) + registerPsiQuickFixes(KaFirDiagnostic.RedundantProjection::class, RemoveModifierFixBase.createRemoveProjectionFactory(true)) + registerPsiQuickFixes(KaFirDiagnostic.VarianceOnTypeParameterNotAllowed::class, RemoveModifierFixBase.createRemoveVarianceFactory()) + registerPsiQuickFixes(KaFirDiagnostic.UnnecessaryLateinit::class, RemoveModifierFixBase.createRemoveModifierFromListOwnerPsiBasedFactory(LATEINIT_KEYWORD)) + registerPsiQuickFixes(KaFirDiagnostic.WrongModifierContainingDeclaration::class, RemoveModifierFixBase.removeNonRedundantModifier) + registerPsiQuickFixes(KaFirDiagnostic.NothingToOverride::class, RemoveModifierFixBase.createRemoveModifierFromListOwnerPsiBasedFactory(OVERRIDE_KEYWORD)) + registerPsiQuickFixes(KaFirDiagnostic.ForbiddenBinaryMod::class, RemoveModifierFixBase.createRemoveModifierFromListOwnerPsiBasedFactory(OPERATOR_KEYWORD)) + registerPsiQuickFixes(KaFirDiagnostic.NothingToInline::class, RemoveModifierFixBase.createRemoveModifierFromListOwnerPsiBasedFactory(INLINE_KEYWORD)) + registerPsiQuickFixes(KaFirDiagnostic.ConstValNotTopLevelOrObject::class, RemoveModifierFixBase.createRemoveModifierFromListOwnerPsiBasedFactory(CONST_KEYWORD)) + registerPsiQuickFixes(KaFirDiagnostic.FunInterfaceWrongCountOfAbstractMembers::class, RemoveModifierFixBase.createRemoveModifierFromListOwnerPsiBasedFactory(FUN_KEYWORD)) + registerPsiQuickFixes(KaFirDiagnostic.TypeCantBeUsedForConstVal::class, RemoveModifierFixBase.createRemoveModifierFromListOwnerPsiBasedFactory(CONST_KEYWORD)) + registerPsiQuickFixes(KaFirDiagnostic.InapplicableLateinitModifier::class, RemoveModifierFixBase.createRemoveModifierFromListOwnerPsiBasedFactory(LATEINIT_KEYWORD)) registerPsiQuickFixes( KaFirDiagnostic.AbstractPropertyInNonAbstractClass::class, @@ -150,6 +166,9 @@ class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() { registerFactory(ConvertClassToKClassFixFactories.InitializerTypeMismatchFixFactory) registerFactory(ConvertClassToKClassFixFactories.AssignmentTypeMismatchFixFactory) registerFactory(ValReassignmentFixFactories.assignToPropertyFixFactory) + registerFactory(CallFromPublicInlineFixFactories.nonPublicCallFromPublicInlineFixFactory) + registerFactory(CallFromPublicInlineFixFactories.protectedCallFromPublicInlineErrorFixFactory) + registerFactory(CallFromPublicInlineFixFactories.superCallFromPublicInlineFixFactory) } private val addAbstract = KtQuickFixesListBuilder.registerPsiQuickFix { diff --git a/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java b/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java index 8831612d5c2a..fbb032ad60a6 100644 --- a/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java +++ b/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/HighLevelQuickFixTestGenerated.java @@ -10000,13 +10000,81 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/redundantConst") + public static class RedundantConst 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("simple.kt") + public void testSimple() throws Exception { + runTest("../../../idea/tests/testData/quickfix/redundantConst/simple.kt"); + } + } + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/redundantFun") + public static class RedundantFun 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("simple.kt") + public void testSimple() throws Exception { + runTest("../../../idea/tests/testData/quickfix/redundantFun/simple.kt"); + } + } + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/redundantInline") + public static class RedundantInline 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("function.kt") + public void testFunction() throws Exception { + runTest("../../../idea/tests/testData/quickfix/redundantInline/function.kt"); + } + } + + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/redundantLateinit") + public static class RedundantLateinit 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("simple.kt") + public void testSimple() throws Exception { + runTest("../../../idea/tests/testData/quickfix/redundantLateinit/simple.kt"); + } + } @@ -11007,9 +11075,98 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu } } + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/typeProjection") + public static class TypeProjection 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("conflictingProjection.kt") + public void testConflictingProjection() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeProjection/conflictingProjection.kt"); + } + @TestMetadata("projectionInImmediateArgumentToSupertype.kt") + public void testProjectionInImmediateArgumentToSupertype() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt"); + } + + @TestMetadata("projectionOnNonClassTypeArgument1.kt") + public void testProjectionOnNonClassTypeArgument1() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt"); + } + + @TestMetadata("projectionOnNonClassTypeArgument2.kt") + public void testProjectionOnNonClassTypeArgument2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt"); + } + + @TestMetadata("removeRedundantProjection1.kt") + public void testRemoveRedundantProjection1() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeProjection/removeRedundantProjection1.kt"); + } + + @TestMetadata("removeRedundantProjection2.kt") + public void testRemoveRedundantProjection2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeProjection/removeRedundantProjection2.kt"); + } + + @TestMetadata("removeVariance.kt") + public void testRemoveVariance() throws Exception { + runTest("../../../idea/tests/testData/quickfix/typeProjection/removeVariance.kt"); + } + } + + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/unnecessaryLateinit") + public static class UnnecessaryLateinit 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("lateinitWithConstructor.kt") + public void testLateinitWithConstructor() throws Exception { + runTest("../../../idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithConstructor.kt"); + } + + @TestMetadata("lateinitWithInit.kt") + public void testLateinitWithInit() throws Exception { + runTest("../../../idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithInit.kt"); + } + + @TestMetadata("lateinitWithMultipleConstructors.kt") + public void testLateinitWithMultipleConstructors() throws Exception { + runTest("../../../idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructors.kt"); + } + + @TestMetadata("lateinitWithMultipleConstructorsAndDelegation.kt") + public void testLateinitWithMultipleConstructorsAndDelegation() throws Exception { + runTest("../../../idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructorsAndDelegation.kt"); + } + + @TestMetadata("lateinitWithMultipleInit.kt") + public void testLateinitWithMultipleInit() throws Exception { + runTest("../../../idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleInit.kt"); + } + + @TestMetadata("secondaryConstructorDelegateItself.kt") + public void testSecondaryConstructorDelegateItself() throws Exception { + runTest("../../../idea/tests/testData/quickfix/unnecessaryLateinit/secondaryConstructorDelegateItself.kt"); + } + } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt index aae9b990e773..ac5069979839 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt @@ -9,5 +9,4 @@ class C { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase -// TODO: KTIJ-30589 -/* IGNORE_K2 */ \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt.after index a35cb31d6107..cdbb55c76430 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/internalFunction3.kt.after @@ -9,5 +9,4 @@ class C { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase -// TODO: KTIJ-30589 -/* IGNORE_K2 */ \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt index da2f60292942..0f3a45fb0538 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt @@ -9,5 +9,4 @@ class C { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase -// TODO: KTIJ-30589 -/* IGNORE_K2 */ \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt.after index 1a93a6010f99..9ca1dc8ebc3a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/nonPublic/privateProperty3.kt.after @@ -9,5 +9,4 @@ class C { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase -// TODO: KTIJ-30589 -/* IGNORE_K2 */ \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt index 30fe3f0b6717..1e4d28a77cff 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt @@ -10,5 +10,4 @@ open class Foo { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase -// TODO: KTIJ-30589 -/* IGNORE_K2 */ \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt.after index 51c841e30fe4..dd4be6cc4cac 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/protected/protectedFunction3.kt.after @@ -10,5 +10,4 @@ open class Foo { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase -// TODO: KTIJ-30589 -/* IGNORE_K2 */ \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt index 07444c817ba9..b94c802c20f1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt @@ -10,5 +10,4 @@ open class Derived : Base() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase -// TODO: KTIJ-30589 -/* IGNORE_K2 */ \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt.after index c1df0b01583d..416bbee58476 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/callFromPublicInline/super/superFunction3.kt.after @@ -10,5 +10,4 @@ open class Derived : Base() { } } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase -// TODO: KTIJ-30589 -/* IGNORE_K2 */ \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt index 1087bb16c4c8..92e94cad17a1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt @@ -5,5 +5,5 @@ class Foo object Test { const val c = Foo() } -/* IGNORE_K2 */ -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt.after index d6a3585b257e..8007a8600ca6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt.after @@ -5,5 +5,5 @@ class Foo object Test { val c = Foo() } -/* IGNORE_K2 */ -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt index 6b5b9bb39e35..0eae381cf3b6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt @@ -3,5 +3,5 @@ interface A { inner class B } -/* IGNORE_K2 */ -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt.after index 54bba89bab4c..42cfd52720f0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt.after @@ -3,5 +3,5 @@ interface A { class B } -/* IGNORE_K2 */ -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt index 95d5b971f0cd..beedbdbb629e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt @@ -4,5 +4,5 @@ object A { operator fun mod(x: Int) {} } -/* IGNORE_K2 */ -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after index a0cb0ba8384f..941f5236dd7b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after @@ -4,5 +4,5 @@ object A { fun mod(x: Int) {} } -/* IGNORE_K2 */ -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt index a768dd82c086..6b356935d106 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt @@ -3,5 +3,5 @@ object A { operator fun mod(x: Int) {} } -/* IGNORE_K2 */ -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after index c93700c0b8ea..0ea98c330219 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after @@ -3,5 +3,5 @@ object A { fun mod(x: Int) {} } -/* IGNORE_K2 */ -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt index d7a4dd97e1ba..6ad81ca84ef5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt @@ -3,5 +3,5 @@ object A { operator fun modAssign(x: Int) {} } -/* IGNORE_K2 */ -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after index e7c3ab72fb54..e908b57129ff 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after @@ -3,5 +3,5 @@ object A { fun modAssign(x: Int) {} } -/* IGNORE_K2 */ -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeOverride.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeOverride.kt index 23f047c5520c..af31d055b342 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeOverride.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeOverride.kt @@ -4,4 +4,4 @@ class A() { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase -/* IGNORE_K2 */ \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeOverride.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeOverride.kt.after index 6324515798da..c49b61430548 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeOverride.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeOverride.kt.after @@ -4,4 +4,4 @@ class A() { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase -/* IGNORE_K2 */ \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/redundantConst/simple.kt b/plugins/kotlin/idea/tests/testData/quickfix/redundantConst/simple.kt index 57f354079a75..a95de9a62bba 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/redundantConst/simple.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/redundantConst/simple.kt @@ -2,4 +2,5 @@ class Foo { const val s = "s" } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/redundantConst/simple.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/redundantConst/simple.kt.after index 1fefc94fff0d..4fef1449fbea 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/redundantConst/simple.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/redundantConst/simple.kt.after @@ -2,4 +2,5 @@ class Foo { val s = "s" } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/redundantFun/simple.kt b/plugins/kotlin/idea/tests/testData/quickfix/redundantFun/simple.kt index 6a2f7ca17ba4..327c1b31b3b1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/redundantFun/simple.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/redundantFun/simple.kt @@ -1,3 +1,4 @@ // "Remove 'fun' modifier" "true" fun interface WrongFunFace -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/redundantFun/simple.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/redundantFun/simple.kt.after index 85be750676a5..92d952f28a92 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/redundantFun/simple.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/redundantFun/simple.kt.after @@ -1,3 +1,4 @@ // "Remove 'fun' modifier" "true" interface WrongFunFace -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/redundantInline/function.kt b/plugins/kotlin/idea/tests/testData/quickfix/redundantInline/function.kt index 8984ef176ee3..08c84743563a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/redundantInline/function.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/redundantInline/function.kt @@ -1,3 +1,4 @@ // "Remove 'inline' modifier" "true" inline fun test() {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/redundantInline/function.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/redundantInline/function.kt.after index 3f0de7a6299c..8c6d6d34913f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/redundantInline/function.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/redundantInline/function.kt.after @@ -1,3 +1,4 @@ // "Remove 'inline' modifier" "true" fun test() {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/redundantLateinit/simple.kt b/plugins/kotlin/idea/tests/testData/quickfix/redundantLateinit/simple.kt index 1fe8b6bfbc18..b78bc6c975b4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/redundantLateinit/simple.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/redundantLateinit/simple.kt @@ -3,4 +3,5 @@ class Test { private lateinit var foo: String = "" } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/redundantLateinit/simple.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/redundantLateinit/simple.kt.after index 25d3675e3aa2..1f75b1fd2e7f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/redundantLateinit/simple.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/redundantLateinit/simple.kt.after @@ -3,4 +3,5 @@ class Test { private var foo: String = "" } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/conflictingProjection.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/conflictingProjection.kt index 6e73eed66f62..a07a1e92e6d5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/conflictingProjection.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/conflictingProjection.kt @@ -3,4 +3,5 @@ class Foo {} fun bar(x : Foo<in Any>) {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/conflictingProjection.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/conflictingProjection.kt.after index 705aaf6a4c97..95277fd0cdf0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/conflictingProjection.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/conflictingProjection.kt.after @@ -3,4 +3,5 @@ class Foo {} fun bar(x : Foo) {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt index c4f1ca2293f3..29f72a336048 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt @@ -3,4 +3,5 @@ interface A {} class B : A<in Int> {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt.after index 5ee1ede4d9d1..78551c8c3b50 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt.after @@ -3,4 +3,5 @@ interface A {} class B : A {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt index e5aa6abf240f..e939a2971f9f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt @@ -5,4 +5,5 @@ fun bar() { foo<out Int>(44) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after index 296f5057f5d4..8086974e11aa 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after @@ -5,4 +5,5 @@ fun bar() { foo(44) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt index 254af216f964..1b4ecfea9e43 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt @@ -5,4 +5,5 @@ class B { var foo = A<in Int>() } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt.after index e30cdd96edbf..87cadae634f9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt.after @@ -5,4 +5,5 @@ class B { var foo = A<Int>() } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection1.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection1.kt index 1845435939e3..06abbd745939 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection1.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection1.kt @@ -7,4 +7,5 @@ fun bar(x : Foo Any>) { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection1.kt.after index 9aa205cc13b8..e3e49ffff145 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection1.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection1.kt.after @@ -7,4 +7,5 @@ fun bar(x : Foo) { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection2.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection2.kt index b0841e8e840f..314d676a3252 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection2.kt @@ -7,4 +7,5 @@ fun bar(x : Foo Any>) { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection2.kt.after index eb948cf2c421..f0453a7cc97b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeRedundantProjection2.kt.after @@ -7,4 +7,5 @@ fun bar(x : Foo) { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt index adf3672f4dbe..5cc448825e35 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt @@ -1,3 +1,4 @@ // "Remove 'out' modifier" "true" fun String> foo() { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt.after index f9ba974fe6d0..cd4f4d03d71f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt.after @@ -1,3 +1,4 @@ // "Remove 'out' modifier" "true" fun foo() { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithConstructor.kt b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithConstructor.kt index 297a2a462258..d07127f71ef8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithConstructor.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithConstructor.kt @@ -8,4 +8,5 @@ class Foo { } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithConstructor.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithConstructor.kt.after index 21d7d0566efb..f28044a7296a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithConstructor.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithConstructor.kt.after @@ -8,4 +8,5 @@ class Foo { } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithInit.kt b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithInit.kt index 030c4b7bcb8c..92cd62e7a7dd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithInit.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithInit.kt @@ -7,4 +7,5 @@ class Foo { bar = "" } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithInit.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithInit.kt.after index 8792e769512b..0c9612730206 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithInit.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithInit.kt.after @@ -7,4 +7,5 @@ class Foo { bar = "" } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructors.kt b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructors.kt index 7ad2ba70e6c3..7767ddce89cc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructors.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructors.kt @@ -11,4 +11,5 @@ class Foo { bar = "" } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructors.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructors.kt.after index 2184a83d8ca7..847d6e90f60a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructors.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructors.kt.after @@ -11,4 +11,5 @@ class Foo { bar = "" } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructorsAndDelegation.kt b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructorsAndDelegation.kt index aecf57bbff23..366653f85bf9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructorsAndDelegation.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructorsAndDelegation.kt @@ -13,4 +13,5 @@ class Foo { constructor(a: Int, b: Int) : this(a) { } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructorsAndDelegation.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructorsAndDelegation.kt.after index 1299435d4d20..56ec00f885ae 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructorsAndDelegation.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleConstructorsAndDelegation.kt.after @@ -13,4 +13,5 @@ class Foo { constructor(a: Int, b: Int) : this(a) { } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleInit.kt b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleInit.kt index 8b9af0a51e78..99e4a793c3bf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleInit.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleInit.kt @@ -12,4 +12,5 @@ class Foo { bar = "" } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleInit.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleInit.kt.after index 8743cd6748ae..187cfcb477be 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleInit.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/lateinitWithMultipleInit.kt.after @@ -12,4 +12,5 @@ class Foo { bar = "" } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/secondaryConstructorDelegateItself.kt b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/secondaryConstructorDelegateItself.kt index 13cd54579441..cfd966d1a7f9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/secondaryConstructorDelegateItself.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/secondaryConstructorDelegateItself.kt @@ -13,4 +13,5 @@ class Foo { } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/secondaryConstructorDelegateItself.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/secondaryConstructorDelegateItself.kt.after index 5f601a75cfef..d894ba9617df 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/secondaryConstructorDelegateItself.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/unnecessaryLateinit/secondaryConstructorDelegateItself.kt.after @@ -13,4 +13,5 @@ class Foo { } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase \ No newline at end of file diff --git a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2QuickFixTests.kt b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2QuickFixTests.kt index b24e43128b0c..54fd28d6d974 100644 --- a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2QuickFixTests.kt +++ b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2QuickFixTests.kt @@ -153,10 +153,10 @@ internal fun MutableTWorkspace.generateK2FixTests() { model("$idea/quickfix/primitiveCastToConversion", pattern = pattern) model("$idea/quickfix/properties", pattern = pattern) model("$idea/quickfix/protectedInFinal", pattern = pattern, isIgnored = true) - model("$idea/quickfix/redundantConst", pattern = pattern, isIgnored = true) - model("$idea/quickfix/redundantFun", pattern = pattern, isIgnored = true) - model("$idea/quickfix/redundantInline", pattern = pattern, isIgnored = true) - model("$idea/quickfix/redundantLateinit", pattern = pattern, isIgnored = true) + model("$idea/quickfix/redundantConst", pattern = pattern) + model("$idea/quickfix/redundantFun", pattern = pattern) + model("$idea/quickfix/redundantInline", pattern = pattern) + model("$idea/quickfix/redundantLateinit", pattern = pattern) model("$idea/quickfix/redundantModalityModifier", pattern = pattern, isIgnored = true) model("$idea/quickfix/redundantSuspend", pattern = pattern, isIgnored = true) model("$idea/quickfix/redundantVisibilityModifier", pattern = pattern, isIgnored = true) @@ -196,8 +196,8 @@ internal fun MutableTWorkspace.generateK2FixTests() { model("$idea/quickfix/typeInferenceExpectedTypeMismatch", pattern = pattern) model("$idea/quickfix/typeOfAnnotationMember", pattern = pattern) model("$idea/quickfix/typeParameters", pattern = pattern) - model("$idea/quickfix/typeProjection", pattern = pattern, isIgnored = true) - model("$idea/quickfix/unnecessaryLateinit", pattern = pattern, isIgnored = true) + model("$idea/quickfix/typeProjection", pattern = pattern) + model("$idea/quickfix/unnecessaryLateinit", pattern = pattern) model("$idea/quickfix/unusedSuppressAnnotation", pattern = pattern, isIgnored = true) model("$idea/quickfix/useFullyqualifiedCall", pattern = pattern, isIgnored = true) model("$idea/quickfix/variables", pattern = pattern, isRecursive = false, isIgnored = true)