diff --git a/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicators/fixes/KotlinQuickFixFactory.kt b/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicators/fixes/KotlinQuickFixFactory.kt index bd14df2b2984..c855c27b6a80 100644 --- a/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicators/fixes/KotlinQuickFixFactory.kt +++ b/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicators/fixes/KotlinQuickFixFactory.kt @@ -13,7 +13,6 @@ import com.intellij.psi.PsiFile import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnosticWithPsi import org.jetbrains.kotlin.idea.codeinsight.api.classic.quickfixes.QuickFixActionBase -import kotlin.reflect.KClass /*sealed*/ fun interface KotlinQuickFixFactory> { @@ -43,7 +42,6 @@ import kotlin.reflect.KClass * Returns a [KotlinQuickFixFactory.IntentionBased] that creates [IntentionAction]s from a diagnostic. */ fun > diagnosticFixFactoryFromIntentionActions( - diagnosticClass: KClass, createIntentionActions: context(KtAnalysisSession)(DIAGNOSTIC) -> List, ) = KotlinQuickFixFactory.IntentionBased { diagnostic: DIAGNOSTIC -> // Wrap the IntentionActions as QuickFixActionBase. This ensures all fixes are of type QuickFixActionBase. diff --git a/plugins/kotlin/code-insight/override-implement-k2/src/org/jetbrains/kotlin/idea/core/overrideImplement/KtImplementMembersHandler.kt b/plugins/kotlin/code-insight/override-implement-k2/src/org/jetbrains/kotlin/idea/core/overrideImplement/KtImplementMembersHandler.kt index 1364182771ed..39b82cf1c331 100644 --- a/plugins/kotlin/code-insight/override-implement-k2/src/org/jetbrains/kotlin/idea/core/overrideImplement/KtImplementMembersHandler.kt +++ b/plugins/kotlin/code-insight/override-implement-k2/src/org/jetbrains/kotlin/idea/core/overrideImplement/KtImplementMembersHandler.kt @@ -102,27 +102,27 @@ internal class KtImplementAsConstructorParameterQuickfix(private val members: Co object MemberNotImplementedQuickfixFactories { val abstractMemberNotImplemented = - diagnosticFixFactoryFromIntentionActions(KtFirDiagnostic.AbstractMemberNotImplemented::class) { diagnostic -> + diagnosticFixFactoryFromIntentionActions { diagnostic: KtFirDiagnostic.AbstractMemberNotImplemented -> getUnimplementedMemberFixes(diagnostic.psi) } val abstractClassMemberNotImplemented = - diagnosticFixFactoryFromIntentionActions(KtFirDiagnostic.AbstractClassMemberNotImplemented::class) { diagnostic -> + diagnosticFixFactoryFromIntentionActions { diagnostic: KtFirDiagnostic.AbstractClassMemberNotImplemented -> getUnimplementedMemberFixes(diagnostic.psi) } val manyInterfacesMemberNotImplemented = - diagnosticFixFactoryFromIntentionActions(KtFirDiagnostic.ManyInterfacesMemberNotImplemented::class) { diagnostic -> + diagnosticFixFactoryFromIntentionActions { diagnostic: KtFirDiagnostic.ManyInterfacesMemberNotImplemented -> getUnimplementedMemberFixes(diagnostic.psi) } val manyImplMemberNotImplemented = - diagnosticFixFactoryFromIntentionActions(KtFirDiagnostic.ManyImplMemberNotImplemented::class) { diagnostic -> + diagnosticFixFactoryFromIntentionActions { diagnostic: KtFirDiagnostic.ManyImplMemberNotImplemented -> getUnimplementedMemberFixes(diagnostic.psi, false) } val abstractMemberNotImplementedByEnumEntry = - diagnosticFixFactoryFromIntentionActions(KtFirDiagnostic.AbstractMemberNotImplementedByEnumEntry::class) { diagnostic -> + diagnosticFixFactoryFromIntentionActions { diagnostic: KtFirDiagnostic.AbstractMemberNotImplementedByEnumEntry -> val missingDeclarations = diagnostic.missingDeclarations if (missingDeclarations.isEmpty()) return@diagnosticFixFactoryFromIntentionActions emptyList() listOf(KtImplementMembersQuickfix(missingDeclarations.mapToKtClassMemberInfo())) diff --git a/plugins/kotlin/compiler-plugins/parcelize/k2/src/org/jetbrains/kotlin/idea/compilerPlugin/parcelize/k2/ParcelizeK2QuickFixRegistrar.kt b/plugins/kotlin/compiler-plugins/parcelize/k2/src/org/jetbrains/kotlin/idea/compilerPlugin/parcelize/k2/ParcelizeK2QuickFixRegistrar.kt index 92377aa7ef82..232ae45facc7 100644 --- a/plugins/kotlin/compiler-plugins/parcelize/k2/src/org/jetbrains/kotlin/idea/compilerPlugin/parcelize/k2/ParcelizeK2QuickFixRegistrar.kt +++ b/plugins/kotlin/compiler-plugins/parcelize/k2/src/org/jetbrains/kotlin/idea/compilerPlugin/parcelize/k2/ParcelizeK2QuickFixRegistrar.kt @@ -99,7 +99,7 @@ private fun KtQuickFixesListBuilder.registerQuickFixForDiagnosticFactory( private inline fun > createApplicatorForFactory( factory: AbstractKtDiagnosticFactory, crossinline createQuickFixes: context(KtAnalysisSession)(DIAGNOSTIC) -> List -) = diagnosticFixFactoryFromIntentionActions(DIAGNOSTIC::class) { diagnostic -> +) = diagnosticFixFactoryFromIntentionActions { diagnostic: DIAGNOSTIC -> if (diagnostic.factoryName == factory.name) { createQuickFixes(analysisSession, diagnostic) } else {