diff --git a/idea/testData/quickfix/autoImports/ambiguousClassName.before.data.Sample.kt b/idea/testData/quickfix/autoImports/ambiguousClassName.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/ambiguousClassName.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/ambiguousClassName.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/classImport.before.data.Sample.kt b/idea/testData/quickfix/autoImports/classImport.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/classImport.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/classImport.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/divOperator.before.data.Sample.kt b/idea/testData/quickfix/autoImports/divOperator.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/divOperator.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/divOperator.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/extensionFunctionImport.before.data.Sample.kt b/idea/testData/quickfix/autoImports/extensionFunctionImport.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/extensionFunctionImport.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/extensionFunctionImport.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/extensionFunctionImportImplicitReceiver.before.data.Sample.kt b/idea/testData/quickfix/autoImports/extensionFunctionImportImplicitReceiver.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/extensionFunctionImportImplicitReceiver.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/extensionFunctionImportImplicitReceiver.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/extensionPropertyImport.before.data.Sample.kt b/idea/testData/quickfix/autoImports/extensionPropertyImport.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/extensionPropertyImport.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/extensionPropertyImport.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/factoryFunctionFromLambda.before.data.Sample.kt b/idea/testData/quickfix/autoImports/factoryFunctionFromLambda.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/factoryFunctionFromLambda.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/factoryFunctionFromLambda.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/falsePostfixOperator.before.data.Sample.kt b/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/falsePostfixOperator.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/falsePostfixOperator.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/functionImport.before.data.Sample.kt b/idea/testData/quickfix/autoImports/functionImport.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/functionImport.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/functionImport.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.data.Sample.kt b/idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/importInFirstPartInUserType.before.data.Sample.kt b/idea/testData/quickfix/autoImports/importInFirstPartInUserType.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/importInFirstPartInUserType.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/importInFirstPartInUserType.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/importTrait.before.data.Sample.kt b/idea/testData/quickfix/autoImports/importTrait.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/importTrait.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/importTrait.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/infixCall.before.data.Sample.kt b/idea/testData/quickfix/autoImports/infixCall.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/infixCall.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/infixCall.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/minusOperator.before.data.Sample.kt b/idea/testData/quickfix/autoImports/minusOperator.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/minusOperator.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/minusOperator.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/nestedClass.before.data.Sample.kt b/idea/testData/quickfix/autoImports/nestedClass.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/nestedClass.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/nestedClass.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.data.Sample.kt b/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.data.Sample.kt b/idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/noImportForPrivateClass.before.data.Sample.kt b/idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/noImportForPrivateClass.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/noImportInImports.before.data.Sample.kt b/idea/testData/quickfix/autoImports/noImportInImports.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/noImportInImports.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/noImportInImports.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.data.Sample.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.data.Sample.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.data.Sample.kt b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/objectImport.before.data.Sample.kt b/idea/testData/quickfix/autoImports/objectImport.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/objectImport.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/objectImport.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/packageClass.before.data.Sample.kt b/idea/testData/quickfix/autoImports/packageClass.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/packageClass.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/packageClass.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/plusOperator.before.data.Sample.kt b/idea/testData/quickfix/autoImports/plusOperator.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/plusOperator.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/plusOperator.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/postfixOperator.before.data.Sample.kt b/idea/testData/quickfix/autoImports/postfixOperator.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/postfixOperator.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/postfixOperator.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/propertyImport.before.data.Sample.kt b/idea/testData/quickfix/autoImports/propertyImport.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/propertyImport.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/propertyImport.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/sameModuleImportPriority.before.data.Sample.kt b/idea/testData/quickfix/autoImports/sameModuleImportPriority.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/sameModuleImportPriority.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/sameModuleImportPriority.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/timesAssign.before.data.Sample.kt b/idea/testData/quickfix/autoImports/timesAssign.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/timesAssign.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/timesAssign.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/unaryMinusOperator.before.data.Sample.kt b/idea/testData/quickfix/autoImports/unaryMinusOperator.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/unaryMinusOperator.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/unaryMinusOperator.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/unaryPlusOperator.before.data.Sample.kt b/idea/testData/quickfix/autoImports/unaryPlusOperator.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/unaryPlusOperator.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/unaryPlusOperator.before.Dependency.kt diff --git a/idea/testData/quickfix/autoImports/withSmartCastQualifier.before.data.Sample.kt b/idea/testData/quickfix/autoImports/withSmartCastQualifier.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/autoImports/withSmartCastQualifier.before.data.Sample.kt rename to idea/testData/quickfix/autoImports/withSmartCastQualifier.before.Dependency.kt diff --git a/idea/testData/quickfix/changeSignature/addParameterWithImport.after.data.Sample.kt b/idea/testData/quickfix/changeSignature/addParameterWithImport.after.Dependency.kt similarity index 100% rename from idea/testData/quickfix/changeSignature/addParameterWithImport.after.data.Sample.kt rename to idea/testData/quickfix/changeSignature/addParameterWithImport.after.Dependency.kt diff --git a/idea/testData/quickfix/changeSignature/addParameterWithImport.before.data.Sample.kt b/idea/testData/quickfix/changeSignature/addParameterWithImport.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/changeSignature/addParameterWithImport.before.data.Sample.kt rename to idea/testData/quickfix/changeSignature/addParameterWithImport.before.Dependency.kt diff --git a/idea/testData/quickfix/changeSignature/matchFunctionLiteralWithSAMType.before.data.Sample.java b/idea/testData/quickfix/changeSignature/matchFunctionLiteralWithSAMType.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/changeSignature/matchFunctionLiteralWithSAMType.before.data.Sample.java rename to idea/testData/quickfix/changeSignature/matchFunctionLiteralWithSAMType.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedGroovyAnnotation.before.data.Sample.groovy b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedGroovyAnnotation.before.Dependency.groovy similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedGroovyAnnotation.before.data.Sample.groovy rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedGroovyAnnotation.before.Dependency.groovy diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntryWithJavaQualifier.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntryWithJavaQualifier.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntryWithJavaQualifier.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntryWithJavaQualifier.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntryWithJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntryWithJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntryWithJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntryWithJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNamesAndJavaQualifier.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNamesAndJavaQualifier.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNamesAndJavaQualifier.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNamesAndJavaQualifier.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNamesAndJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNamesAndJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNamesAndJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNamesAndJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalJavaSupertype.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalJavaSupertype.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalJavaSupertype.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalJavaSupertype.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassQualifier.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassQualifier.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassQualifier.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassQualifier.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithJavaQualifier.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithJavaQualifier.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithJavaQualifier.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithJavaQualifier.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInJavaEnum.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInJavaEnum.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInJavaEnum.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInJavaEnum.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedJavaQualifier.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedJavaQualifier.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedJavaQualifier.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedJavaQualifier.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByNestedJavaQualifier.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByNestedJavaQualifier.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByNestedJavaQualifier.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByNestedJavaQualifier.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByNestedJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByNestedJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByNestedJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByNestedJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/classJavaTypeReceiver.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classJavaTypeReceiver.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/classJavaTypeReceiver.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classJavaTypeReceiver.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/classJavaTypeReceiver.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classJavaTypeReceiver.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/classJavaTypeReceiver.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classJavaTypeReceiver.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryJavaEnumReceiver.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryJavaEnumReceiver.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryJavaEnumReceiver.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryJavaEnumReceiver.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticVarOnJavaInterface.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/staticVarOnJavaInterface.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/staticVarOnJavaInterface.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/staticVarOnJavaInterface.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.Dependency.java diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.data.Sample.java b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.data.Sample.java rename to idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Dependency.java diff --git a/idea/testData/quickfix/migration/bracketsAnnotations/manyFilesMuitliple.after.data.Sample.kt b/idea/testData/quickfix/migration/bracketsAnnotations/manyFilesMuitliple.after.Dependency.kt similarity index 100% rename from idea/testData/quickfix/migration/bracketsAnnotations/manyFilesMuitliple.after.data.Sample.kt rename to idea/testData/quickfix/migration/bracketsAnnotations/manyFilesMuitliple.after.Dependency.kt diff --git a/idea/testData/quickfix/migration/bracketsAnnotations/manyFilesMuitliple.before.data.Sample.kt b/idea/testData/quickfix/migration/bracketsAnnotations/manyFilesMuitliple.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/migration/bracketsAnnotations/manyFilesMuitliple.before.data.Sample.kt rename to idea/testData/quickfix/migration/bracketsAnnotations/manyFilesMuitliple.before.Dependency.kt diff --git a/idea/testData/quickfix/migration/lambdaSyntax/lambdaSyntaxMultiple.after.data.Sample.kt b/idea/testData/quickfix/migration/lambdaSyntax/lambdaSyntaxMultiple.after.Dependency.kt similarity index 100% rename from idea/testData/quickfix/migration/lambdaSyntax/lambdaSyntaxMultiple.after.data.Sample.kt rename to idea/testData/quickfix/migration/lambdaSyntax/lambdaSyntaxMultiple.after.Dependency.kt diff --git a/idea/testData/quickfix/migration/lambdaSyntax/lambdaSyntaxMultiple.before.data.Sample.kt b/idea/testData/quickfix/migration/lambdaSyntax/lambdaSyntaxMultiple.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/migration/lambdaSyntax/lambdaSyntaxMultiple.before.data.Sample.kt rename to idea/testData/quickfix/migration/lambdaSyntax/lambdaSyntaxMultiple.before.Dependency.kt diff --git a/idea/testData/quickfix/migration/migrateJavaAnnotationMethodCall/basicMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/migrateJavaAnnotationMethodCall/basicMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/migrateJavaAnnotationMethodCall/basicMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/migrateJavaAnnotationMethodCall/basicMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/migration/migrateJavaAnnotationMethodCall/wholeFileMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/migrateJavaAnnotationMethodCall/wholeFileMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/migrateJavaAnnotationMethodCall/wholeFileMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/migrateJavaAnnotationMethodCall/wholeFileMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.data.Sample.java b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.data.Sample.java rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.Dependency.java diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.data.Sample.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.Dependency.kt similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.data.Sample.kt rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.after.Dependency.kt diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.before.data.Sample.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.before.data.Sample.kt rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/manyFilesMultiple.before.Dependency.kt diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/arrayWithExplicitTypeArgumentMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/arrayWithExplicitTypeArgumentMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/arrayWithExplicitTypeArgumentMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/arrayWithExplicitTypeArgumentMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/basicMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/basicMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/basicMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/basicMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/implicitParameterMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/implicitParameterMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/implicitParameterMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/implicitParameterMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.after.data.Sample.kt b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.after.Dependency.kt similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.after.data.Sample.kt rename to idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.after.Dependency.kt diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.before.data.Sample.kt b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.before.data.Sample.kt rename to idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/manyFilesMultiple.before.Dependency.kt diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/nonConstMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/nonConstMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/nonConstMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/nonConstMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/severalArgsMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/severalArgsMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/severalArgsMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/severalArgsMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/unresolvedMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/unresolvedMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/unresolvedMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/unresolvedMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/valueAsVarargMultiple.before.data.Sample.java b/idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/valueAsVarargMultiple.before.Dependency.java similarity index 100% rename from idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/valueAsVarargMultiple.before.data.Sample.java rename to idea/testData/quickfix/migration/replaceJavaClassWithKClassForJavaAnnotation/valueAsVarargMultiple.before.Dependency.java diff --git a/idea/testData/quickfix/override/nothingToOverride/import.before.data.Sample.kt b/idea/testData/quickfix/override/nothingToOverride/import.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/override/nothingToOverride/import.before.data.Sample.kt rename to idea/testData/quickfix/override/nothingToOverride/import.before.Dependency.kt diff --git a/idea/testData/quickfix/override/nothingToOverride/twoPackages.before.data.Sample.kt b/idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/override/nothingToOverride/twoPackages.before.data.Sample.kt rename to idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Dependency.kt diff --git a/idea/testData/quickfix/typeImports/importFromAnotherFile.before.data.Sample.kt b/idea/testData/quickfix/typeImports/importFromAnotherFile.before.Dependency.kt similarity index 100% rename from idea/testData/quickfix/typeImports/importFromAnotherFile.before.data.Sample.kt rename to idea/testData/quickfix/typeImports/importFromAnotherFile.before.Dependency.kt diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java index 9c337efcc8d..a5acd1868e1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java @@ -83,12 +83,12 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer assert mainFileDir != null; final String mainFileName = mainFile.getName(); - final String extraFileNamePrefix = mainFileName.replace(".Main.kt", ".data.Sample."); + final String extraFileNamePrefix = mainFileName.replace(".Main.kt", "."); File[] extraFiles = mainFileDir.listFiles( new FilenameFilter() { @Override public boolean accept(@NotNull File dir, @NotNull String name) { - return name.startsWith(extraFileNamePrefix); + return name.startsWith(extraFileNamePrefix) && !name.equals(mainFileName); } } );