diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddInlineModifierFix.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddInlineModifierFixFactories.kt similarity index 98% rename from plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddInlineModifierFix.kt rename to plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddInlineModifierFixFactories.kt index 83bd0a3e1c93..0306f36b8e89 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddInlineModifierFix.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AddInlineModifierFixFactories.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.KtNameReferenceExpression import org.jetbrains.kotlin.psi.KtParameter -internal object AddInlineModifierFix { +internal object AddInlineModifierFixFactories { val usageIsNotInlinableFactory = KotlinQuickFixFactory.ModCommandBased { diagnostic: KtFirDiagnostic.UsageIsNotInlinable -> val reference = diagnostic.psi as? KtNameReferenceExpression ?: return@ModCommandBased emptyList() diff --git a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt index 989f5522827e..e42eb50a556a 100644 --- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt +++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/KotlinK2QuickFixRegistrar.kt @@ -87,9 +87,9 @@ class KotlinK2QuickFixRegistrar : KotlinQuickFixRegistrar() { registerFactory(MakeSuperTypeOpenFixFactory.makeUpperBoundOpenFixFactory) registerFactory(AddFunModifierFixFactory.addFunModifierFixFactory) registerFactory(AddSuspendModifierFixFactory.addSuspendModifierFixFactory) - registerFactory(AddInlineModifierFix.usageIsNotInlinableFactory) - registerFactory(AddInlineModifierFix.nonLocalReturnNotAllowed) - registerFactory(AddInlineModifierFix.inlineSuspendFunctionTypeUnsupported) + registerFactory(AddInlineModifierFixFactories.usageIsNotInlinableFactory) + registerFactory(AddInlineModifierFixFactories.nonLocalReturnNotAllowed) + registerFactory(AddInlineModifierFixFactories.inlineSuspendFunctionTypeUnsupported) registerFactory(SpecifyOverrideExplicitlyFixFactory.specifyOverrideExplicitlyFixFactory) } diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/basic.kt b/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/basic.kt index d459d87170d0..bc7b612e30ea 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/basic.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/basic.kt @@ -13,4 +13,4 @@ inline fun bar(block: () -> Unit) { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/basic.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/basic.kt.after index e7bcdcfd1ea3..852d3859d4f6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/basic.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/basic.kt.after @@ -13,4 +13,4 @@ inline fun bar(crossinline block: () -> Unit) { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/suspend.kt b/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/suspend.kt index cb6268eb9f4c..1fa0b113e65b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/suspend.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/suspend.kt @@ -2,4 +2,4 @@ inline fun foo(x: suspend () -> Unit) {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/suspend.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/suspend.kt.after index 2f7f5d92b2bf..20e9dcc46f89 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/suspend.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addCrossinline/suspend.kt.after @@ -2,4 +2,4 @@ inline fun foo(crossinline x: suspend () -> Unit) {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/basic.kt b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/basic.kt index 78a6cad18d9c..cf17e10df662 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/basic.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/basic.kt @@ -3,4 +3,4 @@ inline fun foo(block: () -> Unit) = block // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/basic.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/basic.kt.after index a0276dfa1037..37e6d1167506 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/basic.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/basic.kt.after @@ -3,4 +3,4 @@ inline fun foo(noinline block: () -> Unit) = block // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/extensionCalls.kt b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/extensionCalls.kt index 52b10a3105d3..c45bb9d1f2d1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/extensionCalls.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/extensionCalls.kt @@ -6,4 +6,4 @@ inline fun inlineFun(lambda: () -> Unit) { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/extensionCalls.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/extensionCalls.kt.after index a3b0ff76a86c..98a7f88f5177 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/extensionCalls.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/extensionCalls.kt.after @@ -6,4 +6,4 @@ inline fun inlineFun(noinline lambda: () -> Unit) { } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/suspend.kt b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/suspend.kt index d1f462598c0b..b08cd65cd7b6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/suspend.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/suspend.kt @@ -4,4 +4,4 @@ inline fun foo(x: suspend () -> Unit) {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/suspend.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/suspend.kt.after index f4b10e797965..bc39efecba10 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/suspend.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/suspend.kt.after @@ -4,4 +4,4 @@ inline fun foo(noinline x: suspend () -> Unit) {} // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/withCrossinline.kt b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/withCrossinline.kt index 9a204f2268fd..9666d30c8204 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/withCrossinline.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/withCrossinline.kt @@ -4,4 +4,4 @@ inline fun inlineFun(crossinline lambda: () -> Unit) { lambda.toString() } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/withCrossinline.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/withCrossinline.kt.after index 5f1cf54283b5..ded56854ee12 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/withCrossinline.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/addNoinline/withCrossinline.kt.after @@ -4,4 +4,4 @@ inline fun inlineFun(noinline lambda: () -> Unit) { lambda.toString() } // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddInlineModifierFix -// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFix$AddInlineModifierFix \ No newline at end of file +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.fixes.AddInlineModifierFixFactories$AddInlineModifierFix \ No newline at end of file