diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/handlers/utils.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/handlers/utils.kt index b7edd747f4d..b7a5ea4a372 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/handlers/utils.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/handlers/utils.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.test.utils.withSuffixAndExtension fun Assertions.checkTxtAccordingToBackend(module: TestModule, actual: String, fileSuffix: String = "") { val testDataFile = module.files.first().originalFile val txtFile = testDataFile.withExtension("$fileSuffix.txt") - val irTxtFile = testDataFile.withSuffixAndExtension("${fileSuffix}_ir", ".txt") + val irTxtFile = testDataFile.withSuffixAndExtension("$fileSuffix.ir", ".txt") val isIr = module.targetBackend?.isIR == true val expectedFile = if (isIr && irTxtFile.exists()) { irTxtFile diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/annotations_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/annotations.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/annotations2.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations3_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations3.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/annotations3_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/annotations3.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithConstants.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/anonymousDelegate_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/anonymousDelegate.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/anonymousDelegate_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/anonymousDelegate.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/comments.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/dataClass_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/dataClass.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/delegateCorrectErrorTypes.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/delegatedProperties.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/deprecated_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/deprecated.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/deprecated_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/deprecated.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumImports_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumImports.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/enumImports_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/enumImports.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/enums_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/enums.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclass.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/genericParameters_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/incorrectDelegate.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/javadoc_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/javadoc.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14997_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/kt14997_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/kt14997.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt17567_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/kt17567_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/kt17567.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt19700_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/kt19700_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/kt19700.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt19750_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/kt19750_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/kt19750.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/kt24272_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/kt24272.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt27126_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt27126.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/kt27126_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/kt27126.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt28306_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt28306.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/kt28306_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/kt28306.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/lazyProperty.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/modifiers_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/modifiers.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/multifileClass_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/suspendArgName.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/suspendErrorTypes.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/topLevel_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/topLevel.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it_ir.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/DefaultParameterValues.it.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it_ir.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it_ir.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it_ir.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.ir.txt similarity index 100% rename from plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it_ir.txt rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.ir.txt