diff --git a/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicators/KotlinApplicator.kt b/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicators/KotlinApplicator.kt index 3f6576d8fbe5..154d31d5a6e7 100644 --- a/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicators/KotlinApplicator.kt +++ b/plugins/kotlin/code-insight/api/src/org/jetbrains/kotlin/idea/codeinsight/api/applicators/KotlinApplicator.kt @@ -149,6 +149,7 @@ internal class BaseKotlinApplicatorImpl Boolean, internal val getActionName: (PSI, INPUT) -> @IntentionName String, internal val getFamilyName: () -> @IntentionFamilyName String, + internal val getStartInWriteAction: () -> Boolean = { true }, ) : BaseKotlinApplicator() { override fun applyToImpl(psi: PSI, input: INPUT, project: Project, editor: Editor?) { applyTo.invoke(psi, input, project, editor) @@ -165,6 +166,10 @@ internal class BaseKotlinApplicatorImpl = reportingClass + + override fun startInWriteAction(): Boolean { + return getStartInWriteAction() + } } internal class KotlinModCommandApplicatorImpl( @@ -173,6 +178,7 @@ internal class KotlinModCommandApplicatorImpl Boolean, internal val getActionName: (PSI, INPUT) -> @IntentionName String, internal val getFamilyName: () -> @IntentionFamilyName String, + internal val getStartInWriteAction: () -> Boolean = { true }, ) : KotlinModCommandApplicator() { override fun applyToImpl(psi: PSI, input: INPUT, context: ActionContext, updater: ModPsiUpdater) { applyTo.invoke(psi, input, context, updater) @@ -190,13 +196,18 @@ internal class KotlinModCommandApplicatorImpl = reportingClass + + override fun startInWriteAction(): Boolean { + return getStartInWriteAction() + } } abstract class AbstractKotlinApplicatorBuilder internal constructor( internal val reportingClass: Class<*>, internal var isApplicableByPsi: ((PSI) -> Boolean)? = null, internal var getActionName: ((PSI, INPUT) -> @IntentionName String)? = null, - internal var getFamilyName: (() -> @IntentionFamilyName String)? = null + internal var getFamilyName: (() -> @IntentionFamilyName String)? = null, + internal var getStartInWriteAction: () -> Boolean = { true }, ) { fun familyName(getName: () -> @IntentionFamilyName String) { getFamilyName = getName @@ -219,6 +230,10 @@ abstract class AbstractKotlinApplicatorBuilder Boolean) { + this.getStartInWriteAction = getStartInWriteAction + } + } class KotlinApplicatorBuilder internal constructor( @@ -227,8 +242,9 @@ class KotlinApplicatorBuilder i var applyTo: ((PSI, INPUT, Project, Editor?) -> Unit)? = null, isApplicableByPsi: ((PSI) -> Boolean)? = null, getActionName: ((PSI, INPUT) -> @IntentionName String)? = null, - getFamilyName: (() -> @IntentionFamilyName String)? = null -): AbstractKotlinApplicatorBuilder(reportingClass, isApplicableByPsi, getActionName, getFamilyName) { + getFamilyName: (() -> @IntentionFamilyName String)? = null, + getStartInWriteAction: () -> Boolean = { true }, +): AbstractKotlinApplicatorBuilder(reportingClass, isApplicableByPsi, getActionName, getFamilyName, getStartInWriteAction) { @OptIn(PrivateForInline::class) fun applyToWithEditorRequired(doApply: (PSI, INPUT, Project, Editor) -> Unit) { @@ -265,7 +281,8 @@ class KotlinApplicatorBuilder i applyTo = applyTo, isApplicableByPsi = isApplicableByPsi, getActionName = getActionName, - getFamilyName = getFamilyName + getFamilyName = getFamilyName, + getStartInWriteAction = getStartInWriteAction ) } } diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/quickfix/tests/AbstractK2QuickFixTest.kt b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/quickfix/tests/AbstractK2QuickFixTest.kt index 9eca1938b958..4e93b579aed0 100644 --- a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/quickfix/tests/AbstractK2QuickFixTest.kt +++ b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/quickfix/tests/AbstractK2QuickFixTest.kt @@ -7,6 +7,7 @@ import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import java.io.File abstract class AbstractK2QuickFixTest : AbstractQuickFixTest() { override fun isFirPlugin() = true @@ -26,4 +27,13 @@ abstract class AbstractK2QuickFixTest : AbstractQuickFixTest() { get() = ".k2Inspection" override fun checkForUnexpectedErrors() {} + + override fun getAfterFileName(beforeFileName: String): String { + val firAfterFile = File(dataFilePath(beforeFileName.replace(".kt", ".fir.kt.after"))) + return if (firAfterFile.exists()) { + firAfterFile.name + } else { + super.getAfterFileName(beforeFileName) + } + } } \ No newline at end of file diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/quickfix/tests/K2QuickFixTestGenerated.java b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/quickfix/tests/K2QuickFixTestGenerated.java index 7b342c583dd2..72403a4fc017 100644 --- a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/quickfix/tests/K2QuickFixTestGenerated.java +++ b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/quickfix/tests/K2QuickFixTestGenerated.java @@ -106,6 +106,324 @@ public abstract class K2QuickFixTestGenerated extends AbstractK2QuickFixTest { } } + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("../../../idea/tests/testData/quickfix/changeSignature") + public static class ChangeSignature extends AbstractK2QuickFixTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + @TestMetadata("addConstructorParameter.kt") + public void testAddConstructorParameter() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addConstructorParameter.kt"); + } + + @TestMetadata("addConstructorParameterDataClassForConstantTypeMismatch.kt") + public void testAddConstructorParameterDataClassForConstantTypeMismatch() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addConstructorParameterDataClassForConstantTypeMismatch.kt"); + } + + @TestMetadata("addConstructorParameterForConstantTypeMismatch.kt") + public void testAddConstructorParameterForConstantTypeMismatch() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addConstructorParameterForConstantTypeMismatch.kt"); + } + + @TestMetadata("addConstructorParameterForInlineClass.kt") + public void testAddConstructorParameterForInlineClass() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addConstructorParameterForInlineClass.kt"); + } + + @TestMetadata("addConstructorParameterForValueClass.kt") + public void testAddConstructorParameterForValueClass() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addConstructorParameterForValueClass.kt"); + } + + @TestMetadata("addEnumConstructorParameter.kt") + public void testAddEnumConstructorParameter() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter.kt"); + } + + @TestMetadata("addEnumConstructorParameter2.kt") + public void testAddEnumConstructorParameter2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter2.kt"); + } + + @TestMetadata("addEnumConstructorParameter3.kt") + public void testAddEnumConstructorParameter3() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter3.kt"); + } + + @TestMetadata("addEnumConstructorParameter4.kt") + public void testAddEnumConstructorParameter4() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter4.kt"); + } + + @TestMetadata("addEnumConstructorParameter5.kt") + public void testAddEnumConstructorParameter5() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter5.kt"); + } + + @TestMetadata("addExtensionFunctionParameterForTypeMismatch.kt") + public void testAddExtensionFunctionParameterForTypeMismatch() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addExtensionFunctionParameterForTypeMismatch.kt"); + } + + @TestMetadata("addForItParameter.kt") + public void testAddForItParameter() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addForItParameter.kt"); + } + + @TestMetadata("addFunctionParameter.kt") + public void testAddFunctionParameter() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameter.kt"); + } + + @TestMetadata("addFunctionParameter2.kt") + public void testAddFunctionParameter2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameter2.kt"); + } + + @TestMetadata("addFunctionParameter3.kt") + public void testAddFunctionParameter3() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameter3.kt"); + } + + @TestMetadata("addFunctionParameterAndChangeTypes.kt") + public void testAddFunctionParameterAndChangeTypes() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt"); + } + + @TestMetadata("addFunctionParameterAndChangeTypesWithReceiver.kt") + public void testAddFunctionParameterAndChangeTypesWithReceiver() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypesWithReceiver.kt"); + } + + @TestMetadata("addFunctionParameterForConstantTypeMismatch.kt") + public void testAddFunctionParameterForConstantTypeMismatch() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForConstantTypeMismatch.kt"); + } + + @TestMetadata("addFunctionParameterForNullForNotnullType.kt") + public void testAddFunctionParameterForNullForNotnullType() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForNullForNotnullType.kt"); + } + + @TestMetadata("addFunctionParameterForReferencedArgument.kt") + public void testAddFunctionParameterForReferencedArgument() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument.kt"); + } + + @TestMetadata("addFunctionParameterForReferencedArgument2.kt") + public void testAddFunctionParameterForReferencedArgument2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument2.kt"); + } + + @TestMetadata("addFunctionParameterForReferencedArgument3.kt") + public void testAddFunctionParameterForReferencedArgument3() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument3.kt"); + } + + @TestMetadata("addFunctionParameterForReferencedArgument4.kt") + public void testAddFunctionParameterForReferencedArgument4() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.kt"); + } + + @TestMetadata("addFunctionParameterForReferencedArgument5.kt") + public void testAddFunctionParameterForReferencedArgument5() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.kt"); + } + + @TestMetadata("addFunctionParameterForTypeMismatch1.kt") + public void testAddFunctionParameterForTypeMismatch1() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch1.kt"); + } + + @TestMetadata("addFunctionParameterForTypeMismatch2.kt") + public void testAddFunctionParameterForTypeMismatch2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch2.kt"); + } + + @TestMetadata("addFunctionParameterForTypeMismatch3.kt") + public void testAddFunctionParameterForTypeMismatch3() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch3.kt"); + } + + @TestMetadata("addFunctionParameterForTypeMismatch4.kt") + public void testAddFunctionParameterForTypeMismatch4() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch4.kt"); + } + + @TestMetadata("addFunctionParameterForTypeMismatch5.kt") + public void testAddFunctionParameterForTypeMismatch5() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch5.kt"); + } + + @TestMetadata("addFunctionParameterForTypeMismatchWithLambdaArgument.kt") + public void testAddFunctionParameterForTypeMismatchWithLambdaArgument() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatchWithLambdaArgument.kt"); + } + + @TestMetadata("addFunctionParameterLongNameRuntime.kt") + public void testAddFunctionParameterLongNameRuntime() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt"); + } + + @TestMetadata("addFunctionParameterWithAnonymousFunction.kt") + public void testAddFunctionParameterWithAnonymousFunction() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithAnonymousFunction.kt"); + } + + @TestMetadata("addFunctionParameterWithFunctionReference.kt") + public void testAddFunctionParameterWithFunctionReference() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.kt"); + } + + @TestMetadata("addFunctionParameterWithLambda.kt") + public void testAddFunctionParameterWithLambda() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.kt"); + } + + @TestMetadata("addFunctionParameterWithSmartCast.kt") + public void testAddFunctionParameterWithSmartCast() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.kt"); + } + + @TestMetadata("addFunctionParameterWithSmartcastedArgument.kt") + public void testAddFunctionParameterWithSmartcastedArgument() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartcastedArgument.kt"); + } + + @TestMetadata("addFunctionParameterWithSuspendFunctionReference.kt") + public void testAddFunctionParameterWithSuspendFunctionReference() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.kt"); + } + + @TestMetadata("addNothingReturnType.kt") + public void testAddNothingReturnType() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addNothingReturnType.kt"); + } + + @TestMetadata("addParameterNotAvailableForBuiltins.kt") + public void testAddParameterNotAvailableForBuiltins() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addParameterNotAvailableForBuiltins.kt"); + } + + @TestMetadata("addParameterNotAvailableForLibrary.kt") + public void testAddParameterNotAvailableForLibrary() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt"); + } + + @TestMetadata("addParameterToFakeOverride.kt") + public void testAddParameterToFakeOverride() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/addParameterToFakeOverride.kt"); + } + + @TestMetadata("changeAnnotationClassConstructor.kt") + public void testChangeAnnotationClassConstructor() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/changeAnnotationClassConstructor.kt"); + } + + @TestMetadata("changeClassConstructor.kt") + public void testChangeClassConstructor() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/changeClassConstructor.kt"); + } + + @TestMetadata("changeDataClassConstructor.kt") + public void testChangeDataClassConstructor() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/changeDataClassConstructor.kt"); + } + + @TestMetadata("changeFunctionLiteralParameters1.kt") + public void testChangeFunctionLiteralParameters1() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt"); + } + + @TestMetadata("changeFunctionLiteralParameters2.kt") + public void testChangeFunctionLiteralParameters2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt"); + } + + @TestMetadata("changeFunctionLiteralParameters3.kt") + public void testChangeFunctionLiteralParameters3() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters3.kt"); + } + + @TestMetadata("changeFunctionLiteralParameters4.kt") + public void testChangeFunctionLiteralParameters4() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters4.kt"); + } + + @TestMetadata("complexHierarchy.kt") + public void testComplexHierarchy() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/complexHierarchy.kt"); + } + + @TestMetadata("complexHierarchyHead.kt") + public void testComplexHierarchyHead() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/complexHierarchyHead.kt"); + } + + @TestMetadata("complexHierarchyTail.kt") + public void testComplexHierarchyTail() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/complexHierarchyTail.kt"); + } + + @TestMetadata("fixExtensionLambdaSignature.kt") + public void testFixExtensionLambdaSignature() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt"); + } + + @TestMetadata("linearHierarchy.kt") + public void testLinearHierarchy() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/linearHierarchy.kt"); + } + + @TestMetadata("notAvailableForSynthesized.kt") + public void testNotAvailableForSynthesized() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/notAvailableForSynthesized.kt"); + } + + @TestMetadata("notEditable.kt") + public void testNotEditable() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/notEditable.kt"); + } + + @TestMetadata("removeConstructorParameter.kt") + public void testRemoveConstructorParameter() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/removeConstructorParameter.kt"); + } + + @TestMetadata("removeFunctionFirstParameter.kt") + public void testRemoveFunctionFirstParameter() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt"); + } + + @TestMetadata("removeFunctionSecondParameter1.kt") + public void testRemoveFunctionSecondParameter1() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt"); + } + + @TestMetadata("removeFunctionSecondParameter2.kt") + public void testRemoveFunctionSecondParameter2() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt"); + } + + @TestMetadata("removeNamedParameter.kt") + public void testRemoveNamedParameter() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/removeNamedParameter.kt"); + } + + @TestMetadata("removeParameterFromFakeOverride.kt") + public void testRemoveParameterFromFakeOverride() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt"); + } + + @TestMetadata("removeParameterNotAvailableForBuiltins.kt") + public void testRemoveParameterNotAvailableForBuiltins() throws Exception { + runTest("../../../idea/tests/testData/quickfix/changeSignature/removeParameterNotAvailableForBuiltins.kt"); + } + } + @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("../../../idea/tests/testData/quickfix/redundantModalityModifier") public static class RedundantModalityModifier extends AbstractK2QuickFixTest { diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java index 71b85c499b08..98489f3da8a2 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/K1QuickFixTestGenerated.java @@ -3195,11 +3195,6 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest { runTest("testData/quickfix/changeSignature/removeFunctionFirstParameter.kt"); } - @TestMetadata("removeFunctionLastLambdaParameter.kt") - public void testRemoveFunctionLastLambdaParameter() throws Exception { - runTest("testData/quickfix/changeSignature/removeFunctionLastLambdaParameter.kt"); - } - @TestMetadata("removeFunctionSecondParameter1.kt") public void testRemoveFunctionSecondParameter1() throws Exception { runTest("testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt"); @@ -3215,11 +3210,6 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest { runTest("testData/quickfix/changeSignature/removeNamedParameter.kt"); } - @TestMetadata("removeParameterFromExtension.kt") - public void testRemoveParameterFromExtension() throws Exception { - runTest("testData/quickfix/changeSignature/removeParameterFromExtension.kt"); - } - @TestMetadata("removeParameterFromFakeOverride.kt") public void testRemoveParameterFromFakeOverride() throws Exception { runTest("testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt"); @@ -3229,116 +3219,6 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest { public void testRemoveParameterNotAvailableForBuiltins() throws Exception { runTest("testData/quickfix/changeSignature/removeParameterNotAvailableForBuiltins.kt"); } - - @TestMetadata("removeUnusedConstructorParameterWithUsage.kt") - public void testRemoveUnusedConstructorParameterWithUsage() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedConstructorParameterWithUsage.kt"); - } - - @TestMetadata("removeUnusedExtensionParameter.kt") - public void testRemoveUnusedExtensionParameter() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt"); - } - - @TestMetadata("removeUnusedInternalConstructorParameter.kt") - public void testRemoveUnusedInternalConstructorParameter() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedInternalConstructorParameter.kt"); - } - - @TestMetadata("removeUnusedParameter.kt") - public void testRemoveUnusedParameter() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameter.kt"); - } - - @TestMetadata("removeUnusedParameterOfPropertySetter.kt") - public void testRemoveUnusedParameterOfPropertySetter() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterOfPropertySetter.kt"); - } - - @TestMetadata("removeUnusedParameterWithComments.kt") - public void testRemoveUnusedParameterWithComments() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithComments.kt"); - } - - @TestMetadata("removeUnusedParameterWithComments2.kt") - public void testRemoveUnusedParameterWithComments2() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithComments2.kt"); - } - - @TestMetadata("removeUnusedParameterWithComments3.kt") - public void testRemoveUnusedParameterWithComments3() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithComments3.kt"); - } - - @TestMetadata("removeUnusedParameterWithComments4.kt") - public void testRemoveUnusedParameterWithComments4() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithComments4.kt"); - } - - @TestMetadata("removeUnusedParameterWithLongQualifier.kt") - public void testRemoveUnusedParameterWithLongQualifier() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt"); - } - - @TestMetadata("removeUnusedParameterWithTypeParameter.kt") - public void testRemoveUnusedParameterWithTypeParameter() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter.kt"); - } - - @TestMetadata("removeUnusedParameterWithTypeParameter2.kt") - public void testRemoveUnusedParameterWithTypeParameter2() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter2.kt"); - } - - @TestMetadata("removeUnusedParameterWithTypeParameter3.kt") - public void testRemoveUnusedParameterWithTypeParameter3() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter3.kt"); - } - - @TestMetadata("removeUnusedParameterWithTypeParameter4.kt") - public void testRemoveUnusedParameterWithTypeParameter4() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter4.kt"); - } - - @TestMetadata("removeUnusedParameterWithTypeParameter5.kt") - public void testRemoveUnusedParameterWithTypeParameter5() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter5.kt"); - } - - @TestMetadata("removeUnusedParameterWithTypeParameter6.kt") - public void testRemoveUnusedParameterWithTypeParameter6() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter6.kt"); - } - - @TestMetadata("removeUnusedParameterWithTypeParameter7.kt") - public void testRemoveUnusedParameterWithTypeParameter7() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter7.kt"); - } - - @TestMetadata("removeUnusedParameterWithTypeParameterAndTypeConstraint.kt") - public void testRemoveUnusedParameterWithTypeParameterAndTypeConstraint() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameterAndTypeConstraint.kt"); - } - - @TestMetadata("removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt") - public void testRemoveUnusedParameterWithTypeParameterAndTypeConstraint2() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt"); - } - - @TestMetadata("removeUnusedPrimaryConstructorParameter.kt") - public void testRemoveUnusedPrimaryConstructorParameter() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameter.kt"); - } - - @TestMetadata("removeUnusedPrimaryConstructorParameter2.kt") - public void testRemoveUnusedPrimaryConstructorParameter2() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameter2.kt"); - } - - @TestMetadata("removeUnusedPrimaryConstructorParameterWithComments.kt") - public void testRemoveUnusedPrimaryConstructorParameterWithComments() throws Exception { - runTest("testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameterWithComments.kt"); - } } @RunWith(JUnit3RunnerWithInners.class) @@ -13071,6 +12951,134 @@ public abstract class K1QuickFixTestGenerated extends AbstractK1QuickFixTest { } } + @RunWith(JUnit3RunnerWithInners.class) + @TestMetadata("testData/quickfix/removeUnusedParameter") + public static class RemoveUnusedParameter extends AbstractK1QuickFixTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + @TestMetadata("removeFunctionLastLambdaParameter.kt") + public void testRemoveFunctionLastLambdaParameter() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeFunctionLastLambdaParameter.kt"); + } + + @TestMetadata("removeParameterFromExtension.kt") + public void testRemoveParameterFromExtension() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeParameterFromExtension.kt"); + } + + @TestMetadata("removeUnusedConstructorParameterWithUsage.kt") + public void testRemoveUnusedConstructorParameterWithUsage() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedConstructorParameterWithUsage.kt"); + } + + @TestMetadata("removeUnusedExtensionParameter.kt") + public void testRemoveUnusedExtensionParameter() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedExtensionParameter.kt"); + } + + @TestMetadata("removeUnusedInternalConstructorParameter.kt") + public void testRemoveUnusedInternalConstructorParameter() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedInternalConstructorParameter.kt"); + } + + @TestMetadata("removeUnusedParameter.kt") + public void testRemoveUnusedParameter() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameter.kt"); + } + + @TestMetadata("removeUnusedParameterOfPropertySetter.kt") + public void testRemoveUnusedParameterOfPropertySetter() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterOfPropertySetter.kt"); + } + + @TestMetadata("removeUnusedParameterWithComments.kt") + public void testRemoveUnusedParameterWithComments() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments.kt"); + } + + @TestMetadata("removeUnusedParameterWithComments2.kt") + public void testRemoveUnusedParameterWithComments2() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments2.kt"); + } + + @TestMetadata("removeUnusedParameterWithComments3.kt") + public void testRemoveUnusedParameterWithComments3() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments3.kt"); + } + + @TestMetadata("removeUnusedParameterWithComments4.kt") + public void testRemoveUnusedParameterWithComments4() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments4.kt"); + } + + @TestMetadata("removeUnusedParameterWithLongQualifier.kt") + public void testRemoveUnusedParameterWithLongQualifier() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithLongQualifier.kt"); + } + + @TestMetadata("removeUnusedParameterWithTypeParameter.kt") + public void testRemoveUnusedParameterWithTypeParameter() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter.kt"); + } + + @TestMetadata("removeUnusedParameterWithTypeParameter2.kt") + public void testRemoveUnusedParameterWithTypeParameter2() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter2.kt"); + } + + @TestMetadata("removeUnusedParameterWithTypeParameter3.kt") + public void testRemoveUnusedParameterWithTypeParameter3() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter3.kt"); + } + + @TestMetadata("removeUnusedParameterWithTypeParameter4.kt") + public void testRemoveUnusedParameterWithTypeParameter4() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter4.kt"); + } + + @TestMetadata("removeUnusedParameterWithTypeParameter5.kt") + public void testRemoveUnusedParameterWithTypeParameter5() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter5.kt"); + } + + @TestMetadata("removeUnusedParameterWithTypeParameter6.kt") + public void testRemoveUnusedParameterWithTypeParameter6() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter6.kt"); + } + + @TestMetadata("removeUnusedParameterWithTypeParameter7.kt") + public void testRemoveUnusedParameterWithTypeParameter7() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter7.kt"); + } + + @TestMetadata("removeUnusedParameterWithTypeParameterAndTypeConstraint.kt") + public void testRemoveUnusedParameterWithTypeParameterAndTypeConstraint() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameterAndTypeConstraint.kt"); + } + + @TestMetadata("removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt") + public void testRemoveUnusedParameterWithTypeParameterAndTypeConstraint2() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt"); + } + + @TestMetadata("removeUnusedPrimaryConstructorParameter.kt") + public void testRemoveUnusedPrimaryConstructorParameter() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameter.kt"); + } + + @TestMetadata("removeUnusedPrimaryConstructorParameter2.kt") + public void testRemoveUnusedPrimaryConstructorParameter2() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameter2.kt"); + } + + @TestMetadata("removeUnusedPrimaryConstructorParameterWithComments.kt") + public void testRemoveUnusedPrimaryConstructorParameterWithComments() throws Exception { + runTest("testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameterWithComments.kt"); + } + } + @RunWith(JUnit3RunnerWithInners.class) @TestMetadata("testData/quickfix/removeUnusedReceiver") public static class RemoveUnusedReceiver extends AbstractK1QuickFixTest { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameter.kt index 52928428711a..99d78dad25bd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameter.kt @@ -11,4 +11,5 @@ open class Base(var x: Int) { open class Inherited(x: Int) : Base(1, 2.5) {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameter.kt.after index 3f9ff5cdb24d..97d1ef11b9e8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameter.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameter.kt.after @@ -11,4 +11,5 @@ open class Base(var x: Int, d: Double) { open class Inherited(x: Int) : Base(1, 2.5) {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterDataClassForConstantTypeMismatch.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterDataClassForConstantTypeMismatch.kt index 60aca8be95f9..fadd49b1c7d7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterDataClassForConstantTypeMismatch.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterDataClassForConstantTypeMismatch.kt @@ -5,4 +5,5 @@ data class Foo(val name: String) fun test() { val foo = Foo(1, "name") } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForConstantTypeMismatch.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForConstantTypeMismatch.kt index 7b044c6fbdc0..2b6fe5577bf0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForConstantTypeMismatch.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForConstantTypeMismatch.kt @@ -5,4 +5,5 @@ class Foo(val name: String) fun test() { val foo = Foo(1, "name") } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForInlineClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForInlineClass.kt index b223a057a3f8..4ee9997feeb4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForInlineClass.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForInlineClass.kt @@ -8,4 +8,9 @@ // ACTION: Remove argument inline class Foo(val i: Int) -val foo = Foo(10, 20) \ No newline at end of file +val foo = Foo(10, 20) + +// IGNORE_K2 +// Note: K2 does not support all of inspections, intentions, and quickfixes yet. When enabling K2, +// this test fails because the last two actions are missing at this moment. After implementing all +// inspections/intentions/quickfixes based on K2, we should remove the above "IGNORE_K2" directive. \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForValueClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForValueClass.kt index 91abda96b2ac..b874f8fe78f2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForValueClass.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addConstructorParameterForValueClass.kt @@ -9,4 +9,9 @@ @JvmInline value class Foo(val i: Int) -val foo = Foo(10, 20) \ No newline at end of file +val foo = Foo(10, 20) + +// IGNORE_K2 +// Note: K2 does not support all of inspections, intentions, and quickfixes yet. When enabling K2, +// this test fails because the last two actions are missing at this moment. After implementing all +// inspections/intentions/quickfixes based on K2, we should remove the above "IGNORE_K2" directive. \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter.kt index af5544e6d4ea..d7f4cee547d0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter.kt @@ -4,4 +4,5 @@ enum class Foo { A("A"), B("B") } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter2.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter2.kt index a3a769eb7423..b296dfc90f80 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter2.kt @@ -4,4 +4,5 @@ enum class Foo { A("A"), B("B") } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter3.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter3.kt index 3aaf9f1374c8..4532031145e1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter3.kt @@ -7,4 +7,5 @@ enum class Foo(n: Int) { D(), E } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter4.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter4.kt index fe36503f9d6e..1cbfadd09be9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter4.kt @@ -7,4 +7,5 @@ enum class Foo { D(), E } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter5.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter5.kt index bbb108995f49..5dfe757ed822 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter5.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter5.kt @@ -7,4 +7,5 @@ enum class Foo { D, } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addExtensionFunctionParameterForTypeMismatch.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addExtensionFunctionParameterForTypeMismatch.kt index eda596831bbf..d8d2590e080a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addExtensionFunctionParameterForTypeMismatch.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addExtensionFunctionParameterForTypeMismatch.kt @@ -6,4 +6,5 @@ private fun Foo.bar(s: String, i: Int) {} fun test(foo: Foo, b: Boolean) { foo.bar("", b, 0) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addForItParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addForItParameter.kt index 2136c9ac60e8..0bed02a961f7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addForItParameter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addForItParameter.kt @@ -6,4 +6,5 @@ class Foo fun test(name: String) { name.also { Foo(it) } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter.kt index 787e55706168..1ee7737707e3 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter.kt @@ -7,4 +7,5 @@ fun foo(x: Int) { foo(1, 4); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter.kt.after index 0dac9126755b..8ac7ef342555 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter.kt.after @@ -7,4 +7,5 @@ fun foo(x: Int, i: Int) { foo(1, 4); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter2.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter2.kt index 3d83c4cf3120..af66d453c34c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter2.kt @@ -8,4 +8,5 @@ fun caller() { } fun called() {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter2.kt.after index 061f7b27413f..7e34520819e7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter2.kt.after @@ -8,4 +8,5 @@ fun caller() { } fun called(of: Set) {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter3.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter3.kt index 1bdf8a8e41ba..b17574a21c89 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter3.kt @@ -8,4 +8,5 @@ fun caller() { fun called() {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter3.kt.after index 661b313eaef8..37215aa3fb62 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameter3.kt.after @@ -8,4 +8,5 @@ fun caller() { fun called(of: Set) {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt index 38b146434530..1d37def3f4af 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt @@ -8,4 +8,5 @@ fun foo(x: Int, i: Double) { foo(1.5, 4, 5, 6); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypesWithReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypesWithReceiver.kt index ffe9fc6d52a1..883fb3e2f2ff 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypesWithReceiver.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypesWithReceiver.kt @@ -5,4 +5,5 @@ fun String.withReceiver(i: Int) {} private fun test(s: String, q: Boolean) { s.withReceiver(q, 2) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForConstantTypeMismatch.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForConstantTypeMismatch.kt index 9d4c270bbba8..51471abdf966 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForConstantTypeMismatch.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForConstantTypeMismatch.kt @@ -5,4 +5,5 @@ fun foo(name: String) = Unit fun test() { val foo = foo(1, "name") } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForNullForNotnullType.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForNullForNotnullType.kt index d53f5d8d71a7..c5267f40b8dc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForNullForNotnullType.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForNullForNotnullType.kt @@ -4,4 +4,5 @@ fun foo(s : String) = Unit fun test() { foo(null, "") } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument.kt index 01854b42a8ad..93461c3eb5a8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument.kt @@ -5,4 +5,5 @@ fun foo() {} fun test(isObject: Boolean) { foo(isObject) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument.kt.after index d88e2692d3d8..f76608005870 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument.kt.after @@ -5,4 +5,5 @@ fun foo(isObject: Boolean) {} fun test(isObject: Boolean) { foo(isObject) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument2.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument2.kt index ca40e34a0fea..af53c451cb5f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument2.kt @@ -5,4 +5,5 @@ fun bar(isObject: Boolean) {} fun test(isObject: Boolean) { bar(true, isObject) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument2.kt.after index 78e9015b4cf4..bd97a9f9e0d7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument2.kt.after @@ -5,4 +5,5 @@ fun bar(isObject: Boolean, isObject1: Boolean) {} fun test(isObject: Boolean) { bar(true, isObject) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument3.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument3.kt index b6b528d2a962..6657f1eeb5cf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument3.kt @@ -5,4 +5,5 @@ fun foo() {} fun test(isObject: Boolean) { foo((isObject)) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument3.kt.after index 952c3ff1b914..66bd9e5cc42d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument3.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument3.kt.after @@ -5,4 +5,5 @@ fun foo(isObject: Boolean) {} fun test(isObject: Boolean) { foo((isObject)) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.fir.kt.after new file mode 100644 index 000000000000..00bd5f98f2c2 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.fir.kt.after @@ -0,0 +1,15 @@ +// "Add parameter to function 'foo'" "true" +// DISABLE-ERRORS +fun foo(string: String) {} + +fun bar(f: (String) -> Unit) {} + +fun test() { + bar { + foo(it) + } +} + + +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.kt index 9d61f2ce031d..03a93825be98 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.kt @@ -11,4 +11,5 @@ fun test() { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.kt.after index c027511c56df..b2e4cdd6ef5f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.kt.after @@ -11,4 +11,5 @@ fun test() { } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinApplicatorBasedQuickFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.fir.kt.after new file mode 100644 index 000000000000..e9522bb42871 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.fir.kt.after @@ -0,0 +1,13 @@ +// "Add parameter to function 'foo'" "true" +// DISABLE-ERRORS +fun foo(string: String) {} + +class Test { + val x: String = "" + get() { + foo(field) + return field + } +} +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.kt index 573661f52aaf..04e0d472a9b2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.kt @@ -9,4 +9,5 @@ class Test { return field } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.kt.after index f01cef7790c6..48bbec811c8a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.kt.after @@ -9,4 +9,5 @@ class Test { return field } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinApplicatorBasedQuickFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch1.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch1.kt index a66257acdf73..3b7d5ac492cd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch1.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch1.kt @@ -5,4 +5,5 @@ fun foo(i1: Int, i2: Int, i3: Int, i4: Int) { fun test() { foo("", 2, 3, 4, 5) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch2.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch2.kt index 503610d671b2..50fcb64ba6a5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch2.kt @@ -5,4 +5,5 @@ fun foo(i1: Int, i2: Int, i3: Int, i4: Int) { fun test() { foo(1, "", 3, 4, 5) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch3.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch3.kt index 0f3fbc73429b..35e56afc7161 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch3.kt @@ -5,4 +5,5 @@ fun foo(i1: Int, i2: Int, i3: Int, i4: Int) { fun test() { foo(1, 2, "", 4, 5) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch4.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch4.kt index 4009c80e34b6..d30e50dd1052 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch4.kt @@ -5,4 +5,5 @@ fun foo(i1: Int, i2: Int, i3: Int, i4: Int) { fun test() { foo(1, 2, 3, "", 5) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch5.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch5.kt index ecfe02bdc49f..52c8d4271e8e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch5.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatch5.kt @@ -12,3 +12,5 @@ fun foo(i1: Int, i2: Int, i3: Int, i4: Int) { fun test() { foo("", "", 3, 4, 5) } + +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatchWithLambdaArgument.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatchWithLambdaArgument.kt index de75a7551107..96322ec09a10 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatchWithLambdaArgument.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForTypeMismatchWithLambdaArgument.kt @@ -4,4 +4,5 @@ fun foo(f: () -> Unit) {} fun test() { foo("") {} } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.fir.kt.after new file mode 100644 index 000000000000..bdb05490640b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.fir.kt.after @@ -0,0 +1,12 @@ +import java.util.LinkedHashSet + +// "Add parameter to function 'foo'" "true" +// DISABLE-ERRORS + +fun foo(x: Int, linkedHashSet: LinkedHashSet) { + foo(, java.util.LinkedHashSet()); + foo(1, java.util.LinkedHashSet()); + foo(2, java.util.LinkedHashSet()); +} +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt index 1664530cc701..be20daa8c5b6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt @@ -6,4 +6,5 @@ fun foo(x: Int) { foo(1); foo(2, java.util.LinkedHashSet()); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithAnonymousFunction.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithAnonymousFunction.kt index 2c5ed71cc1a8..d1915f27ea3f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithAnonymousFunction.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithAnonymousFunction.kt @@ -4,4 +4,5 @@ fun baz() {} fun foo() { baz(fun(i: Int): String { return i.toString() }) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithAnonymousFunction.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithAnonymousFunction.kt.after index 8d9f94feca40..469297407ebc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithAnonymousFunction.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithAnonymousFunction.kt.after @@ -4,4 +4,5 @@ fun baz(function: (Int) -> String) {} fun foo() { baz(fun(i: Int): String { return i.toString() }) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.fir.kt.after new file mode 100644 index 000000000000..f4eb01502d23 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.fir.kt.after @@ -0,0 +1,10 @@ +// "Add parameter to function 'baz'" "true" +fun bar(): Int = 42 + +fun baz(function: () -> Int) {} + +fun foo() { + baz(::bar) +} +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.kt index 1ae2d83bef83..988d38e13cda 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.kt @@ -6,4 +6,5 @@ fun baz() {} fun foo() { baz(::bar) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.kt.after index 04d3bb37055f..46b3ec2260cf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.kt.after @@ -6,4 +6,5 @@ fun baz(kFunction0: () -> Int) {} fun foo() { baz(::bar) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinApplicatorBasedQuickFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.fir.kt.after new file mode 100644 index 000000000000..2cf2371eec5b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.fir.kt.after @@ -0,0 +1,8 @@ +// "Add parameter to function 'baz'" "true" +fun baz(function: (Int) -> String) {} + +fun foo() { + baz() { i: Int -> i.toString() } +} +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.kt index c65b634544ee..218af6b87f06 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.kt @@ -4,4 +4,5 @@ fun baz() {} fun foo() { baz { i: Int -> i.toString() } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.kt.after index 85f3053f24c7..f1b9bc624ba4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.kt.after @@ -4,4 +4,5 @@ fun baz(function: (Int) -> String) {} fun foo() { baz { i: Int -> i.toString() } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinApplicatorBasedQuickFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.fir.kt.after new file mode 100644 index 000000000000..1168ce882f6e --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.fir.kt.after @@ -0,0 +1,15 @@ +// "Add parameter to function 'fooFun'" "true" +sealed class Foo { + class SubFoo : Foo() + class Sub2Foo : Foo() +} + +fun fooFun(subFoo1: Foo.SubFoo): Int = 1 + +val subFoo: Foo = Foo.SubFoo() +val bar = when(subFoo){ + is Foo.SubFoo -> fooFun(subFoo) + else -> 0 +} +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.kt index 336acfbcbd92..ae506e63ec30 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.kt @@ -11,4 +11,5 @@ val bar = when(subFoo){ is Foo.SubFoo -> fooFun(subFoo) else -> 0 } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.kt.after index 3dfc89e1f8ad..ae6971625788 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.kt.after @@ -11,4 +11,5 @@ val bar = when(subFoo){ is Foo.SubFoo -> fooFun(subFoo) else -> 0 } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinApplicatorBasedQuickFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartcastedArgument.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartcastedArgument.kt index 91e7ae667b0e..1b8f629ed818 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartcastedArgument.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartcastedArgument.kt @@ -12,4 +12,5 @@ fun foobar(parent: Parent) { } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartcastedArgument.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartcastedArgument.kt.after index 4164528bed1c..57fe5babbfb8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartcastedArgument.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartcastedArgument.kt.after @@ -12,4 +12,5 @@ fun foobar(parent: Parent) { } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.fir.kt.after new file mode 100644 index 000000000000..9911dd8fcf02 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.fir.kt.after @@ -0,0 +1,10 @@ +// "Add parameter to function 'baz'" "true" +suspend fun bar(): Int = 42 + +suspend fun baz(function: suspend () -> Int) {} + +suspend fun foo() { + baz(::bar) +} +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.kt index 04948bdd9b14..aacb30f9656f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.kt @@ -6,4 +6,5 @@ suspend fun baz() {} suspend fun foo() { baz(::bar) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.kt.after index cc3913d30362..3905638b25e6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.kt.after @@ -6,4 +6,5 @@ suspend fun baz(kSuspendFunction0: suspend () -> Int) {} suspend fun foo() { baz(::bar) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinApplicatorBasedQuickFix \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addNothingReturnType.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addNothingReturnType.kt index 157be9598e4d..2c2ce567a388 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addNothingReturnType.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addNothingReturnType.kt @@ -1,4 +1,5 @@ // "Specify return type explicitly" "true" // WITH_STDLIB fun foo() = throw IllegalArgumentException() -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.SpecifyTypeExplicitlyIntention \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addNothingReturnType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addNothingReturnType.kt.after index 666fcf7571d4..11d7d2152083 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addNothingReturnType.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addNothingReturnType.kt.after @@ -1,4 +1,5 @@ // "Specify return type explicitly" "true" // WITH_STDLIB fun foo(): Nothing = throw IllegalArgumentException() -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.codeinsight.intentions.SpecifyTypeExplicitlyIntention \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addParameterToFakeOverride.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addParameterToFakeOverride.kt index 92b4aff16375..5ed1d67aa650 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addParameterToFakeOverride.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addParameterToFakeOverride.kt @@ -17,4 +17,5 @@ interface ZZZZ : ZZZ { fun usage(z: ZZZ) { z.f(3) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeAnnotationClassConstructor.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeAnnotationClassConstructor.kt index a877f085942d..a7abc6b8182b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeAnnotationClassConstructor.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeAnnotationClassConstructor.kt @@ -4,4 +4,5 @@ private annotation class AnnParClass(val p1: Int, val p2: Int) @AnnParClass(1, 2, 3) private val vac = 3 -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeAnnotationClassConstructor.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeAnnotationClassConstructor.kt.after index 0f4170f09b1e..ba1488f37ac2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeAnnotationClassConstructor.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeAnnotationClassConstructor.kt.after @@ -4,4 +4,5 @@ private annotation class AnnParClass(val p1: Int, val p2: Int, val i: Int) @AnnParClass(1, 2, 3) private val vac = 3 -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeClassConstructor.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeClassConstructor.kt index eb52b6e94529..af08f2e4cf27 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeClassConstructor.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeClassConstructor.kt @@ -5,4 +5,5 @@ fun test() { val foo = FooBar(1, "name") } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeDataClassConstructor.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeDataClassConstructor.kt index ac31d70f2125..758b53b1d079 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeDataClassConstructor.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeDataClassConstructor.kt @@ -5,4 +5,5 @@ fun test() { val foo = FooBar(1, "name") } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt index 1f009e3bb2aa..0e48ac82cd25 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt @@ -5,4 +5,5 @@ fun f(x: Int, y: Int, z : () -> Int) { f(1, 2, {x: Int, y: Int -> 42}); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralSignatureFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralSignatureFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt index c2ab8b6d7d37..4401503c6924 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt @@ -5,4 +5,5 @@ fun f(x: Int, y: Int, z : (Int, Int?, Any) -> Int) { f(1, 2, {x: Int -> 42}); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralSignatureFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralSignatureFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters3.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters3.kt index cbd152aeb5ee..73f416128557 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters3.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters3.kt @@ -6,4 +6,5 @@ fun f(x: Int, y: Int, z : () -> Int) { f(1, 2, {x: Int, y: Int -> x}); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralSignatureFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralSignatureFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters4.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters4.kt index 4fd8f9a96810..71210fb3870e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeFunctionLiteralParameters4.kt @@ -6,4 +6,5 @@ fun f(x: Int, y: Int, z : (Int, Int?, Any) -> Int) { f(1, 2, {x: Int -> x}); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralSignatureFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralSignatureFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchy.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchy.kt index 9f7d6bf19e12..06adfe19f8a6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchy.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchy.kt @@ -57,4 +57,5 @@ fun usage(o: OOOB) { o.f(3) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchyHead.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchyHead.kt index 29fda2e68371..5a5ceaf4906a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchyHead.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchyHead.kt @@ -57,4 +57,5 @@ fun usage(o: OOOB) { o.f(3) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchyTail.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchyTail.kt index 0b592c2cbf10..baffd623b2d9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchyTail.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/complexHierarchyTail.kt @@ -57,4 +57,5 @@ fun usage(o: OOOB) { o.f(3, "asdv") } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt index ea7325ed0897..2ba10534ed1e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt @@ -7,4 +7,5 @@ fun foo(f: Int.(Int, Int) -> Int) { fun test() { foo { a: Int -> 0 } } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralSignatureFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralSignatureFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/linearHierarchy.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/linearHierarchy.kt index 53197f12c3db..840964347c96 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/linearHierarchy.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/linearHierarchy.kt @@ -24,4 +24,5 @@ fun usage(o: OOO) { o.f(3) } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeConstructorParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeConstructorParameter.kt index 8bf1494b1777..36fa93af9019 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeConstructorParameter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeConstructorParameter.kt @@ -11,4 +11,5 @@ open class Base(var x: Int) { open class Inherited(x: Int) : Base() {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeConstructorParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeConstructorParameter.kt.after index 48bf3d71c3c3..c01b1116c598 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeConstructorParameter.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeConstructorParameter.kt.after @@ -11,4 +11,5 @@ open class Base() { open class Inherited(x: Int) : Base() {} -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt index 7f8ac3a05479..28498822ba0e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt @@ -7,4 +7,5 @@ fun foo(x: Int, y: Int) { foo(1, 2); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt.after index 9851bb9909e0..6b02a8713226 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt.after @@ -7,4 +7,5 @@ fun foo(y: Int) { foo(2); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt index cf00787c2f8b..02df16284f8d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt @@ -7,4 +7,5 @@ fun foo(x: Int, y: Int) { foo(1, 2); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt.after index f12253a16633..ce3f4d286a2e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt.after @@ -7,4 +7,5 @@ fun foo(x: Int) { foo(1); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt index f6dc847318ce..814fc0b2dcde 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt @@ -7,4 +7,5 @@ fun foo(x: Int, y: Int) { foo(1, 2); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt.after index f12253a16633..ce3f4d286a2e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt.after @@ -7,4 +7,5 @@ fun foo(x: Int) { foo(1); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeNamedParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeNamedParameter.kt index a690a15fe751..eae40632627f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeNamedParameter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeNamedParameter.kt @@ -7,4 +7,5 @@ fun foo(x: Int, y: Int) { foo(1, 2); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeNamedParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeNamedParameter.kt.after index 024a07542471..9ebb6466ade6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeNamedParameter.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeNamedParameter.kt.after @@ -7,4 +7,5 @@ fun foo(y: Int) { foo(2); foo(2, 3, sdsd); } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.quickFix.ChangeSignatureFixFactory$applicator$1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt index c807333318e1..b0b3ed25c99c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt @@ -17,4 +17,5 @@ interface ZZZZ : ZZZ { fun usage(z: ZZZ) { z.f() } -// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix \ No newline at end of file +// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionSignatureFix$Companion$RemoveParameterFix +// IGNORE_K2 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionLastLambdaParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeFunctionLastLambdaParameter.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionLastLambdaParameter.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeFunctionLastLambdaParameter.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionLastLambdaParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeFunctionLastLambdaParameter.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeFunctionLastLambdaParameter.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeFunctionLastLambdaParameter.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeParameterFromExtension.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeParameterFromExtension.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeParameterFromExtension.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeParameterFromExtension.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeParameterFromExtension.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeParameterFromExtension.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeParameterFromExtension.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeParameterFromExtension.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedConstructorParameterWithUsage.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedConstructorParameterWithUsage.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedConstructorParameterWithUsage.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedConstructorParameterWithUsage.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedConstructorParameterWithUsage.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedConstructorParameterWithUsage.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedConstructorParameterWithUsage.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedConstructorParameterWithUsage.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedExtensionParameter.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedExtensionParameter.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedExtensionParameter.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedExtensionParameter.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedInternalConstructorParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedInternalConstructorParameter.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedInternalConstructorParameter.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedInternalConstructorParameter.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedInternalConstructorParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedInternalConstructorParameter.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedInternalConstructorParameter.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedInternalConstructorParameter.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameter.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameter.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameter.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameter.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameter.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameter.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterOfPropertySetter.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterOfPropertySetter.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterOfPropertySetter.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterOfPropertySetter.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments2.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments2.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments2.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments3.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments3.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments3.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments3.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments3.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments3.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments3.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments4.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments4.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments4.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments4.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments4.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithComments4.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithComments4.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithLongQualifier.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithLongQualifier.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithLongQualifier.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithLongQualifier.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithLongQualifier.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter2.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter2.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter2.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter3.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter3.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter3.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter3.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter3.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter3.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter3.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter4.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter4.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter4.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter4.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter4.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter4.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter4.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter5.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter5.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter5.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter5.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter5.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter5.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter5.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter5.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter6.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter6.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter6.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter6.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter6.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter6.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter6.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter6.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter7.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter7.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter7.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter7.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter7.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter7.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter7.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameter7.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameterAndTypeConstraint.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameterAndTypeConstraint.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameterAndTypeConstraint.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameterAndTypeConstraint.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameterAndTypeConstraint.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameterAndTypeConstraint.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameterAndTypeConstraint.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameterAndTypeConstraint.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedParameterWithTypeParameterAndTypeConstraint2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameter.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameter.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameter.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameter.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameter.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameter.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameter2.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameter2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameter2.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameter2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameter2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameter2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameter2.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameter2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameterWithComments.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameterWithComments.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameterWithComments.kt rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameterWithComments.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameterWithComments.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameterWithComments.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/removeUnusedPrimaryConstructorParameterWithComments.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/removeUnusedParameter/removeUnusedPrimaryConstructorParameterWithComments.kt.after diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.introduce.k2/kotlin.refactorings.introduce.k2.iml b/plugins/kotlin/refactorings/kotlin.refactorings.introduce.k2/kotlin.refactorings.introduce.k2.iml index 6a0187fe0d45..0a4942405d47 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.introduce.k2/kotlin.refactorings.introduce.k2.iml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.introduce.k2/kotlin.refactorings.introduce.k2.iml @@ -35,7 +35,6 @@ - diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml b/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml index 50666f948a49..1f7373f2d504 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml @@ -49,5 +49,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/resources/kotlin.refactorings.k2.xml b/plugins/kotlin/refactorings/kotlin.refactorings.k2/resources/kotlin.refactorings.k2.xml index 3bd45bb452ff..1f42bb5afefe 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/resources/kotlin.refactorings.k2.xml +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/resources/kotlin.refactorings.k2.xml @@ -22,4 +22,8 @@ + + + + diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/quickFix/ChangeSignatureFixFactory.kt b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/quickFix/ChangeSignatureFixFactory.kt new file mode 100644 index 000000000000..951dfcfe90be --- /dev/null +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/quickFix/ChangeSignatureFixFactory.kt @@ -0,0 +1,234 @@ +// Copyright 2000-2023 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.refactoring.changeSignature.quickFix + +import com.intellij.psi.PsiElement +import com.intellij.psi.util.parentOfType +import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisOnEdt +import org.jetbrains.kotlin.analysis.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.analyze +import org.jetbrains.kotlin.analysis.api.calls.KtCallableMemberCall +import org.jetbrains.kotlin.analysis.api.calls.KtErrorCallInfo +import org.jetbrains.kotlin.analysis.api.calls.symbol +import org.jetbrains.kotlin.analysis.api.components.buildClassType +import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KtFirDiagnostic +import org.jetbrains.kotlin.analysis.api.lifetime.allowAnalysisOnEdt +import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtParameterSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol +import org.jetbrains.kotlin.analysis.api.types.KtFunctionalType +import org.jetbrains.kotlin.analysis.api.types.KtType +import org.jetbrains.kotlin.builtins.StandardNames.IMPLICIT_LAMBDA_PARAMETER_NAME +import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind +import org.jetbrains.kotlin.idea.base.codeInsight.KotlinDeclarationNameValidator +import org.jetbrains.kotlin.idea.base.codeInsight.KotlinNameSuggester +import org.jetbrains.kotlin.idea.base.codeInsight.KotlinNameSuggester.Companion.suggestNameByName +import org.jetbrains.kotlin.idea.base.codeInsight.KotlinNameSuggestionProvider +import org.jetbrains.kotlin.idea.base.psi.getStartLineOffset +import org.jetbrains.kotlin.idea.base.resources.KotlinBundle.message +import org.jetbrains.kotlin.idea.codeinsight.api.applicators.KotlinApplicatorInput +import org.jetbrains.kotlin.idea.codeinsight.api.applicators.applicator +import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinApplicatorTargetWithInput +import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.diagnosticFixFactory +import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.withInput +import org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.defaultValOrVar +import org.jetbrains.kotlin.idea.k2.refactoring.changeSignature.* +import org.jetbrains.kotlin.psi.KtCallElement +import org.jetbrains.kotlin.psi.KtCallableDeclaration +import org.jetbrains.kotlin.psi.KtExpression +import org.jetbrains.kotlin.psi.KtNameReferenceExpression +import org.jetbrains.kotlin.psi.KtPsiUtil +import org.jetbrains.kotlin.psi.KtValueArgument +import org.jetbrains.kotlin.types.Variance +import kotlin.collections.firstOrNull +import kotlin.collections.forEach +import kotlin.collections.indexOf +import kotlin.let +import kotlin.sequences.firstOrNull +import kotlin.sequences.map +import kotlin.takeIf + +object ChangeSignatureFixFactory { + + class Input(val isConstructor: Boolean, val idx: Int, val parameterCount: Int, val name: String) : KotlinApplicatorInput + + @OptIn(KtAllowAnalysisOnEdt::class) + private val applicator = applicator { + familyName { message("fix.change.signature.family") } + actionName { psi, input -> + + if (input.idx >= 0) { + return@actionName message("fix.change.signature.remove.parameter", input.name) + } + + val valueArgument = psi.parentOfType(true) ?: return@actionName "" + val callElement = valueArgument.parentOfType() ?: return@actionName "" + + val arguments = callElement.valueArguments + val newParametersCnt = arguments.size - input.parameterCount + assert(newParametersCnt > 0) + + val isConstructor = input.isConstructor + + val declarationName = input.name + + val argumentIndex = callElement.valueArguments.indexOf(valueArgument) + if (isConstructor) { + message( + //"fix.add.function.parameters.add.parameter.constructor", + "fix.add.function.parameters.add.parameter.generic.constructor", + //argumentIndex, + newParametersCnt, declarationName + ) + } else { + message( + //"fix.add.function.parameters.add.parameter.function", + "fix.add.function.parameters.add.parameter.generic.function", + newParametersCnt, declarationName + ) + } + } + applyTo { psi, input -> + + val callElement = psi.parentOfType(input.idx >= 0) ?: return@applyTo + val changeInfo = allowAnalysisOnEdt { + analyze(callElement) { + val functionCall = ((callElement.resolveCall() as? KtErrorCallInfo)?.candidateCalls?.firstOrNull() as? KtCallableMemberCall<*, *>) ?: return@analyze null + + val ktCallableDeclaration = functionCall.partiallyAppliedSymbol.symbol.psi as? KtCallableDeclaration ?: return@analyze null //todo change java from kotlin + + val methodDescriptor = KotlinMethodDescriptor(ktCallableDeclaration) + + if (input.idx >= 0) { + methodDescriptor.parameters.removeAt(input.idx) + } else { + val argument = psi.parentOfType(true) ?: return@analyze null + val argumentExpression = argument.getArgumentExpression() + val ktType = getKtType(argumentExpression) ?: return@analyze null + + val nameValidator = KotlinDeclarationNameValidator( + ktCallableDeclaration, + true, + KotlinNameSuggestionProvider.ValidatorTarget.VARIABLE, + this, + ) + val parameterInfo = KotlinParameterInfo( + originalType = KotlinTypeInfo(ktType.render(position = Variance.IN_VARIANCE), callElement), + name = getNewArgumentName(argument, nameValidator), + originalIndex = -1, + valOrVar = defaultValOrVar(ktCallableDeclaration), + defaultValueForCall = argumentExpression?.copy() as KtExpression?, + defaultValueAsDefaultParameter = false, + defaultValue = null, + context = ktCallableDeclaration + ) + methodDescriptor.parameters.add( + callElement.valueArguments.indexOf(argument), + parameterInfo + ) + } + + KotlinChangeInfo(methodDescriptor) + } + } ?: return@applyTo + KotlinChangeSignatureProcessor(changeInfo.method.project, changeInfo).run() + } + startInWriteAction { false } + } + + context(KtAnalysisSession) + private fun getKtType(argumentExpression: KtExpression?): KtType? { + var ktType = argumentExpression?.getKtType() + val typeKind = ktType?.functionTypeKind + when (typeKind) { + FunctionTypeKind.KFunction -> typeKind.nonReflectKind() + FunctionTypeKind.KSuspendFunction -> typeKind.nonReflectKind() + else -> null + }?.let { + val functionalType = ktType as KtFunctionalType + return buildClassType(it.numberedClassId((functionalType).arity)) { + functionalType.parameterTypes.forEach { arg -> + argument(arg) + } + argument(functionalType.returnType) + } + } + return ktType + } + context(KtAnalysisSession) + private fun getNewArgumentName(argument: KtValueArgument, validator: (String) -> Boolean): String { + val expression = KtPsiUtil.deparenthesize(argument.getArgumentExpression()) + val argumentName = argument.getArgumentName()?.asName?.asString() + ?: (expression as? KtNameReferenceExpression)?.getReferencedName()?.takeIf { !isSpecialName(it) } + + return when { + argumentName != null -> suggestNameByName(argumentName, validator) + expression != null -> { + val expressionText = expression.text + with(KotlinNameSuggester()) { + if (isSpecialName(expressionText)) { + val ktType = expression.getKtType() + if (ktType != null) { + return suggestTypeNames(ktType).map { typeName -> + suggestNameByName(typeName, validator) + }.firstOrNull() ?: "param" + } + } + + suggestExpressionNames(expression, validator).firstOrNull() ?: "param" + } + } + else -> suggestNameByName("param", validator) + } + } + + private fun isSpecialName(name: String): Boolean { + return name == IMPLICIT_LAMBDA_PARAMETER_NAME.identifier || name == "field" + } + + val addParameterFactory = + diagnosticFixFactory(KtFirDiagnostic.TooManyArguments::class, applicator) { diagnostic -> + createAddParameterFix(diagnostic.function, diagnostic.psi) + } + + context(KtAnalysisSession) + private fun createAddParameterFix(ktCallableSymbol: KtCallableSymbol, psi: PsiElement): List> { + if (ktCallableSymbol !is KtFunctionLikeSymbol) return emptyList() + val isConstructor = ktCallableSymbol is KtConstructorSymbol + val name = when { + isConstructor -> { + val constructorSymbol = ktCallableSymbol as KtConstructorSymbol + if ((constructorSymbol.getContainingSymbol() as? KtNamedClassOrObjectSymbol)?.isInline == true) { + return emptyList() + } + (constructorSymbol).containingClassIdIfNonLocal?.shortClassName + } + else -> { + (ktCallableSymbol as KtFunctionSymbol).name + } + }?.asString() ?: return emptyList() + val valueArgument = psi.parentOfType(true) ?: return emptyList() + valueArgument.parentOfType() ?: return emptyList() + return listOf(psi withInput Input(isConstructor, -1, ktCallableSymbol.valueParameters.size, name)) + } + + val removeParameterFactory = + diagnosticFixFactory(KtFirDiagnostic.NoValueForParameter::class, applicator) { diagnostic -> + createRemoveParameterFix(diagnostic.violatedParameter, diagnostic.psi) + } + + context(KtAnalysisSession) + private fun createRemoveParameterFix(symbol: KtSymbol, psi: PsiElement): List> { + if (symbol !is KtParameterSymbol) return emptyList() + val containingSymbol = symbol.getContainingSymbol() as? KtFunctionLikeSymbol ?: return emptyList() + val isConstructor = containingSymbol is KtConstructorSymbol + val name = (symbol as? KtNamedSymbol)?.name?.asString() ?: return emptyList() + psi.parentOfType(true) ?: return emptyList() + val idx = containingSymbol.valueParameters.indexOf(symbol) + return listOf(psi withInput Input(isConstructor, idx, containingSymbol.valueParameters.size, name)) + } +} \ No newline at end of file diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/quickFix/ChangeSignatureQuickFixesRegistrar.kt b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/quickFix/ChangeSignatureQuickFixesRegistrar.kt new file mode 100644 index 000000000000..403d8d5f949a --- /dev/null +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/quickFix/ChangeSignatureQuickFixesRegistrar.kt @@ -0,0 +1,15 @@ +// Copyright 2000-2023 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.refactoring.changeSignature.quickFix + +import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinQuickFixRegistrar +import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinQuickFixesList +import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KtQuickFixesListBuilder + +class ChangeSignatureQuickFixesRegistrar: KotlinQuickFixRegistrar() { + private val changeSignature = KtQuickFixesListBuilder.registerPsiQuickFix { + registerApplicator(ChangeSignatureFixFactory.addParameterFactory) + registerApplicator(ChangeSignatureFixFactory.removeParameterFactory) + } + + override val list: KotlinQuickFixesList = changeSignature +} \ No newline at end of file diff --git a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2InspectionTests.kt b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2InspectionTests.kt index 69e8d73eb680..13e2d84a96a5 100644 --- a/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2InspectionTests.kt +++ b/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/codeinsight/GenerateK2InspectionTests.kt @@ -73,6 +73,7 @@ internal fun MutableTWorkspace.generateK2InspectionTests() { testClass { val pattern = Patterns.forRegex("^([\\w\\-_]+)\\.kt$") model("${idea}/quickfix/redundantIf", pattern = pattern) + model("${idea}/quickfix/changeSignature", pattern = pattern) model("${idea}/quickfix/redundantModalityModifier", pattern = pattern) model("${idea}/quickfix/removeToStringInStringTemplate", pattern = pattern) model("${idea}/quickfix/suppress", pattern = pattern)