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] Port MoveWhenElseBranchFix to K2

Browse Source 
^KTIJ-29518

GitOrigin-RevId: 9a9b4c59ce3714c0c80a4ee3de54d1652d0ee91c
This commit is contained in:
Andrey Cherkasov
2024-07-24 21:13:14 +00:00
committed by intellij-monorepo-bot
parent afe0851840
commit 514b70a053
4 changed files with 24 additions and 4 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/KotlinK2QuickFixRegistrar.kt
+1
View File
@@ -127,6 +127,7 @@ class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() {
registerFactory(AddDefaultConstructorFixFactory.addDefaultConstructorFixFactory)
registerFactory(MakeClassAnAnnotationClassFixFactory.makeClassAnAnnotationClassFixFactory)
registerFactory(WrongLongSuffixFixFactory.changeToCorrectLongSuffix)
registerFactory(MoveWhenElseBranchFixFactory.moveWhenElseBranchFixFactory)
}
private val addAbstract = KtQuickFixesListBuilder.registerPsiQuickFix {
plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/MoveWhenElseBranchFixFactory.kt
+19
View File
@@ -0,0 +1,19 @@
// 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 org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic
import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinQuickFixFactory
import org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix
import org.jetbrains.kotlin.psi.KtWhenExpression
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
internal object MoveWhenElseBranchFixFactory {
val moveWhenElseBranchFixFactory = KotlinQuickFixFactory.IntentionBased { diagnostic: KaFirDiagnostic.ElseMisplacedInWhen ->
val whenExpression = diagnostic.psi.getNonStrictParentOfType<KtWhenExpression>() ?: return@IntentionBased emptyList()
listOf(
MoveWhenElseBranchFix(whenExpression)
)
}
}
plugins/kotlin/idea/tests/testData/quickfix/when/elseNotLastInWhen.kt
+2 -2
View File
@@ -7,6 +7,6 @@ fun test() {
2 -> { /* some more code */ }
}
}
/* IGNORE_K2 */
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix
plugins/kotlin/idea/tests/testData/quickfix/when/elseNotLastInWhen.kt.after
+2 -2
View File
@@ -7,6 +7,6 @@ fun test() {
el<caret>se -> { /* other code */ }
}
}
/* IGNORE_K2 */
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix