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

[kotlin] Port RemoveSupertypeFix to K2

Browse Source 
This quick fix is for the MANY_CLASSES_IN_SUPERTYPE_LIST error.

^KTIJ-29612

GitOrigin-RevId: f028565cd5a6cba1911db51ced7f9015ac545f0c
This commit is contained in:
Andrey Cherkasov
2024-06-10 23:59:42 +00:00
committed by intellij-monorepo-bot
parent 309f90b973
commit d2208e036e
10 changed files with 34 additions and 16 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
@@ -111,6 +111,7 @@ class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() {
registerFactory(AddIsToWhenConditionFixFactory.addIsToWhenConditionFixFactory)
registerFactory(MoveTypeAliasToTopLevelFixFactory.moveTypeAliasToTopLevelFixFactory)
registerPsiQuickFixes(KaFirDiagnostic.InvalidIfAsExpression::class, AddIfElseBranchFix)
registerFactory(RemoveSupertypeFixFactory.removeSupertypeFixFactory)
}
private val addAbstract = KtQuickFixesListBuilder.registerPsiQuickFix {
plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/RemoveSupertypeFixFactory.kt
+17
View File
@@ -0,0 +1,17 @@
// 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.RemoveSupertypeFix
import org.jetbrains.kotlin.psi.KtSuperTypeListEntry
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
internal object RemoveSupertypeFixFactory {
val removeSupertypeFixFactory = KotlinQuickFixFactory.ModCommandBased { diagnostic: KaFirDiagnostic.ManyClassesInSupertypeList ->
val superType = diagnostic.psi.getStrictParentOfType<KtSuperTypeListEntry>() ?: return@ModCommandBased emptyList()
listOf(RemoveSupertypeFix(superType))
}
}
plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype1.kt
+2 -2
View File
@@ -3,5 +3,5 @@ open class C1 {}
open class C2 {}
class C3: C1(), C2<caret>() {}
/* IGNORE_K2 */
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype1.kt.after
+2 -2
View File
@@ -3,5 +3,5 @@ open class C1 {}
open class C2 {}
class C3: C1() {}
/* IGNORE_K2 */
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype2.kt
+2 -2
View File
@@ -3,5 +3,5 @@ open class C1 {}
open class C2 {}
class C3: C1(),C2<caret>() {}
/* IGNORE_K2 */
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype2.kt.after
+2 -2
View File
@@ -3,5 +3,5 @@ open class C1 {}
open class C2 {}
class C3: C1() {}
/* IGNORE_K2 */
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype3.kt
+2 -2
View File
@@ -3,5 +3,5 @@ open class C1 {}
open class C2 {}
class C3: C1(), C2<caret> {}
/* IGNORE_K2 */
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype3.kt.after
+2 -2
View File
@@ -3,5 +3,5 @@ open class C1 {}
open class C2 {}
class C3: C1() {}
/* IGNORE_K2 */
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype4.kt
+2 -2
View File
@@ -3,5 +3,5 @@ open class C1 {}
open class C2 {}
class C3: C1(), /* Hello, world! */ C2<caret>() {}
/* IGNORE_K2 */
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype4.kt.after
+2 -2
View File
@@ -3,5 +3,5 @@ open class C1 {}
open class C2 {}
class C3: C1() /* Hello, world! */ {}
/* IGNORE_K2 */
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix