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 16b0fd0d9516..6d0cf574ff5e 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 @@ -138,8 +138,6 @@ class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() { registerFactory(ChangeAccessorTypeFixFactory.wrongGetterReturnTypeFactory) registerFactory(ChangeAccessorTypeFixFactory.wrongSetterParameterTypeFactory) registerFactory(LiftAssignmentOutOfTryFixFactory.liftAssignmentOutOfTryFix) - registerFactory(RenameModToRemFixFactory.deprecatedBinaryModFactory) - registerFactory(RenameModToRemFixFactory.forbiddenBinaryModFactory) registerFactory(KaFirDiagnostic.UnresolvedLabel::class, CreateLabelFixFactories.unresolvedLabelFactory) registerFactory(KaFirDiagnostic.NotALoopLabel::class, CreateLabelFixFactories.notALoopLabelFactory) registerFactory(AddDefaultConstructorFixFactory.addDefaultConstructorFixFactory) diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/RenameModToRemFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/RenameModToRemFixFactory.kt deleted file mode 100644 index 4b940293c016..000000000000 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/RenameModToRemFixFactory.kt +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.kotlin.idea.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.quickfix.RenameModToRemFix -import org.jetbrains.kotlin.psi.KtNamedFunction -import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.kotlin.types.expressions.OperatorConventions.REM_TO_MOD_OPERATION_NAMES - -internal object RenameModToRemFixFactory { - - val deprecatedBinaryModFactory = KotlinQuickFixFactory.IntentionBased { diagnostic: KaFirDiagnostic.DeprecatedBinaryMod -> - createQuickFix(diagnostic.psi) - } - - val forbiddenBinaryModFactory = KotlinQuickFixFactory.IntentionBased { diagnostic: KaFirDiagnostic.ForbiddenBinaryMod -> - createQuickFix(diagnostic.psi) - } - - private fun createQuickFix(element: PsiElement): List { - val operatorMod = element.getNonStrictParentOfType() ?: return emptyList() - val newName = operatorMod.nameAsName?.let { REM_TO_MOD_OPERATION_NAMES.inverse()[it] } ?: return emptyList() - - return listOf( - RenameModToRemFix(operatorMod, newName) - ) - } -} 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 2200c886540e..db76fc722f14 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 @@ -1912,21 +1912,6 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu runTest("../../../idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt"); } - @TestMetadata("removeModifierFromForbiddenOperatorMod.kt") - public void testRemoveModifierFromForbiddenOperatorMod() throws Exception { - runTest("../../../idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt"); - } - - @TestMetadata("removeModifierFromOperatorMod.kt") - public void testRemoveModifierFromOperatorMod() throws Exception { - runTest("../../../idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt"); - } - - @TestMetadata("removeModifierFromOperatorModAssign.kt") - public void testRemoveModifierFromOperatorModAssign() throws Exception { - runTest("../../../idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt"); - } - @TestMetadata("removeProtectedModifier.kt") public void testRemoveProtectedModifier() throws Exception { runTest("../../../idea/tests/testData/quickfix/modifiers/removeProtectedModifier.kt"); @@ -10684,36 +10669,8 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../../idea/tests/testData/quickfix/renameToRem") - public static class RenameToRem extends AbstractHighLevelQuickFixTest { - @java.lang.Override - @org.jetbrains.annotations.NotNull - public final KotlinPluginMode getPluginMode() { - return KotlinPluginMode.K2; - } + public abstract static class RenameToRem extends AbstractHighLevelQuickFixTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - @TestMetadata("forbiddenModAsMember.kt") - public void testForbiddenModAsMember() throws Exception { - runTest("../../../idea/tests/testData/quickfix/renameToRem/forbiddenModAsMember.kt"); - } - - @TestMetadata("modAsExtension.kt") - public void testModAsExtension() throws Exception { - runTest("../../../idea/tests/testData/quickfix/renameToRem/modAsExtension.kt"); - } - - @TestMetadata("modAsMember.kt") - public void testModAsMember() throws Exception { - runTest("../../../idea/tests/testData/quickfix/renameToRem/modAsMember.kt"); - } - - @TestMetadata("modAssignAsMember.kt") - public void testModAssignAsMember() throws Exception { - runTest("../../../idea/tests/testData/quickfix/renameToRem/modAssignAsMember.kt"); - } } diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index 41576e8f982c..185ff062e00e 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -152,10 +152,6 @@ class QuickFixRegistrar : QuickFixContributor { NON_PRIVATE_CONSTRUCTOR_IN_SEALED.registerFactory(RemoveModifierFixBase.removeNonRedundantModifier) NON_PRIVATE_OR_PROTECTED_CONSTRUCTOR_IN_SEALED.registerFactory(RemoveModifierFixBase.removeNonRedundantModifier) TYPE_CANT_BE_USED_FOR_CONST_VAL.registerFactory(RemoveModifierFixBase.removeNonRedundantModifier) - DEPRECATED_BINARY_MOD.registerFactory(RemoveModifierFixBase.removeNonRedundantModifier) - DEPRECATED_BINARY_MOD.registerFactory(RenameModToRemFixFactory) - FORBIDDEN_BINARY_MOD.registerFactory(RemoveModifierFixBase.removeNonRedundantModifier) - FORBIDDEN_BINARY_MOD.registerFactory(RenameModToRemFixFactory) NO_EXPLICIT_VISIBILITY_IN_API_MODE.registerFactory(ChangeVisibilityFix.SetExplicitVisibilityFactory) NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING.registerFactory(ChangeVisibilityFix.SetExplicitVisibilityFactory) diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameModToRemFixFactory.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameModToRemFixFactory.kt deleted file mode 100644 index 7c5edb172110..000000000000 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameModToRemFixFactory.kt +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -package org.jetbrains.kotlin.idea.quickfix - -import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.kotlin.diagnostics.Diagnostic -import org.jetbrains.kotlin.diagnostics.Errors -import org.jetbrains.kotlin.psi.KtNamedFunction -import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.kotlin.types.expressions.OperatorConventions.REM_TO_MOD_OPERATION_NAMES - -internal object RenameModToRemFixFactory : KotlinSingleIntentionActionFactory() { - override fun createAction(diagnostic: Diagnostic): IntentionAction? { - if (diagnostic.factory != Errors.DEPRECATED_BINARY_MOD && diagnostic.factory != Errors.FORBIDDEN_BINARY_MOD) return null - - val operatorMod = diagnostic.psiElement.getNonStrictParentOfType() ?: return null - val newName = operatorMod.nameAsName?.let { REM_TO_MOD_OPERATION_NAMES.inverse()[it] } ?: return null - return RenameModToRemFix(operatorMod, newName) - } -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java index 2af6e0d444e0..7b7040ad05dc 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java @@ -11646,21 +11646,6 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest { runTest("testData/quickfix/modifiers/removeInnerForClassInInterface.kt"); } - @TestMetadata("removeModifierFromForbiddenOperatorMod.kt") - public void testRemoveModifierFromForbiddenOperatorMod() throws Exception { - runTest("testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt"); - } - - @TestMetadata("removeModifierFromOperatorMod.kt") - public void testRemoveModifierFromOperatorMod() throws Exception { - runTest("testData/quickfix/modifiers/removeModifierFromOperatorMod.kt"); - } - - @TestMetadata("removeModifierFromOperatorModAssign.kt") - public void testRemoveModifierFromOperatorModAssign() throws Exception { - runTest("testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt"); - } - @TestMetadata("removeProtectedModifier.kt") public void testRemoveProtectedModifier() throws Exception { runTest("testData/quickfix/modifiers/removeProtectedModifier.kt"); @@ -14637,40 +14622,6 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest { } } - @RunWith(JUnit3RunnerWithInners.class) - @TestMetadata("testData/quickfix/renameToRem") - public static class RenameToRem extends AbstractK1QuickFixTest { - @java.lang.Override - @org.jetbrains.annotations.NotNull - public final KotlinPluginMode getPluginMode() { - return KotlinPluginMode.K1; - } - - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - @TestMetadata("forbiddenModAsMember.kt") - public void testForbiddenModAsMember() throws Exception { - runTest("testData/quickfix/renameToRem/forbiddenModAsMember.kt"); - } - - @TestMetadata("modAsExtension.kt") - public void testModAsExtension() throws Exception { - runTest("testData/quickfix/renameToRem/modAsExtension.kt"); - } - - @TestMetadata("modAsMember.kt") - public void testModAsMember() throws Exception { - runTest("testData/quickfix/renameToRem/modAsMember.kt"); - } - - @TestMetadata("modAssignAsMember.kt") - public void testModAssignAsMember() throws Exception { - runTest("testData/quickfix/renameToRem/modAssignAsMember.kt"); - } - } - @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("testData/quickfix/renameToUnderscore") public static class RenameToUnderscore extends AbstractK1QuickFixTest { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt deleted file mode 100644 index beedbdbb629e..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt +++ /dev/null @@ -1,8 +0,0 @@ -// "Remove 'operator' modifier" "true" -// COMPILER_ARGUMENTS: -XXLanguage:+ProhibitOperatorMod - -object A { - operator fun mod(x: Int) {} -} -// 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 deleted file mode 100644 index 941f5236dd7b..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after +++ /dev/null @@ -1,8 +0,0 @@ -// "Remove 'operator' modifier" "true" -// COMPILER_ARGUMENTS: -XXLanguage:+ProhibitOperatorMod - -object A { - fun mod(x: Int) {} -} -// 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 deleted file mode 100644 index 6b356935d106..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt +++ /dev/null @@ -1,7 +0,0 @@ -// "Remove 'operator' modifier" "true" - -object A { - operator fun mod(x: Int) {} -} -// 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 deleted file mode 100644 index 0ea98c330219..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after +++ /dev/null @@ -1,7 +0,0 @@ -// "Remove 'operator' modifier" "true" - -object A { - fun mod(x: Int) {} -} -// 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 deleted file mode 100644 index 6ad81ca84ef5..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt +++ /dev/null @@ -1,7 +0,0 @@ -// "Remove 'operator' modifier" "true" - -object A { - operator fun modAssign(x: Int) {} -} -// 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 deleted file mode 100644 index e908b57129ff..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after +++ /dev/null @@ -1,7 +0,0 @@ -// "Remove 'operator' modifier" "true" - -object A { - fun modAssign(x: Int) {} -} -// 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/renameToRem/forbiddenModAsMember.kt b/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/forbiddenModAsMember.kt deleted file mode 100644 index 5e5de4b41a14..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/forbiddenModAsMember.kt +++ /dev/null @@ -1,16 +0,0 @@ -// "Rename to 'rem'" "true" -// DISABLE-ERRORS -// COMPILER_ARGUMENTS: -XXLanguage:+ProhibitOperatorMod - -object Rem { - operator fun mod(x: Int) {} - operator fun modAssign(x: Int) {} -} - -fun test() { - Rem % 1 - Rem.mod(1) - Rem.modAssign(1) -} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/forbiddenModAsMember.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/forbiddenModAsMember.kt.after deleted file mode 100644 index 89813ac1d060..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/forbiddenModAsMember.kt.after +++ /dev/null @@ -1,16 +0,0 @@ -// "Rename to 'rem'" "true" -// DISABLE-ERRORS -// COMPILER_ARGUMENTS: -XXLanguage:+ProhibitOperatorMod - -object Rem { - operator fun rem(x: Int) {} - operator fun modAssign(x: Int) {} -} - -fun test() { - Rem % 1 - Rem.rem(1) - Rem.modAssign(1) -} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsExtension.kt b/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsExtension.kt deleted file mode 100644 index c88e73da4074..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsExtension.kt +++ /dev/null @@ -1,12 +0,0 @@ -// "Rename to 'rem'" "true" -// DISABLE-ERRORS - -object A -operator fun A.mod(x: Int) {} - -fun test() { - A.mod(3) - A % 2 -} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsExtension.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsExtension.kt.after deleted file mode 100644 index 909d2de604a9..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsExtension.kt.after +++ /dev/null @@ -1,12 +0,0 @@ -// "Rename to 'rem'" "true" -// DISABLE-ERRORS - -object A -operator fun A.rem(x: Int) {} - -fun test() { - A.rem(3) - A % 2 -} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsMember.kt b/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsMember.kt deleted file mode 100644 index 2c731020fa4f..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsMember.kt +++ /dev/null @@ -1,15 +0,0 @@ -// "Rename to 'rem'" "true" -// DISABLE-ERRORS - -object Rem { - operator fun mod(x: Int) {} - operator fun modAssign(x: Int) {} -} - -fun test() { - Rem % 1 - Rem.mod(1) - Rem.modAssign(1) -} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsMember.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsMember.kt.after deleted file mode 100644 index 5f9f69b248ab..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAsMember.kt.after +++ /dev/null @@ -1,15 +0,0 @@ -// "Rename to 'rem'" "true" -// DISABLE-ERRORS - -object Rem { - operator fun rem(x: Int) {} - operator fun modAssign(x: Int) {} -} - -fun test() { - Rem % 1 - Rem.rem(1) - Rem.modAssign(1) -} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAssignAsMember.kt b/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAssignAsMember.kt deleted file mode 100644 index a94876e0ee9e..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAssignAsMember.kt +++ /dev/null @@ -1,17 +0,0 @@ -// "Rename to 'remAssign'" "true" -// DISABLE-ERRORS - -object Rem { - operator fun mod(x: Int) {} - operator fun modAssign(x: Int) {} -} - -fun test() { - Rem % 1 - Rem.mod(1) - Rem.modAssign(1) - val c = Rem - c %= 1 -} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAssignAsMember.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAssignAsMember.kt.after deleted file mode 100644 index 8f31b5f4d013..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/renameToRem/modAssignAsMember.kt.after +++ /dev/null @@ -1,17 +0,0 @@ -// "Rename to 'remAssign'" "true" -// DISABLE-ERRORS - -object Rem { - operator fun mod(x: Int) {} - operator fun remAssign(x: Int) {} -} - -fun test() { - Rem % 1 - Rem.mod(1) - Rem.remAssign(1) - val c = Rem - c %= 1 -} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameModToRemFix \ No newline at end of file