MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Rename

Browse Source 
IJ-CR-141042
^KTIJ-29599
^KTIJ-29601

GitOrigin-RevId: 9544b34f08dabd5b3dac7ffdf21cdc20dfac6bdb
This commit is contained in:
Andrey Cherkasov
2024-07-29 20:31:02 +00:00
committed by intellij-monorepo-bot
parent 6e72accd1a
commit 60f3b8b6bc
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/IsEnumEntryFixFactory.kt
+4 -4
View File
@@ -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
}
)
plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveIsFix.kt → plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveIsFromIsEnumEntryFix.kt
+1 -1
View File
@@ -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<KtWhenConditionIsPattern, Unit>(element, Unit) {
plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithComparisonFix.kt → plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/ReplaceIsEnumEntryWithComparisonFix.kt
+1 -1
View File
@@ -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<KtIsExpression, Unit>(element, Unit) {
private val comparison = if (element.isNegated) "!=" else "=="
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/IsEnumEntryFactory.kt
+2 -2
View File
@@ -10,8 +10,8 @@ object IsEnumEntryFactory : KotlinSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): IntentionAction? {
val element = diagnostic.psiElement.safeAs<KtTypeReference>()?.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
}
}
plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/is.kt
+2 -2
View File
@@ -3,5 +3,5 @@ enum class Foo { A }
fun test(foo: Foo): Boolean = foo is <caret>Foo.A
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix
plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/is.kt.after
+2 -2
View File
@@ -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
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix
plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/isWhenCondition.kt
+2 -2
View File
@@ -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
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFromIsEnumEntryFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFromIsEnumEntryFix
plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/isWhenCondition.kt.after
+2 -2
View File
@@ -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
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFromIsEnumEntryFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveIsFromIsEnumEntryFix
plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/notIs.kt
+2 -2
View File
@@ -3,5 +3,5 @@ enum class Foo { A }
fun test(foo: Foo): Boolean = foo !is <caret>Foo.A
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithComparisonFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix
plugins/kotlin/idea/tests/testData/quickfix/isEnumEntry/notIs.kt.after
+2 -2
View File
@@ -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
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceIsEnumEntryWithComparisonFix