diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/IsEnumEntryFixFactory.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/IsEnumEntryFixFactory.kt index 2cc712ade408..c67e59108026 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/IsEnumEntryFixFactory.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/IsEnumEntryFixFactory.kt @@ -3,8 +3,8 @@ package org.jetbrains.kotlin.idea.k2.codeinsight.fixes 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.RemoveIsFix -import org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix +import org.jetbrains.kotlin.idea.quickfix.RemoveIsFromIsEnumEntryFix +import org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix import org.jetbrains.kotlin.psi.KtIsExpression import org.jetbrains.kotlin.psi.KtTypeReference import org.jetbrains.kotlin.psi.KtWhenConditionIsPattern @@ -17,8 +17,8 @@ internal object IsEnumEntryFixFactory { listOfNotNull( when (element) { - is KtIsExpression -> if (element.typeReference == null) null else ReplaceWithComparisonFix(element) - is KtWhenConditionIsPattern -> if (element.typeReference == null || element.isNegated) null else RemoveIsFix(element) + is KtIsExpression -> if (element.typeReference == null) null else ReplaceIsEnumEntryWithComparisonFix(element) + is KtWhenConditionIsPattern -> if (element.typeReference == null || element.isNegated) null else RemoveIsFromIsEnumEntryFix(element) else -> null } ) diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveIsFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveIsFromIsEnumEntryFix.kt similarity index 96% rename from plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveIsFix.kt rename to plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveIsFromIsEnumEntryFix.kt index d3cd060a8c1f..6f5d81f48a0a 100644 --- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveIsFix.kt +++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveIsFromIsEnumEntryFix.kt @@ -8,7 +8,7 @@ import org.jetbrains.kotlin.idea.codeinsight.api.applicable.intentions.KotlinPsi import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtWhenConditionIsPattern -class RemoveIsFix( +class RemoveIsFromIsEnumEntryFix( element: KtWhenConditionIsPattern, ) : KotlinPsiUpdateModCommandAction.ElementBased(element, Unit) { diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithComparisonFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ReplaceIsEnumEntryWithComparisonFix.kt similarity index 96% rename from plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithComparisonFix.kt rename to plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ReplaceIsEnumEntryWithComparisonFix.kt index 233c9282010d..a7345277c6f8 100644 --- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithComparisonFix.kt +++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ReplaceIsEnumEntryWithComparisonFix.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.psi.KtIsExpression import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.createExpressionByPattern -class ReplaceWithComparisonFix( +class ReplaceIsEnumEntryWithComparisonFix( element: KtIsExpression, ) : KotlinPsiUpdateModCommandAction.ElementBased(element, Unit) { private val comparison = if (element.isNegated) "!=" else "==" diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/IsEnumEntryFactory.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/IsEnumEntryFactory.kt index 166e18c4cee9..d7316a1745f2 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/IsEnumEntryFactory.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/IsEnumEntryFactory.kt @@ -10,8 +10,8 @@ object IsEnumEntryFactory : KotlinSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { val element = diagnostic.psiElement.safeAs()?.parent ?: return null return when (element) { - is KtIsExpression -> if (element.typeReference == null) null else ReplaceWithComparisonFix(element).asIntention() - is KtWhenConditionIsPattern -> if (element.typeReference == null || element.isNegated) null else RemoveIsFix(element).asIntention() + is KtIsExpression -> if (element.typeReference == null) null else ReplaceIsEnumEntryWithComparisonFix(element).asIntention() + is KtWhenConditionIsPattern -> if (element.typeReference == null || element.isNegated) null else RemoveIsFromIsEnumEntryFix(element).asIntention() else -> null } } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/is.kt b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/is.kt index ff6a046bca06..90909dd05e0c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/is.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/is.kt @@ -3,5 +3,5 @@ enum class Foo { A } fun test(foo: Foo): Boolean = foo is Foo.A -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/is.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/is.kt.after index e6a1efaee1c5..a61c66361d96 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/is.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/is.kt.after @@ -3,5 +3,5 @@ enum class Foo { A } fun test(foo: Foo): Boolean = foo == Foo.A -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/isWhenCondition.kt b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/isWhenCondition.kt index 3a89d12f9673..5c029b8a9300 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/isWhenCondition.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/isWhenCondition.kt @@ -6,5 +6,5 @@ fun test(foo: Foo): Int = when (foo) { else -> 2 } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFromIsEnumEntryFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFromIsEnumEntryFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/isWhenCondition.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/isWhenCondition.kt.after index 9a53e1c18447..a409607b3d1d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/isWhenCondition.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/isWhenCondition.kt.after @@ -6,5 +6,5 @@ fun test(foo: Foo): Int = when (foo) { else -> 2 } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFromIsEnumEntryFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFromIsEnumEntryFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/notIs.kt b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/notIs.kt index 1d662a7515b8..3e7e6613fb78 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/notIs.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/notIs.kt @@ -3,5 +3,5 @@ enum class Foo { A } fun test(foo: Foo): Boolean = foo !is Foo.A -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/notIs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/notIs.kt.after index 1d51edab6d28..a7817b66039c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/notIs.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/notIs.kt.after @@ -3,5 +3,5 @@ enum class Foo { A } fun test(foo: Foo): Boolean = foo != Foo.A -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix \ No newline at end of file