From f36778006d5f290537e2ca96677357cd3a4cd959 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Fri, 12 Jul 2024 23:02:43 +0200 Subject: [PATCH] [kotlin] Align K2 test data file names #KTIJ-29583 GitOrigin-RevId: 150fae6655bde2c4b7120edf2223c3112a4f2121 --- .../fixes/AbstractHighLevelQuickFixTest.kt | 20 +++++++++---------- .../quickfix/tests/AbstractK2QuickFixTest.kt | 6 +++--- .../quickfix/AbstractQuickFixMultiFileTest.kt | 3 ++- ...r.fir.kt => iterableWithBadIterator.k2.kt} | 0 ...er => iterableWithBadIterator.k2.kt.after} | 0 ...nullReceiver.fir.kt => nullReceiver.k2.kt} | 0 ...> addEnumConstructorParameter.k2.kt.after} | 0 ... addEnumConstructorParameter2.k2.kt.after} | 0 ... addEnumConstructorParameter3.k2.kt.after} | 0 ...kt.after => addForItParameter.k2.kt.after} | 0 ...rameterForReferencedArgument4.k2.kt.after} | 0 ...rameterForReferencedArgument5.k2.kt.after} | 0 ...ctionParameterLongNameRuntime.k2.kt.after} | 0 ...arameterWithFunctionReference.k2.kt.after} | 0 ...ddFunctionParameterWithLambda.k2.kt.after} | 0 ...unctionParameterWithSmartCast.k2.kt.after} | 0 ...rWithSuspendFunctionReference.k2.kt.after} | 0 ...ter => changeClassConstructor.k2.kt.after} | 0 ...=> changeDataClassConstructor.k2.kt.after} | 0 ...elegatorToSupercallNoReceiver.k2.kt.after} | 0 ...ToSupercallWithClassQualifier.k2.kt.after} | 0 ...SupercallWithPackageQualifier.k2.kt.after} | 0 ...atorToSupercallWithTypeParams.k2.kt.after} | 0 ...edJavaSuperclass.after.k2.Dependency.java} | 0 ...ithJavaQualifier.after.k2.Dependency.java} | 0 ...ithJavaQualifier.after.k2.Dependency.java} | 0 ...ithJavaQualifier.after.k2.Dependency.java} | 0 ...tedJavaQualifier.after.k2.Dependency.java} | 0 ...JavaTypeReceiver.after.k2.Dependency.java} | 0 ...otQualifierWithStarProjection.k2.kt.after} | 0 ...classNotQualifierWithTypeArgs.k2.kt.after} | 0 ...JavaTypeReceiver.after.k2.Dependency.java} | 0 ...JavaTypeReceiver.after.k2.Dependency.java} | 0 ...fter => typeArgumentWithBound.k2.kt.after} | 0 ...ypeArgumentWithMultipleBounds.k2.kt.after} | 0 ...er => classNoExplicitReceiver.k2.kt.after} | 0 ...icitReceiverOfContainingClass.k2.kt.after} | 0 ...> interfaceNoExplicitReceiver.k2.kt.after} | 0 ...er => extensionFunOnInterface.k2.kt.after} | 0 ....kt => extensionFunOnJavaType.after.k2.kt} | 0 ...r => functionalTypeInReceiver.k2.kt.after} | 0 ...kt.after => extensionFunction.k2.kt.after} | 0 ...r.kt.after => extensionLambda.k2.kt.after} | 0 ...kt.after => callWithLambdaArg.k2.kt.after} | 0 ...fter => callWithLambdaArgOnly.k2.kt.after} | 0 ....fir.kt.after => funExtraArgs.k2.kt.after} | 0 ...ir.kt.after => funMissingArgs.k2.kt.after} | 0 ...ir.kt.after => funOnInterface.k2.kt.after} | 0 ...nOnJavaInterface.after.k2.Dependency.java} | 0 ....fir.kt => funOnJavaInterface.after.k2.kt} | 0 ...=> funOnJavaType.after.k2.Dependency.java} | 0 ...fir.kt.after => funOnUserType.k2.kt.after} | 0 ...funOnUserTypeWithDeclarations.k2.kt.after} | 0 ...hExplicitParamNamesOnUserType.k2.kt.after} | 0 ...r => funWithNullableParamType.k2.kt.after} | 0 ....after => funWithNullableType.k2.kt.after} | 0 ... funWithNullableTypeParameter.k2.kt.after} | 0 ...ricFunOnJavaType.after.k2.Dependency.java} | 0 ...kt.after => inconsistentTypes.k2.kt.after} | 0 ...icFunOnJavaClass.after.k2.Dependency.java} | 0 ...s.fir.kt.after => thisInClass.k2.kt.after} | 0 ...r.kt.after => thisInExtension.k2.kt.after} | 0 ...t.after => thisInNestedClass1.k2.kt.after} | 0 ...t.after => thisInNestedClass2.k2.kt.after} | 0 ...e.fir.kt.after => unknownType.k2.kt.after} | 0 ...after => argumentTypeMismatch.k2.kt.after} | 0 ...after => callWithClassLiteral.k2.kt.after} | 0 ...t.after => funWithPackageName.k2.kt.after} | 0 ...ir.kt.after => functionalType.k2.kt.after} | 0 ...ymousFunBlockWithExpectedType.k2.kt.after} | 0 ...nymousFunExprWithExpectedType.k2.kt.after} | 0 ...r => inLambdaWithExpectedType.k2.kt.after} | 0 ... => inLambdaWithExpectedType3.k2.kt.after} | 0 ... => javaNullabilityAnnotation.after.k2.kt} | 0 ...t.after => localFunNoReceiver.k2.kt.after} | 0 ....after => memberFunNoReceiver.k2.kt.after} | 0 ...memberLocalVarDelegateRuntime.k2.kt.after} | 0 ...r => memberValDelegateRuntime.k2.kt.after} | 0 ...r => memberVarDelegateRuntime.k2.kt.after} | 0 ... => objectMemberFunNoReceiver.k2.kt.after} | 0 ...r.kt.after => smartCastWithIs.k2.kt.after} | 0 ...ter => smartCastWithNullCheck.k2.kt.after} | 0 ...fter => topLevelFunNoReceiver.k2.kt.after} | 0 ...itFun.fir.kt.after => unitFun.k2.kt.after} | 0 ...a => classMember.after.k2.Dependency.java} | 0 ...r.after.fir.kt => classMember.after.k2.kt} | 0 ... inAccessorWithExpressionBody.k2.kt.after} | 0 ...ter => inDefaultValueLocalFun.k2.kt.after} | 0 ...ropertyInitializerInEnumClass.k2.kt.after} | 0 ...ropertyInitializerInEnumEntry.k2.kt.after} | 0 ...> complexExpressionUsedTwice2.k2.kt.after} | 0 ...> complexExpressionUsedTwice4.k2.kt.after} | 0 ...=> doNotShortenUserReferences.k2.kt.after} | 0 ...doNotShortenUsersExplicitThis.k2.kt.after} | 0 ...ter => importedObjectFunction.k2.kt.after} | 0 ...ter => importedObjectProperty.k2.kt.after} | 0 ....fir.kt.after => addArguments.k2.kt.after} | 0 ...t.fir.kt.after => addArgument.k2.kt.after} | 0 ...35015.fir.kt.after => kt35015.k2.kt.after} | 0 ...voke4.fir.kt.after => invoke4.k2.kt.after} | 0 ...onalParameterAndLambdaComplex.k2.kt.after} | 0 ...ThisSafeCallWithValue3Runtime.k2.kt.after} | 0 ...ThisSafeCallWithValue4Runtime.k2.kt.after} | 0 ...ShortenUserReferences2Runtime.k2.kt.after} | 0 ...tShortenUserReferencesRuntime.k2.kt.after} | 0 ...enProtectedMemberToPublicSingleFile.k2.kt} | 0 ...ectedMemberToPublicSingleFile.k2.kt.after} | 0 ...ptyPrimaryConstructorToPublic.k2.kt.after} | 0 ...r.kt.after => withInitializer.k2.kt.after} | 0 ...Get.fir.kt.after => unsafeGet.k2.kt.after} | 0 ...us.fir.kt.after => unsafePlus.k2.kt.after} | 0 ...eturnTypeMismatchOnMultipleOverride.k2.kt} | 0 ...ypeMismatchOnMultipleOverride.k2.kt.after} | 0 ...tToPropertyWithNoExplicitType.k2.kt.after} | 0 ...mment.fir.kt.after => comment.k2.kt.after} | 0 ...ter => functionExpressionBody.k2.kt.after} | 0 ...ressionBodyWithNoExplicitType.k2.kt.after} | 0 ...tementOfLambdaAsLocalVariable.k2.kt.after} | 0 ...stStatementOfLambdaAsProperty.k2.kt.after} | 0 ...eak.fir.kt.after => lineBreak.k2.kt.after} | 0 ...ll.fir.kt.after => doubleNull.k2.kt.after} | 0 ...tNull.fir.kt.after => notNull.k2.kt.after} | 0 ...er => fullyQualifiedSuperType.k2.kt.after} | 0 ...lifiedSuperTypeHasAnnotations.k2.kt.after} | 0 ...fiedSuperTypeHasTypeArguments.k2.kt.after} | 0 ....fir.kt.after => typeMismatch.k2.kt.after} | 0 ...t => onlyShortenInsertedArrayOfCall.k2.kt} | 0 ...nlyShortenInsertedArrayOfCall.k2.kt.after} | 0 ...t => replaceToArrayOfPrimitiveTypes.k2.kt} | 0 ...eplaceToArrayOfPrimitiveTypes.k2.kt.after} | 0 ...r.kt => simpleNamedArgumentToVararg.k2.kt} | 0 ...> simpleNamedArgumentToVararg.k2.kt.after} | 0 ...urroundWithSpreadForConstructorCall.k2.kt} | 0 ...dWithSpreadForConstructorCall.k2.kt.after} | 0 ...rParameterTypeLongNameRuntime.k2.kt.after} | 0 ...RemainingBranchesMissingLeftBracket.k2.kt} | 0 ...ingBranchesMissingLeftBracket.k2.kt.after} | 0 ...emainingBranchesMissingRightBracket.k2.kt} | 0 ...ngBranchesMissingRightBracket.k2.kt.after} | 0 ...ningBranchesMissingRightParenthesis.k2.kt} | 0 ...anchesMissingRightParenthesis.k2.kt.after} | 0 ...nt.fir.kt => callWithLambdaArgument.k2.kt} | 0 ...ter => callWithLambdaArgument.k2.kt.after} | 0 ...h.fir.kt => chainedCallTypeMismatch.k2.kt} | 0 ...er => chainedCallTypeMismatch.k2.kt.after} | 0 .../{inOperator.fir.kt => inOperator.k2.kt} | 0 ...or.fir.kt.after => inOperator.k2.kt.after} | 0 .../{insideLet.fir.kt => insideLet.k2.kt} | 0 ...Let.fir.kt.after => insideLet.k2.kt.after} | 0 ....fir.kt => nullableBinaryExpression.k2.kt} | 0 ...r => nullableBinaryExpression.k2.kt.after} | 0 ...factorNullableFunctionTypeProperty2.k2.kt} | 0 ...NullableFunctionTypeProperty2.k2.kt.after} | 0 ....kt => wrapAllNonNullablePositions1.k2.kt} | 0 ... wrapAllNonNullablePositions1.k2.kt.after} | 0 ....kt => wrapAllNonNullablePositions2.k2.kt} | 0 ... wrapAllNonNullablePositions2.k2.kt.after} | 0 ....kt => wrapAllNonNullablePositions3.k2.kt} | 0 ... wrapAllNonNullablePositions3.k2.kt.after} | 0 ....kt => wrapAllNonNullablePositions4.k2.kt} | 0 ... wrapAllNonNullablePositions4.k2.kt.after} | 0 ....kt => wrapAllNonNullablePositions5.k2.kt} | 0 ... wrapAllNonNullablePositions5.k2.kt.after} | 0 ....kt => wrapAllNonNullablePositions6.k2.kt} | 0 ... wrapAllNonNullablePositions6.k2.kt.after} | 0 165 files changed, 15 insertions(+), 14 deletions(-) rename plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/{iterableWithBadIterator.fir.kt => iterableWithBadIterator.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/{iterableWithBadIterator.fir.kt.after => iterableWithBadIterator.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/{nullReceiver.fir.kt => nullReceiver.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addEnumConstructorParameter.fir.kt.after => addEnumConstructorParameter.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addEnumConstructorParameter2.fir.kt.after => addEnumConstructorParameter2.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addEnumConstructorParameter3.fir.kt.after => addEnumConstructorParameter3.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addForItParameter.fir.kt.after => addForItParameter.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addFunctionParameterForReferencedArgument4.fir.kt.after => addFunctionParameterForReferencedArgument4.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addFunctionParameterForReferencedArgument5.fir.kt.after => addFunctionParameterForReferencedArgument5.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addFunctionParameterLongNameRuntime.fir.kt.after => addFunctionParameterLongNameRuntime.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addFunctionParameterWithFunctionReference.fir.kt.after => addFunctionParameterWithFunctionReference.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addFunctionParameterWithLambda.fir.kt.after => addFunctionParameterWithLambda.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addFunctionParameterWithSmartCast.fir.kt.after => addFunctionParameterWithSmartCast.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{addFunctionParameterWithSuspendFunctionReference.fir.kt.after => addFunctionParameterWithSuspendFunctionReference.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{changeClassConstructor.fir.kt.after => changeClassConstructor.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/changeSignature/{changeDataClassConstructor.fir.kt.after => changeDataClassConstructor.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{delegatorToSupercallNoReceiver.fir.kt.after => delegatorToSupercallNoReceiver.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{delegatorToSupercallWithClassQualifier.fir.kt.after => delegatorToSupercallWithClassQualifier.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{delegatorToSupercallWithPackageQualifier.fir.kt.after => delegatorToSupercallWithPackageQualifier.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{delegatorToSupercallWithTypeParams.fir.kt.after => delegatorToSupercallWithTypeParams.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{interfaceDelegatorToNestedJavaSuperclass.after.fir.Dependency.java => interfaceDelegatorToNestedJavaSuperclass.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{annotationWithJavaQualifier.after.fir.Dependency.java => annotationWithJavaQualifier.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{enumWithJavaQualifier.after.fir.Dependency.java => enumWithJavaQualifier.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{interfaceWithJavaQualifier.after.fir.Dependency.java => interfaceWithJavaQualifier.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/{interfaceByNestedJavaQualifier.after.fir.Dependency.java => interfaceByNestedJavaQualifier.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{annotationJavaTypeReceiver.after.fir.Dependency.java => annotationJavaTypeReceiver.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{classNotQualifierWithStarProjection.fir.kt.after => classNotQualifierWithStarProjection.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{classNotQualifierWithTypeArgs.fir.kt.after => classNotQualifierWithTypeArgs.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{enumJavaTypeReceiver.after.fir.Dependency.java => enumJavaTypeReceiver.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{interfaceJavaTypeReceiver.after.fir.Dependency.java => interfaceJavaTypeReceiver.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{typeArgumentWithBound.fir.kt.after => typeArgumentWithBound.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{typeArgumentWithMultipleBounds.fir.kt.after => typeArgumentWithMultipleBounds.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/{classNoExplicitReceiver.fir.kt.after => classNoExplicitReceiver.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/{explicitReceiverOfContainingClass.fir.kt.after => explicitReceiverOfContainingClass.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/{interfaceNoExplicitReceiver.fir.kt.after => interfaceNoExplicitReceiver.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/{extensionFunOnInterface.fir.kt.after => extensionFunOnInterface.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/{extensionFunOnJavaType.after.fir.kt => extensionFunOnJavaType.after.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/{functionalTypeInReceiver.fir.kt.after => functionalTypeInReceiver.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/{extensionFunction.fir.kt.after => extensionFunction.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/{extensionLambda.fir.kt.after => extensionLambda.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{callWithLambdaArg.fir.kt.after => callWithLambdaArg.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{callWithLambdaArgOnly.fir.kt.after => callWithLambdaArgOnly.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funExtraArgs.fir.kt.after => funExtraArgs.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funMissingArgs.fir.kt.after => funMissingArgs.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funOnInterface.fir.kt.after => funOnInterface.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funOnJavaInterface.after.fir.Dependency.java => funOnJavaInterface.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funOnJavaInterface.after.fir.kt => funOnJavaInterface.after.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funOnJavaType.after.fir.Dependency.java => funOnJavaType.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funOnUserType.fir.kt.after => funOnUserType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funOnUserTypeWithDeclarations.fir.kt.after => funOnUserTypeWithDeclarations.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funWithExplicitParamNamesOnUserType.fir.kt.after => funWithExplicitParamNamesOnUserType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funWithNullableParamType.fir.kt.after => funWithNullableParamType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funWithNullableType.fir.kt.after => funWithNullableType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{funWithNullableTypeParameter.fir.kt.after => funWithNullableTypeParameter.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{genericFunOnJavaType.after.fir.Dependency.java => genericFunOnJavaType.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{inconsistentTypes.fir.kt.after => inconsistentTypes.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{staticFunOnJavaClass.after.fir.Dependency.java => staticFunOnJavaClass.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{thisInClass.fir.kt.after => thisInClass.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{thisInExtension.fir.kt.after => thisInExtension.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{thisInNestedClass1.fir.kt.after => thisInNestedClass1.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{thisInNestedClass2.fir.kt.after => thisInNestedClass2.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/{unknownType.fir.kt.after => unknownType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{argumentTypeMismatch.fir.kt.after => argumentTypeMismatch.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{callWithClassLiteral.fir.kt.after => callWithClassLiteral.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{funWithPackageName.fir.kt.after => funWithPackageName.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{functionalType.fir.kt.after => functionalType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{inAnonymousFunBlockWithExpectedType.fir.kt.after => inAnonymousFunBlockWithExpectedType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{inAnonymousFunExprWithExpectedType.fir.kt.after => inAnonymousFunExprWithExpectedType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{inLambdaWithExpectedType.fir.kt.after => inLambdaWithExpectedType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{inLambdaWithExpectedType3.fir.kt.after => inLambdaWithExpectedType3.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{javaNullabilityAnnotation.after.fir.kt => javaNullabilityAnnotation.after.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{localFunNoReceiver.fir.kt.after => localFunNoReceiver.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{memberFunNoReceiver.fir.kt.after => memberFunNoReceiver.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{memberLocalVarDelegateRuntime.fir.kt.after => memberLocalVarDelegateRuntime.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{memberValDelegateRuntime.fir.kt.after => memberValDelegateRuntime.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{memberVarDelegateRuntime.fir.kt.after => memberVarDelegateRuntime.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{objectMemberFunNoReceiver.fir.kt.after => objectMemberFunNoReceiver.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{smartCastWithIs.fir.kt.after => smartCastWithIs.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{smartCastWithNullCheck.fir.kt.after => smartCastWithNullCheck.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{topLevelFunNoReceiver.fir.kt.after => topLevelFunNoReceiver.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/{unitFun.fir.kt.after => unitFun.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromKotlinToJava/{classMember.after.fir.Dependency.java => classMember.after.k2.Dependency.java} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromKotlinToJava/{classMember.after.fir.kt => classMember.after.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/{inAccessorWithExpressionBody.fir.kt.after => inAccessorWithExpressionBody.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/{inDefaultValueLocalFun.fir.kt.after => inDefaultValueLocalFun.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/{inPropertyInitializerInEnumClass.fir.kt.after => inPropertyInitializerInEnumClass.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/{inPropertyInitializerInEnumEntry.fir.kt.after => inPropertyInitializerInEnumEntry.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/{complexExpressionUsedTwice2.fir.kt.after => complexExpressionUsedTwice2.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/{complexExpressionUsedTwice4.fir.kt.after => complexExpressionUsedTwice4.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/{doNotShortenUserReferences.fir.kt.after => doNotShortenUserReferences.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/{doNotShortenUsersExplicitThis.fir.kt.after => doNotShortenUsersExplicitThis.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/{importedObjectFunction.fir.kt.after => importedObjectFunction.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/{importedObjectProperty.fir.kt.after => importedObjectProperty.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/keepComments/{addArguments.fir.kt.after => addArguments.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/{addArgument.fir.kt.after => addArgument.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/{kt35015.fir.kt.after => kt35015.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/operatorCalls/{invoke4.fir.kt.after => invoke4.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/optionalParameters/{optionalParameterAndLambdaComplex.fir.kt.after => optionalParameterAndLambdaComplex.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/safeCall/{changeThisSafeCallWithValue3Runtime.fir.kt.after => changeThisSafeCallWithValue3Runtime.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/safeCall/{changeThisSafeCallWithValue4Runtime.fir.kt.after => changeThisSafeCallWithValue4Runtime.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/vararg/{doNotShortenUserReferences2Runtime.fir.kt.after => doNotShortenUserReferences2Runtime.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/vararg/{doNotShortenUserReferencesRuntime.fir.kt.after => doNotShortenUserReferencesRuntime.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/{overriddenProtectedMemberToPublicSingleFile.fir.kt => overriddenProtectedMemberToPublicSingleFile.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/{overriddenProtectedMemberToPublicSingleFile.fir.kt.after => overriddenProtectedMemberToPublicSingleFile.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/{privateEmptyPrimaryConstructorToPublic.fir.kt.after => privateEmptyPrimaryConstructorToPublic.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/lateinit/{withInitializer.fir.kt.after => withInitializer.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/{unsafeGet.fir.kt.after => unsafeGet.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/{unsafePlus.fir.kt.after => unsafePlus.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/{returnTypeMismatchOnMultipleOverride.fir.kt => returnTypeMismatchOnMultipleOverride.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/{returnTypeMismatchOnMultipleOverride.fir.kt.after => returnTypeMismatchOnMultipleOverride.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/{assignmentToPropertyWithNoExplicitType.fir.kt.after => assignmentToPropertyWithNoExplicitType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/{comment.fir.kt.after => comment.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/{functionExpressionBody.fir.kt.after => functionExpressionBody.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/{functionExpressionBodyWithNoExplicitType.fir.kt.after => functionExpressionBodyWithNoExplicitType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/{lastStatementOfLambdaAsLocalVariable.fir.kt.after => lastStatementOfLambdaAsLocalVariable.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/{lastStatementOfLambdaAsProperty.fir.kt.after => lastStatementOfLambdaAsProperty.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/{lineBreak.fir.kt.after => lineBreak.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/simplifyComparison/{doubleNull.fir.kt.after => doubleNull.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/simplifyComparison/{notNull.fir.kt.after => notNull.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/{fullyQualifiedSuperType.fir.kt.after => fullyQualifiedSuperType.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/{fullyQualifiedSuperTypeHasAnnotations.fir.kt.after => fullyQualifiedSuperTypeHasAnnotations.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/{fullyQualifiedSuperTypeHasTypeArguments.fir.kt.after => fullyQualifiedSuperTypeHasTypeArguments.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/{typeMismatch.fir.kt.after => typeMismatch.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/{onlyShortenInsertedArrayOfCall.fir.kt => onlyShortenInsertedArrayOfCall.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/{onlyShortenInsertedArrayOfCall.fir.kt.after => onlyShortenInsertedArrayOfCall.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/{replaceToArrayOfPrimitiveTypes.fir.kt => replaceToArrayOfPrimitiveTypes.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/{replaceToArrayOfPrimitiveTypes.fir.kt.after => replaceToArrayOfPrimitiveTypes.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/{simpleNamedArgumentToVararg.fir.kt => simpleNamedArgumentToVararg.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/{simpleNamedArgumentToVararg.fir.kt.after => simpleNamedArgumentToVararg.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/{surroundWithSpreadForConstructorCall.fir.kt => surroundWithSpreadForConstructorCall.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/{surroundWithSpreadForConstructorCall.fir.kt.after => surroundWithSpreadForConstructorCall.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/typeAddition/{wrongGetterParameterTypeLongNameRuntime.fir.kt.after => wrongGetterParameterTypeLongNameRuntime.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/when/{addRemainingBranchesMissingLeftBracket.fir.kt => addRemainingBranchesMissingLeftBracket.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/when/{addRemainingBranchesMissingLeftBracket.fir.kt.after => addRemainingBranchesMissingLeftBracket.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/when/{addRemainingBranchesMissingRightBracket.fir.kt => addRemainingBranchesMissingRightBracket.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/when/{addRemainingBranchesMissingRightBracket.fir.kt.after => addRemainingBranchesMissingRightBracket.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/when/{addRemainingBranchesMissingRightParenthesis.fir.kt => addRemainingBranchesMissingRightParenthesis.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/when/{addRemainingBranchesMissingRightParenthesis.fir.kt.after => addRemainingBranchesMissingRightParenthesis.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{callWithLambdaArgument.fir.kt => callWithLambdaArgument.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{callWithLambdaArgument.fir.kt.after => callWithLambdaArgument.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{chainedCallTypeMismatch.fir.kt => chainedCallTypeMismatch.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{chainedCallTypeMismatch.fir.kt.after => chainedCallTypeMismatch.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{inOperator.fir.kt => inOperator.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{inOperator.fir.kt.after => inOperator.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{insideLet.fir.kt => insideLet.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{insideLet.fir.kt.after => insideLet.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{nullableBinaryExpression.fir.kt => nullableBinaryExpression.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{nullableBinaryExpression.fir.kt.after => nullableBinaryExpression.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{refactorNullableFunctionTypeProperty2.fir.kt => refactorNullableFunctionTypeProperty2.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{refactorNullableFunctionTypeProperty2.fir.kt.after => refactorNullableFunctionTypeProperty2.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions1.fir.kt => wrapAllNonNullablePositions1.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions1.fir.kt.after => wrapAllNonNullablePositions1.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions2.fir.kt => wrapAllNonNullablePositions2.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions2.fir.kt.after => wrapAllNonNullablePositions2.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions3.fir.kt => wrapAllNonNullablePositions3.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions3.fir.kt.after => wrapAllNonNullablePositions3.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions4.fir.kt => wrapAllNonNullablePositions4.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions4.fir.kt.after => wrapAllNonNullablePositions4.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions5.fir.kt => wrapAllNonNullablePositions5.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions5.fir.kt.after => wrapAllNonNullablePositions5.k2.kt.after} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions6.fir.kt => wrapAllNonNullablePositions6.k2.kt} (100%) rename plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/{wrapAllNonNullablePositions6.fir.kt.after => wrapAllNonNullablePositions6.k2.kt.after} (100%) diff --git a/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AbstractHighLevelQuickFixTest.kt b/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AbstractHighLevelQuickFixTest.kt index 5ed3032a89d0..12afe8f37de9 100644 --- a/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AbstractHighLevelQuickFixTest.kt +++ b/plugins/kotlin/code-insight/fixes-k2/tests/test/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/AbstractHighLevelQuickFixTest.kt @@ -27,24 +27,24 @@ abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() { override val disableTestDirective: String get() = IgnoreTests.DIRECTIVES.IGNORE_K2_MULTILINE_COMMENT override fun doTest(beforeFileName: String) { - val firBeforeFileName = getFirBeforeFileName(beforeFileName) - super.doTest(firBeforeFileName) + val effectiveBeforeFileName = getK2BeforeFileName(beforeFileName) + super.doTest(effectiveBeforeFileName) } - private fun getFirBeforeFileName(beforeFileName: String): String { - val firBeforeFilename = beforeFileName.replace(".kt", ".fir.kt") - val firBeforeFile = File(firBeforeFilename) - return if (firBeforeFile.exists()) { - firBeforeFile.canonicalPath + private fun getK2BeforeFileName(beforeFileName: String): String { + val beforeFilename = beforeFileName.replace(".kt", ".k2.kt") + val beforeFile = File(beforeFilename) + return if (beforeFile.exists()) { + beforeFile.canonicalPath } else { beforeFileName } } override fun getAfterFileName(beforeFileName: String): String { - val firAfterFile = File(dataFilePath(beforeFileName.replace(".kt", ".fir.kt.after"))) - return if (firAfterFile.exists()) { - firAfterFile.name + val afterFile = File(dataFilePath(beforeFileName.replace(".kt", ".k2.kt.after"))) + return if (afterFile.exists()) { + afterFile.name } else { super.getAfterFileName(beforeFileName) } 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 6faeb97d2d87..c69043028ec3 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 @@ -41,9 +41,9 @@ abstract class AbstractK2QuickFixTest : AbstractQuickFixTest() { } override fun getAfterFileName(beforeFileName: String): String { - val firAfterFile = File(dataFilePath(beforeFileName.replace(".kt", ".fir.kt.after"))) - return if (firAfterFile.exists()) { - firAfterFile.name + val afterFile = File(dataFilePath(beforeFileName.replace(".kt", ".k2.kt.after"))) + return if (afterFile.exists()) { + afterFile.name } else { super.getAfterFileName(beforeFileName) } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt index 607caa1b135a..f1ace3f623fe 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt @@ -26,6 +26,7 @@ import com.intellij.util.PathUtil import com.intellij.util.ThrowableRunnable import junit.framework.TestCase import org.jetbrains.kotlin.idea.KotlinFileType +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode import org.jetbrains.kotlin.idea.base.test.IgnoreTests import org.jetbrains.kotlin.idea.quickfix.utils.findInspectionFile import org.jetbrains.kotlin.idea.test.* @@ -271,7 +272,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest private fun findAfterFile(fullPath: String): File { val path = fullPath.replace(".before.Main.", ".before.") - val afterTokens = (if (isFirPlugin) arrayOf(".after.fir.") else arrayOf()) + ".after." + val afterTokens = (if (pluginMode == KotlinPluginMode.K2) arrayOf(".after.k2.") else arrayOf()) + ".after." for (afterToken in afterTokens) { val file = File(path.replace(".before.", afterToken)) if (file.exists()) return file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/iterableWithBadIterator.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/nullReceiver.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter2.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter2.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter2.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter2.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter3.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter3.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter3.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addEnumConstructorParameter3.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addForItParameter.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addForItParameter.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addForItParameter.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addForItParameter.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument4.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterForReferencedArgument5.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithFunctionReference.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithLambda.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSmartCast.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/addFunctionParameterWithSuspendFunctionReference.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeClassConstructor.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeClassConstructor.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeClassConstructor.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeClassConstructor.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeDataClassConstructor.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeDataClassConstructor.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeDataClassConstructor.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/changeSignature/changeDataClassConstructor.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/typeArgumentWithBound.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/typeArgumentWithBound.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/typeArgumentWithBound.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/typeArgumentWithBound.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/typeArgumentWithMultipleBounds.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/typeArgumentWithMultipleBounds.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/typeArgumentWithMultipleBounds.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/typeArgumentWithMultipleBounds.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/classNoExplicitReceiver.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/classNoExplicitReceiver.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/classNoExplicitReceiver.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/classNoExplicitReceiver.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/explicitReceiverOfContainingClass.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/explicitReceiverOfContainingClass.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/explicitReceiverOfContainingClass.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/explicitReceiverOfContainingClass.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/interfaceNoExplicitReceiver.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/interfaceNoExplicitReceiver.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/interfaceNoExplicitReceiver.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/interfaceNoExplicitReceiver.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/extensionFunOnInterface.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/extensionFunOnInterface.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/extensionFunOnInterface.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/extensionFunOnInterface.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/extensionFunOnJavaType.after.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/extensionFunOnJavaType.after.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/extensionFunOnJavaType.after.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/extensionFunOnJavaType.after.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/functionalTypeInReceiver.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/functionalTypeInReceiver.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/functionalTypeInReceiver.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extension/functionalTypeInReceiver.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/callWithLambdaArg.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/callWithLambdaArg.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/callWithLambdaArg.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/callWithLambdaArg.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/callWithLambdaArgOnly.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/callWithLambdaArgOnly.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/callWithLambdaArgOnly.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/callWithLambdaArgOnly.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funExtraArgs.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funExtraArgs.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funExtraArgs.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funExtraArgs.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funMissingArgs.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funMissingArgs.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funMissingArgs.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funMissingArgs.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnInterface.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnInterface.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnInterface.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnInterface.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaInterface.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaInterface.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaInterface.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaInterface.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaInterface.after.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaInterface.after.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaInterface.after.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaInterface.after.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaType.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaType.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaType.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnJavaType.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnUserType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnUserType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnUserType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnUserType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnUserTypeWithDeclarations.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnUserTypeWithDeclarations.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnUserTypeWithDeclarations.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funOnUserTypeWithDeclarations.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithExplicitParamNamesOnUserType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithExplicitParamNamesOnUserType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithExplicitParamNamesOnUserType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithExplicitParamNamesOnUserType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableParamType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableParamType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableParamType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableParamType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableTypeParameter.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableTypeParameter.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableTypeParameter.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/funWithNullableTypeParameter.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/genericFunOnJavaType.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/genericFunOnJavaType.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/genericFunOnJavaType.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/genericFunOnJavaType.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/inconsistentTypes.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/inconsistentTypes.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/inconsistentTypes.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/inconsistentTypes.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/staticFunOnJavaClass.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/staticFunOnJavaClass.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/staticFunOnJavaClass.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/staticFunOnJavaClass.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInClass.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInClass.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInClass.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInClass.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInExtension.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInExtension.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInExtension.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInExtension.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInNestedClass1.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInNestedClass1.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInNestedClass1.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInNestedClass1.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInNestedClass2.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInNestedClass2.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInNestedClass2.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/thisInNestedClass2.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/unknownType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/unknownType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/unknownType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/member/unknownType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/argumentTypeMismatch.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/argumentTypeMismatch.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/argumentTypeMismatch.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/argumentTypeMismatch.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/callWithClassLiteral.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/callWithClassLiteral.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/callWithClassLiteral.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/callWithClassLiteral.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/funWithPackageName.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/funWithPackageName.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/funWithPackageName.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/funWithPackageName.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/functionalType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/functionalType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/functionalType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/functionalType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inAnonymousFunBlockWithExpectedType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inAnonymousFunBlockWithExpectedType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inAnonymousFunBlockWithExpectedType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inAnonymousFunBlockWithExpectedType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inAnonymousFunExprWithExpectedType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inAnonymousFunExprWithExpectedType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inAnonymousFunExprWithExpectedType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inAnonymousFunExprWithExpectedType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inLambdaWithExpectedType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inLambdaWithExpectedType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inLambdaWithExpectedType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inLambdaWithExpectedType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inLambdaWithExpectedType3.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inLambdaWithExpectedType3.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inLambdaWithExpectedType3.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/inLambdaWithExpectedType3.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/javaNullabilityAnnotation.after.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/javaNullabilityAnnotation.after.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/javaNullabilityAnnotation.after.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/javaNullabilityAnnotation.after.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/localFunNoReceiver.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/localFunNoReceiver.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/localFunNoReceiver.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/localFunNoReceiver.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberFunNoReceiver.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberFunNoReceiver.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberFunNoReceiver.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberFunNoReceiver.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberLocalVarDelegateRuntime.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberLocalVarDelegateRuntime.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberLocalVarDelegateRuntime.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberLocalVarDelegateRuntime.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberValDelegateRuntime.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberValDelegateRuntime.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberValDelegateRuntime.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberValDelegateRuntime.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberVarDelegateRuntime.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberVarDelegateRuntime.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberVarDelegateRuntime.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/memberVarDelegateRuntime.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/objectMemberFunNoReceiver.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/objectMemberFunNoReceiver.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/objectMemberFunNoReceiver.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/objectMemberFunNoReceiver.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/smartCastWithIs.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/smartCastWithIs.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/smartCastWithIs.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/smartCastWithIs.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/smartCastWithNullCheck.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/smartCastWithNullCheck.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/smartCastWithNullCheck.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/smartCastWithNullCheck.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/topLevelFunNoReceiver.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/topLevelFunNoReceiver.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/topLevelFunNoReceiver.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/topLevelFunNoReceiver.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/unitFun.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/unitFun.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/unitFun.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/simple/unitFun.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromKotlinToJava/classMember.after.fir.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromKotlinToJava/classMember.after.k2.Dependency.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromKotlinToJava/classMember.after.fir.Dependency.java rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromKotlinToJava/classMember.after.k2.Dependency.java diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromKotlinToJava/classMember.after.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromKotlinToJava/classMember.after.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromKotlinToJava/classMember.after.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromKotlinToJava/classMember.after.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/inDefaultValueLocalFun.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/inDefaultValueLocalFun.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/inDefaultValueLocalFun.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/inDefaultValueLocalFun.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice2.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice2.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice2.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice2.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice4.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice4.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice4.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice4.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/doNotShortenUserReferences.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/doNotShortenUserReferences.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/doNotShortenUserReferences.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/doNotShortenUserReferences.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/doNotShortenUsersExplicitThis.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/doNotShortenUsersExplicitThis.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/doNotShortenUsersExplicitThis.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/doNotShortenUsersExplicitThis.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/importedObjectFunction.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/importedObjectFunction.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/importedObjectFunction.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/importedObjectFunction.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/importedObjectProperty.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/importedObjectProperty.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/importedObjectProperty.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/importedObjectProperty.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/keepComments/addArguments.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/keepComments/addArguments.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/keepComments/addArguments.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/keepComments/addArguments.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/addArgument.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/addArgument.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/addArgument.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/addArgument.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/kt35015.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/kt35015.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/kt35015.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/kt35015.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/operatorCalls/invoke4.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/operatorCalls/invoke4.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/operatorCalls/invoke4.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/operatorCalls/invoke4.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameterAndLambdaComplex.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameterAndLambdaComplex.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameterAndLambdaComplex.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameterAndLambdaComplex.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue3Runtime.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue3Runtime.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue3Runtime.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue3Runtime.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue4Runtime.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue4Runtime.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue4Runtime.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue4Runtime.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferences2Runtime.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferences2Runtime.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferences2Runtime.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferences2Runtime.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferencesRuntime.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferencesRuntime.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferencesRuntime.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferencesRuntime.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateEmptyPrimaryConstructorToPublic.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateEmptyPrimaryConstructorToPublic.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateEmptyPrimaryConstructorToPublic.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateEmptyPrimaryConstructorToPublic.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeGet.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/assignmentToPropertyWithNoExplicitType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/comment.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/comment.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/comment.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/comment.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionExpressionBody.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionExpressionBody.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionExpressionBody.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionExpressionBody.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionExpressionBodyWithNoExplicitType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lastStatementOfLambdaAsLocalVariable.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lastStatementOfLambdaAsLocalVariable.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lastStatementOfLambdaAsLocalVariable.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lastStatementOfLambdaAsLocalVariable.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lastStatementOfLambdaAsProperty.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lastStatementOfLambdaAsProperty.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lastStatementOfLambdaAsProperty.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lastStatementOfLambdaAsProperty.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lineBreak.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lineBreak.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lineBreak.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/lineBreak.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/simplifyComparison/doubleNull.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/simplifyComparison/doubleNull.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/simplifyComparison/doubleNull.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/simplifyComparison/doubleNull.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/simplifyComparison/notNull.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/simplifyComparison/notNull.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/simplifyComparison/notNull.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/simplifyComparison/notNull.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/typeMismatch.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/typeMismatch.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/typeMismatch.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/typeMismatch.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/onlyShortenInsertedArrayOfCall.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/onlyShortenInsertedArrayOfCall.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/onlyShortenInsertedArrayOfCall.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/onlyShortenInsertedArrayOfCall.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/onlyShortenInsertedArrayOfCall.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/onlyShortenInsertedArrayOfCall.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/onlyShortenInsertedArrayOfCall.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/onlyShortenInsertedArrayOfCall.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingLeftBracket.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingLeftBracket.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingLeftBracket.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingLeftBracket.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingLeftBracket.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingLeftBracket.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingLeftBracket.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingLeftBracket.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightBracket.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightBracket.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightBracket.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightBracket.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightBracket.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightBracket.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightBracket.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightBracket.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/callWithLambdaArgument.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/callWithLambdaArgument.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/callWithLambdaArgument.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/callWithLambdaArgument.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/callWithLambdaArgument.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/callWithLambdaArgument.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/callWithLambdaArgument.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/callWithLambdaArgument.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedCallTypeMismatch.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedCallTypeMismatch.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedCallTypeMismatch.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedCallTypeMismatch.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedCallTypeMismatch.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedCallTypeMismatch.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedCallTypeMismatch.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/chainedCallTypeMismatch.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/inOperator.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/insideLet.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/insideLet.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/insideLet.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/insideLet.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/insideLet.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/insideLet.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/insideLet.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/insideLet.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions1.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions1.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions1.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions1.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions1.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions1.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions1.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions1.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions2.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions2.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions2.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions2.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions2.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions2.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions2.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions2.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions3.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions3.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions3.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions3.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions3.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions3.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions3.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions3.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions4.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions4.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions4.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions4.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions4.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions4.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions4.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions4.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions5.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions5.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions5.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions5.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions5.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions5.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions5.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions5.k2.kt.after diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.k2.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.k2.kt diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.k2.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.fir.kt.after rename to plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/wrapAllNonNullablePositions6.k2.kt.after