From da581f38e10a0481aa7588830fa1e39f27b0c37f Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 20 Feb 2023 12:14:46 +0200 Subject: [PATCH] [Test] Require specifying parser for FIR test. Unify names for FIR tests Now all tests with `Fir` in name are named accordingly to parser which is used in them -- `FirPsi` or `FirLightTree`. This is needed to keep consistency between different types of tests, because there is no single default in parser mode between different scenarios of using FIR --- .../based/AbstractCompilerBasedTestForFir.kt | 7 +- ...FirLightTreeDiagnosticsTestGenerated.java} | 2 +- ...eOldFrontendDiagnosticsTestGenerated.java} | 2 +- ...ontendNativeDiagnosticsTestGenerated.java} | 2 +- ...ava => FirPsiDiagnosticTestGenerated.java} | 2 +- ...=> FirPsiDiagnosticTestSpecGenerated.java} | 4 +- ...iOldFrontendDiagnosticsTestGenerated.java} | 2 +- ...AnnotationsCompiledJavaTestGenerated.java} | 2 +- ...JavaWithPsiClassReadingTestGenerated.java} | 2 +- ...gnAnnotationsSourceJavaTestGenerated.java} | 2 +- ...ontendNativeDiagnosticsTestGenerated.java} | 2 +- ...nosticsTestWithJvmIrBackendGenerated.java} | 2 +- ...nosticsTestWithJvmIrBackendGenerated.java} | 2 +- ...ightTreeBlackBoxCodegenTestGenerated.java} | 2 +- ...eeBlackBoxInlineCodegenTestGenerated.java} | 2 +- ...lackBoxModernJdkCodegenTestGenerated.java} | 2 +- ...irLightTreeBytecodeTextTestGenerated.java} | 2 +- ...rLightTreeLocalVariableTestGenerated.java} | 2 +- ...tlinAgainstInlineKotlinTestGenerated.java} | 2 +- ...SpecificBlackBoxCodegenTestGenerated.java} | 2 +- ...SpecificBytecodeListingTestGenerated.java} | 2 +- ...=> FirLightTreeSteppingTestGenerated.java} | 2 +- ...SpecificBytecodeListingTestGenerated.java} | 2 +- ...LightTreeIrSpecificTextTestGenerated.java} | 2 +- ...a => FirLightTreeIrTextTestGenerated.java} | 2 +- ...=> FirPsiIrSpecificTextTestGenerated.java} | 2 +- ...ed.java => FirPsiIrTextTestGenerated.java} | 2 +- .../org/jetbrains/kotlin/test/FirParser.kt | 10 +++ ...terpreterAfterFirPsi2IrTestGenerated.java} | 2 +- .../test/directives/CodegenTestDirectives.kt | 6 +- .../directives/FirDiagnosticsDirectives.kt | 18 +++-- .../handlers/FirTestDataConsistencyHandler.kt | 8 +- .../test/frontend/fir/FirFrontendFacade.kt | 14 ++-- .../fir/handlers/FirDiagnosticsHandler.kt | 6 +- .../runners/AbstractDiagnosticsNativeTest.kt | 30 +++---- .../AbstractDiagnosticsTestWithJvmBackend.kt | 13 ++- .../test/runners/AbstractFirDiagnosticTest.kt | 18 ++--- .../runners/AbstractFirDiagnosticTestSpec.kt | 5 +- .../AbstractFirForeignAnnotationsTest.kt | 21 +++-- .../runners/AbstractForeignAnnotationsTest.kt | 2 +- .../AbstractAsmLikeInstructionListingTest.kt | 14 ++-- .../AbstractBlackBoxInlineCodegenTest.kt | 6 +- .../codegen/AbstractBytecodeListingTest.kt | 15 ++-- .../codegen/AbstractBytecodeTextTest.kt | 13 ++- ...actCompileKotlinAgainstInlineKotlinTest.kt | 15 ++-- .../codegen/AbstractFirBlackBoxCodegenTest.kt | 13 ++- .../codegen/AbstractLocalVariableTest.kt | 13 ++- .../runners/codegen/AbstractSteppingTest.kt | 13 ++- .../test/runners/ir/AbstractIrTextTest.kt | 20 ++--- .../interpreter/AbstractIrInterpreterTest.kt | 13 ++- .../kotlin/codegen/GenerationUtils.kt | 2 + .../jetbrains/kotlin/fir/FirAnalyzerFacade.kt | 26 +++--- .../generators/GenerateJUnit5CompilerTests.kt | 79 +++++++++---------- .../DiagnosticsTestSpecGenerated.java | 2 +- .../BlackBoxCodegenTestSpecGenerated.java | 2 +- .../parsing/ParsingTestSpecGenerated.java | 2 +- .../spec/utils/tasks/GenerateSpecTests.kt | 4 +- .../kotlin/generators/tests/GenerateTests.kt | 40 +++++----- .../generators/tests/GenerateJsTests.kt | 8 +- ...t.kt => AbstractFirPsiJsDiagnosticTest.kt} | 8 +- .../kotlin/js/test/fir/AbstractJsFirTest.kt | 3 + ...sOldFrontendDiagnosticsTestGenerated.java} | 2 +- ...=> FirLightTreeJsIrTextTestGenerated.java} | 2 +- .../AbstractBytecodeListingTestForAllOpen.kt | 9 ++- .../AbstractFirDiagnosticTestForAllOpen.kt | 19 ++--- ...reeDiagnosticTestForAllOpenGenerated.java} | 2 +- ...tecodeListingTestForAllOpenGenerated.java} | 2 +- ...PsiDiagnosticTestForAllOpenGenerated.java} | 2 +- .../plugin/AssignmentPluginTests.kt | 8 +- ...egenTestForAssignmentPluginGenerated.java} | 2 +- ...ignmentPluginDiagnosticTestGenerated.java} | 2 +- ...eePluginBlackBoxCodegenTestGenerated.java} | 2 +- ... FirPsiPluginDiagnosticTestGenerated.java} | 2 +- .../plugin/runners/PluginPrototypeTests.kt | 8 +- ...LikeInstructionsListingTestGenerated.java} | 2 +- ...ionFirLightTreeBlackBoxTestGenerated.java} | 2 +- ...izationFirPsiDiagnosticTestGenerated.java} | 2 +- .../kotlinx/serialization/TestGenerator.kt | 6 +- .../AsmLikeInstructionsListingTests.kt | 4 +- .../kotlinx/serialization/runners/BoxTests.kt | 5 +- .../serialization/runners/DiagnosticTests.kt | 4 +- ...lackBoxCodegenTestForLombokGenerated.java} | 2 +- ...rPsiDiagnosticTestForLombokGenerated.java} | 2 +- .../jetbrains/kotlin/lombok/LombokTests.kt | 8 +- .../org/jetbrains/kotlin/noarg/NoArgTests.kt | 8 +- ...BlackBoxCodegenTestForNoArgGenerated.java} | 2 +- ...BytecodeListingTestForNoArgGenerated.java} | 2 +- ...rPsiDiagnosticsTestForNoArgGenerated.java} | 2 +- ...rPsiParcelizeDiagnosticTestGenerated.java} | 2 +- ...arcelizeFirLightTreeBoxTestGenerated.java} | 2 +- ... AbstractFirPsiParcelizeDiagnosticTest.kt} | 6 +- .../test/runners/AbstractParcelizeBoxTest.kt | 7 +- .../samWithReceiver/SamWithReceiverTests.kt | 8 +- ...degenTestForSamWithReceiverGenerated.java} | 2 +- ...mWithReceiverDiagnosticTestGenerated.java} | 2 +- 95 files changed, 361 insertions(+), 306 deletions(-) rename compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/{FirDiagnosticsWithLightTreeTestGenerated.java => FirLightTreeDiagnosticsTestGenerated.java} (99%) rename compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/{FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java => FirLightTreeOldFrontendDiagnosticsTestGenerated.java} (99%) rename compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/{FirOldFrontendNativeDiagnosticsWithLightTreeTestGenerated.java => FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java} (95%) rename compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/{FirDiagnosticTestGenerated.java => FirPsiDiagnosticTestGenerated.java} (99%) rename compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/{FirDiagnosticTestSpecGenerated.java => FirPsiDiagnosticTestSpecGenerated.java} (99%) rename compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/{FirOldFrontendDiagnosticsTestGenerated.java => FirPsiOldFrontendDiagnosticsTestGenerated.java} (99%) rename compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/{FirOldFrontendForeignAnnotationsSourceJavaTestGenerated.java => FirPsiOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java} (99%) rename compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/{FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java => FirPsiOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java} (99%) rename compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/{FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java => FirPsiOldFrontendForeignAnnotationsSourceJavaTestGenerated.java} (99%) rename compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/{FirOldFrontendNativeDiagnosticsTestGenerated.java => FirPsiOldFrontendNativeDiagnosticsTestGenerated.java} (96%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/{FirDiagnosticsTestWithJvmIrBackendGenerated.java => FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java} (91%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/{FirOldDiagnosticsTestWithJvmIrBackendGenerated.java => FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java} (99%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/{FirBlackBoxCodegenTestGenerated.java => FirLightTreeBlackBoxCodegenTestGenerated.java} (99%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/{FirBlackBoxInlineCodegenTestGenerated.java => FirLightTreeBlackBoxInlineCodegenTestGenerated.java} (99%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/{FirBlackBoxModernJdkCodegenTestGenerated.java => FirLightTreeBlackBoxModernJdkCodegenTestGenerated.java} (99%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/{FirBytecodeTextTestGenerated.java => FirLightTreeBytecodeTextTestGenerated.java} (99%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/{FirLocalVariableTestGenerated.java => FirLightTreeLocalVariableTestGenerated.java} (99%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/{FirSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java => FirLightTreeSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java} (99%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/{FirSpecificBlackBoxCodegenTestGenerated.java => FirLightTreeSpecificBlackBoxCodegenTestGenerated.java} (98%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/{Fir2IrSpecificBytecodeListingPsiTestGenerated.java => FirLightTreeSpecificBytecodeListingTestGenerated.java} (96%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/{FirSteppingTestGenerated.java => FirLightTreeSteppingTestGenerated.java} (99%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/{Fir2IrSpecificBytecodeListingTestGenerated.java => FirPsiSpecificBytecodeListingTestGenerated.java} (97%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/{LightTreeFir2IrSpecificTextTestGenerated.java => FirLightTreeIrSpecificTextTestGenerated.java} (97%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/{FirPsi2IrTextTestGenerated.java => FirLightTreeIrTextTestGenerated.java} (99%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/{Fir2IrSpecificTextTestGenerated.java => FirPsiIrSpecificTextTestGenerated.java} (97%) rename compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/{Fir2IrTextTestGenerated.java => FirPsiIrTextTestGenerated.java} (99%) create mode 100644 compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/FirParser.kt rename compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/interpreter/{JvmIrInterpreterAfterFir2IrTestGenerated.java => JvmIrInterpreterAfterFirPsi2IrTestGenerated.java} (99%) rename js/js.tests/test/org/jetbrains/kotlin/js/test/fir/{AbstractFirJsDiagnosticTest.kt => AbstractFirPsiJsDiagnosticTest.kt} (88%) rename js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/{FirJsOldFrontendDiagnosticsTestGenerated.java => FirPsiJsOldFrontendDiagnosticsTestGenerated.java} (99%) rename js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/{Fir2IrJsTextTestGenerated.java => FirLightTreeJsIrTextTestGenerated.java} (98%) rename plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/{FirDiagnosticsWithLightTreeTestForAllOpenGenerated.java => FirLightTreeDiagnosticTestForAllOpenGenerated.java} (90%) rename plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/{FirBytecodeListingTestForAllOpenGenerated.java => FirPsiBytecodeListingTestForAllOpenGenerated.java} (97%) rename plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/{FirDiagnosticTestForAllOpenGenerated.java => FirPsiDiagnosticTestForAllOpenGenerated.java} (92%) rename plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/{FirBlackBoxCodegenTestForAssignmentPluginGenerated.java => FirLightTreeBlackBoxCodegenTestForAssignmentPluginGenerated.java} (94%) rename plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/{FirAssignmentPluginDiagnosticTestGenerated.java => FirPsiAssignmentPluginDiagnosticTestGenerated.java} (95%) rename plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/{FirPluginBlackBoxCodegenTestGenerated.java => FirLightTreePluginBlackBoxCodegenTestGenerated.java} (96%) rename plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/{FirPluginDiagnosticTestGenerated.java => FirPsiPluginDiagnosticTestGenerated.java} (98%) rename plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/{SerializationFir2IrAsmLikeInstructionsListingTestGenerated.java => SerializationFirLightTreeAsmLikeInstructionsListingTestGenerated.java} (92%) rename plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/{SerializationFirBlackBoxTestGenerated.java => SerializationFirLightTreeBlackBoxTestGenerated.java} (99%) rename plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/{SerializationFirDiagnosticTestGenerated.java => SerializationFirPsiDiagnosticTestGenerated.java} (98%) rename plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/{FirBlackBoxCodegenTestForLombokGenerated.java => FirLightTreeBlackBoxCodegenTestForLombokGenerated.java} (98%) rename plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/{FirDiagnosticTestForLombokGenerated.java => FirPsiDiagnosticTestForLombokGenerated.java} (96%) rename plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/{FirBlackBoxCodegenTestForNoArgGenerated.java => FirLightTreeBlackBoxCodegenTestForNoArgGenerated.java} (96%) rename plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/{FirBytecodeListingTestForNoArgGenerated.java => FirLightTreeBytecodeListingTestForNoArgGenerated.java} (95%) rename plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/{FirDiagnosticsTestForNoArgGenerated.java => FirPsiDiagnosticsTestForNoArgGenerated.java} (93%) rename plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/{FirParcelizeDiagnosticTestGenerated.java => FirPsiParcelizeDiagnosticTestGenerated.java} (98%) rename plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/{ParcelizeFirBoxTestGenerated.java => ParcelizeFirLightTreeBoxTestGenerated.java} (99%) rename plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/{AbstractFirParcelizeDiagnosticTest.kt => AbstractFirPsiParcelizeDiagnosticTest.kt} (81%) rename plugins/sam-with-receiver/tests-gen/org/jetbrains/kotlin/samWithReceiver/{FirBlackBoxCodegenTestForSamWithReceiverGenerated.java => FirLightTreeBlackBoxCodegenTestForSamWithReceiverGenerated.java} (91%) rename plugins/sam-with-receiver/tests-gen/org/jetbrains/kotlin/samWithReceiver/{FirSamWithReceiverTestGenerated.java => FirPsiSamWithReceiverDiagnosticTestGenerated.java} (96%) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt index d931fdc31d2..fb480ac6004 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt @@ -18,11 +18,13 @@ import org.jetbrains.kotlin.analysis.test.framework.project.structure.ktModulePr import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.TestInfrastructureInternals import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.firHandlersStep import org.jetbrains.kotlin.test.builders.testConfiguration import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives +import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_PARSER import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifactImpl @@ -33,7 +35,6 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.* abstract class AbstractCompilerBasedTestForFir : AbstractCompilerBasedTest() { - @OptIn(TestInfrastructureInternals::class) final override fun TestConfigurationBuilder.configuration() { globalDefaults { frontend = FrontendKinds.FIR @@ -41,6 +42,10 @@ abstract class AbstractCompilerBasedTestForFir : AbstractCompilerBasedTest() { dependencyKind = DependencyKind.Source } + defaultDirectives { + FIR_PARSER with FirParser.Psi + } + configureTest() defaultConfiguration(this) registerAnalysisApiBaseTestServices(disposable, FirLowLevelCompilerBasedTestConfigurator) diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java similarity index 99% rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java index c3f80db8f47..2af3282deeb 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnosticsWithLightTreeTest { +public class FirLightTreeDiagnosticsTestGenerated extends AbstractFirLightTreeDiagnosticsTest { @Nested @TestMetadata("compiler/fir/analysis-tests/testData/resolve") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java similarity index 99% rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index 361d50fb63f..88e4c3b4367 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnosticsWithLightTreeTest { +public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFirLightTreeDiagnosticsTest { @Nested @TestMetadata("compiler/testData/diagnostics/tests") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendNativeDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java similarity index 95% rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendNativeDiagnosticsWithLightTreeTestGenerated.java rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java index d8b9c829089..3707b35bc5e 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendNativeDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/nativeTests") @TestDataPath("$PROJECT_ROOT") -public class FirOldFrontendNativeDiagnosticsWithLightTreeTestGenerated extends AbstractFirNativeDiagnosticsWithLightTreeTest { +public class FirLightTreeOldFrontendNativeDiagnosticsTestGenerated extends AbstractFirLightTreeNativeDiagnosticsTest { @Test public void testAllFilesPresentInNativeTests() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/nativeTests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true); diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java similarity index 99% rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java index 04a3ec2a06a..9cf6eed532a 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest { +public class FirPsiDiagnosticTestGenerated extends AbstractFirPsiDiagnosticTest { @Nested @TestMetadata("compiler/fir/analysis-tests/testData/resolve") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestSpecGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestSpecGenerated.java similarity index 99% rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestSpecGenerated.java rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestSpecGenerated.java index 31ff2753e3c..a196aca347c 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestSpecGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestSpecGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/tests-spec/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") -public class FirDiagnosticTestSpecGenerated extends AbstractFirDiagnosticTestSpec { +public class FirPsiDiagnosticTestSpecGenerated extends AbstractFirPsiDiagnosticTestSpec { @Test public void testAllFilesPresentInDiagnostics() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/tests-spec/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true, "helpers", "linked/annotations", "linked/built-in-types-and-their-semantics", "linked/control--and-data-flow-analysis.control-flow-graph.expressions-1.conditional-expressions", "linked/control--and-data-flow-analysis/performing-analysis-on-the-control-flow-graph", "linked/declarations/classifier-declaration/class-declaration/nested-and-inner-classifiers", "linked/declarations/classifier-declaration/classifier-initialization", "linked/declarations/classifier-declaration/data-class-declaration", "linked/declarations/function-declaration", "linked/declarations/property-declaration/property-initialization", "linked/declarations/type-alias", "linked/expressions/call-and-property-access-expressions", "linked/expressions/function-literals", "linked/inheritance", "linked/overload-resolution/c-level-partition", "linked/overload-resolution/determining-function-applicability-for-a-specific-call/rationale", "linked/overloadable-operators", "linked/statements/assignments/simple-assignments", "linked/type-inference/local-type-inference", "linked/type-inference/smart-casts/smart-cast-types", "linked/type-system/subtyping/subtyping-for-nullable-types", "linked/type-system/type-kinds/type-parameters"); diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java similarity index 99% rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index 4d07d183575..6e940773a2a 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosticTest { +public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDiagnosticTest { @Nested @TestMetadata("compiler/testData/diagnostics/tests") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsSourceJavaTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java similarity index 99% rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsSourceJavaTestGenerated.java rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java index 4112b22917d..59797bc0e98 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsSourceJavaTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -public class FirOldFrontendForeignAnnotationsSourceJavaTestGenerated extends AbstractFirForeignAnnotationsSourceJavaTest { +public class FirPsiOldFrontendForeignAnnotationsCompiledJavaTestGenerated extends AbstractFirPsiForeignAnnotationsCompiledJavaTest { @Nested @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/tests") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java similarity index 99% rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java index 8428d78b045..a92e6ca6745 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -public class FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated extends AbstractFirForeignAnnotationsCompiledJavaWithPsiClassReadingTest { +public class FirPsiOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated extends AbstractFirPsiForeignAnnotationsCompiledJavaWithPsiClassReadingTest { @Nested @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/tests") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsSourceJavaTestGenerated.java similarity index 99% rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsSourceJavaTestGenerated.java index 7d31aee9228..f876b5b1c88 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendForeignAnnotationsSourceJavaTestGenerated.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -public class FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated extends AbstractFirForeignAnnotationsCompiledJavaTest { +public class FirPsiOldFrontendForeignAnnotationsSourceJavaTestGenerated extends AbstractFirPsiForeignAnnotationsSourceJavaTest { @Nested @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/tests") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendNativeDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java similarity index 96% rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendNativeDiagnosticsTestGenerated.java rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java index 25265b0448f..f8b267f64ba 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendNativeDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/nativeTests") @TestDataPath("$PROJECT_ROOT") -public class FirOldFrontendNativeDiagnosticsTestGenerated extends AbstractFirNativeDiagnosticsTest { +public class FirPsiOldFrontendNativeDiagnosticsTestGenerated extends AbstractFirPsiNativeDiagnosticsTest { @Test public void testAllFilesPresentInNativeTests() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/nativeTests"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java similarity index 91% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsTestWithJvmIrBackendGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java index f46d7907b1a..8cf4cceb1e4 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsTestWithJvmIrBackendGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/firTestWithJvmBackend") @TestDataPath("$PROJECT_ROOT") -public class FirDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirDiagnosticsTestWithJvmIrBackend { +public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirPsiDiagnosticsTestWithJvmIrBackend { @Test public void testAllFilesPresentInFirTestWithJvmBackend() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/firTestWithJvmBackend"), Pattern.compile("^(.+)\\.kt$"), null, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirOldDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java similarity index 99% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirOldDiagnosticsTestWithJvmIrBackendGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java index 8910190b901..2a6ad31366b 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirOldDiagnosticsTestWithJvmIrBackendGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend") @TestDataPath("$PROJECT_ROOT") -public class FirOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirDiagnosticsTestWithJvmIrBackend { +public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirPsiDiagnosticsTestWithJvmIrBackend { @Test public void testAllFilesPresentInTestsWithJvmBackend() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(fir|ll)\\.kts?$"), true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java similarity index 99% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index 646500d1462..82a36e9b239 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -20,7 +20,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/box") @TestDataPath("$PROJECT_ROOT") -public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenTest { +public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTreeBlackBoxCodegenTest { @Test public void testAllFilesPresentInBox() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxInlineCodegenTestGenerated.java similarity index 99% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxInlineCodegenTestGenerated.java index 6e0237ff94d..850ae5cde80 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxInlineCodegenTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/boxInline") @TestDataPath("$PROJECT_ROOT") -public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxInlineCodegenTest { +public class FirLightTreeBlackBoxInlineCodegenTestGenerated extends AbstractFirLightTreeBlackBoxInlineCodegenTest { @Test public void testAllFilesPresentInBoxInline() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxModernJdkCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxModernJdkCodegenTestGenerated.java similarity index 99% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxModernJdkCodegenTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxModernJdkCodegenTestGenerated.java index 636f1f592de..3e78446458a 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxModernJdkCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxModernJdkCodegenTestGenerated.java @@ -20,7 +20,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/boxModernJdk") @TestDataPath("$PROJECT_ROOT") -public class FirBlackBoxModernJdkCodegenTestGenerated extends AbstractFirBlackBoxCodegenTest { +public class FirLightTreeBlackBoxModernJdkCodegenTestGenerated extends AbstractFirLightTreeBlackBoxCodegenTest { @Test public void testAllFilesPresentInBoxModernJdk() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java similarity index 99% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java index 8ef82969235..a9a0bf91ecd 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/bytecodeText") @TestDataPath("$PROJECT_ROOT") -public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest { +public class FirLightTreeBytecodeTextTestGenerated extends AbstractFirLightTreeBytecodeTextTest { @Test @TestMetadata("accessorForOverridenVal.kt") public void testAccessorForOverridenVal() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLocalVariableTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeLocalVariableTestGenerated.java similarity index 99% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLocalVariableTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeLocalVariableTestGenerated.java index 01f4a4eb7d3..220f81bb761 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLocalVariableTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeLocalVariableTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/debug/localVariables") @TestDataPath("$PROJECT_ROOT") -public class FirLocalVariableTestGenerated extends AbstractFirLocalVariableTest { +public class FirLightTreeLocalVariableTestGenerated extends AbstractFirLightTreeLocalVariableTest { @Test public void testAllFilesPresentInLocalVariables() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/localVariables"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java similarity index 99% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java index ac29e8443ee..9a9fa88a555 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/boxInline") @TestDataPath("$PROJECT_ROOT") -public class FirSerializeCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractFirSerializeCompileKotlinAgainstInlineKotlinTest { +public class FirLightTreeSerializeCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractFirLightTreeSerializeCompileKotlinAgainstInlineKotlinTest { @Test public void testAllFilesPresentInBoxInline() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR_SERIALIZE, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSpecificBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSpecificBlackBoxCodegenTestGenerated.java similarity index 98% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSpecificBlackBoxCodegenTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSpecificBlackBoxCodegenTestGenerated.java index b8c2ce5eb1f..7c091bd54d6 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSpecificBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSpecificBlackBoxCodegenTestGenerated.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -public class FirSpecificBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenTest { +public class FirLightTreeSpecificBlackBoxCodegenTestGenerated extends AbstractFirLightTreeBlackBoxCodegenTest { @Nested @TestMetadata("compiler/fir/fir2ir/testData/codegen/box") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/Fir2IrSpecificBytecodeListingPsiTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSpecificBytecodeListingTestGenerated.java similarity index 96% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/Fir2IrSpecificBytecodeListingPsiTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSpecificBytecodeListingTestGenerated.java index 774ef8d7dab..d73b0aec263 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/Fir2IrSpecificBytecodeListingPsiTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSpecificBytecodeListingTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/fir/fir2ir/testData/codegen/bytecodeListing") @TestDataPath("$PROJECT_ROOT") -public class Fir2IrSpecificBytecodeListingPsiTestGenerated extends AbstractFirPsiBytecodeListingTest { +public class FirLightTreeSpecificBytecodeListingTestGenerated extends AbstractFirLightTreeBytecodeListingTest { @Test public void testAllFilesPresentInBytecodeListing() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/codegen/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSteppingTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSteppingTestGenerated.java similarity index 99% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSteppingTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSteppingTestGenerated.java index 9ea45f5cf2e..5305367ff74 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSteppingTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSteppingTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/debug/stepping") @TestDataPath("$PROJECT_ROOT") -public class FirSteppingTestGenerated extends AbstractFirSteppingTest { +public class FirLightTreeSteppingTestGenerated extends AbstractFirLightTreeSteppingTest { @Test public void testAllFilesPresentInStepping() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/debug/stepping"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/Fir2IrSpecificBytecodeListingTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiSpecificBytecodeListingTestGenerated.java similarity index 97% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/Fir2IrSpecificBytecodeListingTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiSpecificBytecodeListingTestGenerated.java index 2d7fa00473c..03cd758433b 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/Fir2IrSpecificBytecodeListingTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiSpecificBytecodeListingTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/fir/fir2ir/testData/codegen/bytecodeListing") @TestDataPath("$PROJECT_ROOT") -public class Fir2IrSpecificBytecodeListingTestGenerated extends AbstractFirBytecodeListingTest { +public class FirPsiSpecificBytecodeListingTestGenerated extends AbstractFirPsiBytecodeListingTest { @Test public void testAllFilesPresentInBytecodeListing() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/codegen/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrSpecificTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeIrSpecificTextTestGenerated.java similarity index 97% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrSpecificTextTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeIrSpecificTextTestGenerated.java index 5c01ed6fffe..4010bc91bbc 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrSpecificTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeIrSpecificTextTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/fir/fir2ir/testData/ir/irText") @TestDataPath("$PROJECT_ROOT") -public class LightTreeFir2IrSpecificTextTestGenerated extends AbstractFirPsi2IrTextTest { +public class FirLightTreeIrSpecificTextTestGenerated extends AbstractFirLightTreeIrTextTest { @Test public void testAllFilesPresentInIrText() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsi2IrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeIrTextTestGenerated.java similarity index 99% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsi2IrTextTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeIrTextTestGenerated.java index b416c0082e8..3a660bed70d 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsi2IrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeIrTextTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/ir/irText") @TestDataPath("$PROJECT_ROOT") -public class FirPsi2IrTextTestGenerated extends AbstractFirPsi2IrTextTest { +public class FirLightTreeIrTextTestGenerated extends AbstractFirLightTreeIrTextTest { @Test public void testAllFilesPresentInIrText() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrSpecificTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiIrSpecificTextTestGenerated.java similarity index 97% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrSpecificTextTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiIrSpecificTextTestGenerated.java index 59a87c2d685..313cbbfe1d4 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrSpecificTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiIrSpecificTextTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/fir/fir2ir/testData/ir/irText") @TestDataPath("$PROJECT_ROOT") -public class Fir2IrSpecificTextTestGenerated extends AbstractFir2IrTextTest { +public class FirPsiIrSpecificTextTestGenerated extends AbstractFirPsiIrTextTest { @Test public void testAllFilesPresentInIrText() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/fir2ir/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiIrTextTestGenerated.java similarity index 99% rename from compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java rename to compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiIrTextTestGenerated.java index 97fd533dfc9..406a51cf1b4 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiIrTextTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/ir/irText") @TestDataPath("$PROJECT_ROOT") -public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest { +public class FirPsiIrTextTestGenerated extends AbstractFirPsiIrTextTest { @Test public void testAllFilesPresentInIrText() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/FirParser.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/FirParser.kt new file mode 100644 index 00000000000..195affa8b3d --- /dev/null +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/FirParser.kt @@ -0,0 +1,10 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.test + +enum class FirParser { + Psi, LightTree +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/interpreter/JvmIrInterpreterAfterFir2IrTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/interpreter/JvmIrInterpreterAfterFirPsi2IrTestGenerated.java similarity index 99% rename from compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/interpreter/JvmIrInterpreterAfterFir2IrTestGenerated.java rename to compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/interpreter/JvmIrInterpreterAfterFirPsi2IrTestGenerated.java index 59fbad4a917..de00e4d18f6 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/interpreter/JvmIrInterpreterAfterFir2IrTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/interpreter/JvmIrInterpreterAfterFirPsi2IrTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/ir/interpreter") @TestDataPath("$PROJECT_ROOT") -public class JvmIrInterpreterAfterFir2IrTestGenerated extends AbstractJvmIrInterpreterAfterFir2IrTest { +public class JvmIrInterpreterAfterFirPsi2IrTestGenerated extends AbstractJvmIrInterpreterAfterFirPsi2IrTest { @Test @TestMetadata("abstract1.kt") public void testAbstract1() throws Exception { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt index bb248e85fc9..b83186c66ba 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.test.directives import org.jetbrains.kotlin.backend.common.phaser.AnyNamedPhase +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.handlers.* import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade @@ -13,6 +14,7 @@ import org.jetbrains.kotlin.test.directives.model.DirectiveApplicability.File import org.jetbrains.kotlin.test.directives.model.DirectiveApplicability.Global import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer import org.jetbrains.kotlin.test.directives.model.ValueDirective +import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue import org.jetbrains.kotlin.test.model.FrontendKinds import org.jetbrains.kotlin.test.model.TestModule @@ -205,7 +207,9 @@ fun extractIgnoredDirectivesForTargetBackend( FrontendKinds.ClassicFrontend -> listOf(CodegenTestDirectives.IGNORE_BACKEND_K1) FrontendKinds.FIR -> listOfNotNull( CodegenTestDirectives.IGNORE_BACKEND_K2, - CodegenTestDirectives.IGNORE_BACKEND_K2_LIGHT_TREE.takeIf { module.directives.contains(FirDiagnosticsDirectives.USE_LIGHT_TREE) } + CodegenTestDirectives.IGNORE_BACKEND_K2_LIGHT_TREE.takeIf { + module.directives.singleOrZeroValue(FirDiagnosticsDirectives.FIR_PARSER) == FirParser.LightTree + } ) else -> return emptyList() } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/FirDiagnosticsDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/FirDiagnosticsDirectives.kt index 19cd01324f4..1049ebdc57b 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/FirDiagnosticsDirectives.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/FirDiagnosticsDirectives.kt @@ -5,6 +5,9 @@ package org.jetbrains.kotlin.test.directives +import org.jetbrains.kotlin.test.FirParser +import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder +import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_PARSER import org.jetbrains.kotlin.test.directives.model.DirectiveApplicability.Global import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer import org.jetbrains.kotlin.test.frontend.fir.handlers.FirResolvedTypesVerifier @@ -36,8 +39,8 @@ object FirDiagnosticsDirectives : SimpleDirectivesContainer() { applicability = Global ) - val USE_LIGHT_TREE by directive( - description = "Enables light tree parser instead of PSI" + val FIR_PARSER by enumDirective( + description = "Defines which parser should be used for FIR compiler" ) val FIR_DISABLE_LAZY_RESOLVE_CHECKS by directive( @@ -45,10 +48,7 @@ object FirDiagnosticsDirectives : SimpleDirectivesContainer() { ) val COMPARE_WITH_LIGHT_TREE by directive( - description = """ - Enable comparing diagnostics between PSI and light tree modes - For enabling light tree mode use $USE_LIGHT_TREE directive - """.trimIndent(), + description = "Enable comparing diagnostics between PSI and light tree modes", applicability = Global ) @@ -78,3 +78,9 @@ object FirDiagnosticsDirectives : SimpleDirectivesContainer() { """.trimIndent() ) } + +fun TestConfigurationBuilder.configureFirParser(parser: FirParser) { + defaultDirectives { + FIR_PARSER with parser + } +} diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/FirTestDataConsistencyHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/FirTestDataConsistencyHandler.kt index a1ad3169315..7a160719dec 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/FirTestDataConsistencyHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/FirTestDataConsistencyHandler.kt @@ -11,8 +11,8 @@ import org.jetbrains.kotlin.test.directives.model.DirectivesContainer import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives import org.jetbrains.kotlin.test.model.AfterAnalysisChecker import org.jetbrains.kotlin.test.model.TestFile -import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTest -import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticsTestWithJvmIrBackend +import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticsTestWithJvmIrBackend +import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTest import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest import org.jetbrains.kotlin.test.services.* import org.jetbrains.kotlin.test.utils.firTestDataFile @@ -59,7 +59,7 @@ open class FirTestDataConsistencyHandler(testServices: TestServices) : AfterAnal } protected open fun correspondingFirTest(): AbstractKotlinCompilerTest { - return if ("Backend" in testServices.testInfo.className) object : AbstractFirDiagnosticsTestWithJvmIrBackend() {} - else object : AbstractFirDiagnosticTest() {} + return if ("Backend" in testServices.testInfo.className) object : AbstractFirPsiDiagnosticsTestWithJvmIrBackend() {} + else object : AbstractFirPsiDiagnosticTest() {} } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt index 5b330cc15a7..8a4b8ca0789 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt @@ -38,7 +38,9 @@ import org.jetbrains.kotlin.platform.konan.isNative import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.directives.model.DirectivesContainer +import org.jetbrains.kotlin.test.directives.model.singleValue import org.jetbrains.kotlin.test.getAnalyzerServices import org.jetbrains.kotlin.test.model.FrontendFacade import org.jetbrains.kotlin.test.model.FrontendKinds @@ -261,11 +263,11 @@ open class FirFrontendFacade( PsiElementFinder.EP.getPoint(project).unregisterExtension(JavaElementFinder::class.java) - val lightTreeEnabled = FirDiagnosticsDirectives.USE_LIGHT_TREE in module.directives - val (ktFiles, lightTreeFiles) = if (lightTreeEnabled) { - emptyList() to testServices.sourceFileProvider.getLightTreeFilesForSourceFiles(module.files).values - } else { - testServices.sourceFileProvider.getKtFilesForSourceFiles(module.files, project).values to emptyList() + val parser = module.directives.singleValue(FirDiagnosticsDirectives.FIR_PARSER) + + val (ktFiles, lightTreeFiles) = when (parser) { + FirParser.LightTree -> emptyList() to testServices.sourceFileProvider.getLightTreeFilesForSourceFiles(module.files).values + FirParser.Psi -> testServices.sourceFileProvider.getKtFilesForSourceFiles(module.files, project).values to emptyList() } val extensionRegistrars = FirExtensionRegistrar.getInstances(project) @@ -295,7 +297,7 @@ open class FirFrontendFacade( ktFiles, lightTreeFiles, IrGenerationExtension.getInstances(project), - lightTreeEnabled, + parser, enablePluginPhases, generateSignatures = module.targetBackend == TargetBackend.JVM_IR_SERIALIZE ) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt index 6f604986d05..20de060ea3e 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt @@ -34,11 +34,13 @@ import org.jetbrains.kotlin.name.FqNameUnsafe import org.jetbrains.kotlin.psi.KtBinaryExpression import org.jetbrains.kotlin.psi.KtQualifiedExpression import org.jetbrains.kotlin.resolve.AnalyzingUtils +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.directives.AdditionalFilesDirectives import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives import org.jetbrains.kotlin.test.directives.model.DirectivesContainer +import org.jetbrains.kotlin.test.directives.model.singleValue import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.model.TestFile import org.jetbrains.kotlin.test.model.TestModule @@ -66,7 +68,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes val currentModule = part.module val lightTreeComparingModeEnabled = FirDiagnosticsDirectives.COMPARE_WITH_LIGHT_TREE in currentModule.directives - val lightTreeEnabled = FirDiagnosticsDirectives.USE_LIGHT_TREE in currentModule.directives + val lightTreeEnabled = currentModule.directives.singleValue(FirDiagnosticsDirectives.FIR_PARSER) == FirParser.LightTree for (file in currentModule.files) { val firFile = info.mainFirFiles[file] ?: continue @@ -491,7 +493,7 @@ class PsiLightTreeMetaInfoProcessor(testServices: TestServices) : AbstractTwoAtt } override fun firstAttributeEnabled(module: TestModule): Boolean { - return FirDiagnosticsDirectives.USE_LIGHT_TREE !in module.directives + return module.directives.singleValue(FirDiagnosticsDirectives.FIR_PARSER) == FirParser.Psi } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsNativeTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsNativeTest.kt index b7355c1ce25..7cf732bfd62 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsNativeTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsNativeTest.kt @@ -7,13 +7,11 @@ package org.jetbrains.kotlin.test.runners import org.jetbrains.kotlin.platform.konan.NativePlatforms import org.jetbrains.kotlin.test.Constructor +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.classicFrontendHandlersStep import org.jetbrains.kotlin.test.builders.firHandlersStep -import org.jetbrains.kotlin.test.directives.ConfigurationDirectives -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives -import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives -import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives +import org.jetbrains.kotlin.test.directives.* import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler @@ -88,7 +86,7 @@ abstract class AbstractDiagnosticsNativeTest : AbstractDiagnosticsNativeTestBase } } -abstract class AbstractFirNativeDiagnosticsTest : AbstractDiagnosticsNativeTestBase() { +abstract class AbstractFirNativeDiagnosticsTestBase(val parser: FirParser) : AbstractDiagnosticsNativeTestBase() { override val targetFrontend: FrontendKind get() = FrontendKinds.FIR @@ -108,24 +106,20 @@ abstract class AbstractFirNativeDiagnosticsTest : AbstractDiagnosticsNativeTestB } } - override fun configure(builder: TestConfigurationBuilder) { - super.configure(builder) - builder.enableLazyResolvePhaseChecking() - - builder.forTestsMatching("compiler/testData/diagnostics/*") { - configurationForClassicAndFirTestsAlongside() - } - } -} - -abstract class AbstractFirNativeDiagnosticsWithLightTreeTest : AbstractFirNativeDiagnosticsTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) with(builder) { - defaultDirectives { - +FirDiagnosticsDirectives.USE_LIGHT_TREE + configureFirParser(parser) + enableLazyResolvePhaseChecking() + + forTestsMatching("compiler/testData/diagnostics/*") { + configurationForClassicAndFirTestsAlongside() } } } } +abstract class AbstractFirPsiNativeDiagnosticsTest : AbstractFirNativeDiagnosticsTestBase(FirParser.Psi) +abstract class AbstractFirLightTreeNativeDiagnosticsTest : AbstractFirNativeDiagnosticsTestBase(FirParser.LightTree) + + diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt index 3b51cb040ea..bb9aa857892 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJvmBackend.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.test.runners import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.test.Constructor +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.classic.ClassicBackendInput @@ -19,6 +20,7 @@ import org.jetbrains.kotlin.test.builders.classicFrontendHandlersStep import org.jetbrains.kotlin.test.builders.firHandlersStep import org.jetbrains.kotlin.test.builders.jvmArtifactsHandlersStep import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade @@ -146,7 +148,9 @@ abstract class AbstractDiagnosticsTestWithJvmIrBackend : get() = ::JvmIrBackendFacade } -abstract class AbstractFirDiagnosticsTestWithJvmIrBackend : AbstractDiagnosticsTestWithJvmBackend() { +abstract class AbstractFirDiagnosticsTestWithJvmIrBackendBase( + val parser: FirParser +) : AbstractDiagnosticsTestWithJvmBackend() { override val targetFrontend: FrontendKind get() = FrontendKinds.FIR @@ -169,4 +173,11 @@ abstract class AbstractFirDiagnosticsTestWithJvmIrBackend : AbstractDiagnosticsT if (InTextDirectivesUtils.isDirectiveDefined(wholeText, "// TARGET_BACKEND: JVM_OLD")) return super.runTest(filePath) } + + override fun configure(builder: TestConfigurationBuilder) { + super.configure(builder) + builder.configureFirParser(parser) + } } + +abstract class AbstractFirPsiDiagnosticsTestWithJvmIrBackend : AbstractFirDiagnosticsTestWithJvmIrBackendBase(FirParser.Psi) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt index 9c302d4d01b..552e967d21d 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt @@ -18,13 +18,14 @@ import org.jetbrains.kotlin.test.builders.firHandlersStep import org.jetbrains.kotlin.test.coerce import org.jetbrains.kotlin.test.directives.ConfigurationDirectives.WITH_STDLIB import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.USE_LIGHT_TREE import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.WITH_EXTENDED_CHECKERS +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.JDK_KIND import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_REFLECT import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.ALLOW_KOTLIN_PACKAGE import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.LANGUAGE +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.fir.* import org.jetbrains.kotlin.test.frontend.fir.handlers.* import org.jetbrains.kotlin.test.model.DependencyKind @@ -37,23 +38,16 @@ import org.jetbrains.kotlin.test.services.service import org.jetbrains.kotlin.test.services.sourceProviders.AdditionalDiagnosticsSourceFilesProvider import org.jetbrains.kotlin.test.services.sourceProviders.CoroutineHelpersSourceFilesProvider -abstract class AbstractFirDiagnosticTest : AbstractKotlinCompilerTest() { +abstract class AbstractFirDiagnosticTestBase(val parser: FirParser) : AbstractKotlinCompilerTest() { override fun TestConfigurationBuilder.configuration() { baseFirDiagnosticTestConfiguration() enableLazyResolvePhaseChecking() + configureFirParser(parser) } } -abstract class AbstractFirDiagnosticsWithLightTreeTest : AbstractFirDiagnosticTest() { - override fun configure(builder: TestConfigurationBuilder) { - super.configure(builder) - with(builder) { - defaultDirectives { - +USE_LIGHT_TREE - } - } - } -} +abstract class AbstractFirPsiDiagnosticTest : AbstractFirDiagnosticTestBase(FirParser.Psi) +abstract class AbstractFirLightTreeDiagnosticsTest : AbstractFirDiagnosticTestBase(FirParser.LightTree) fun TestConfigurationBuilder.configurationForClassicAndFirTestsAlongside() { useAfterAnalysisCheckers( diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTestSpec.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTestSpec.kt index 27ca700e854..96fa14993a0 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTestSpec.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTestSpec.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.test.runners +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.bind import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.AdditionalFilesDirectives.SPEC_HELPERS @@ -14,7 +15,7 @@ import org.jetbrains.kotlin.test.frontend.fir.handlers.FirIdenticalChecker import org.jetbrains.kotlin.test.services.fir.FirOldFrontendMetaConfigurator import org.jetbrains.kotlin.test.services.sourceProviders.SpecHelpersSourceFilesProvider -abstract class AbstractFirDiagnosticTestSpec : AbstractFirDiagnosticTest() { +abstract class AbstractFirDiagnosticTestSpecBase(parser: FirParser) : AbstractFirDiagnosticTestBase(parser) { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) with(builder) { @@ -23,6 +24,8 @@ abstract class AbstractFirDiagnosticTestSpec : AbstractFirDiagnosticTest() { } } +abstract class AbstractFirPsiDiagnosticTestSpec : AbstractFirDiagnosticTestSpecBase(FirParser.Psi) + fun TestConfigurationBuilder.baseFirSpecDiagnosticTestConfiguration(baseDir: String = ".") { defaultDirectives { +SPEC_HELPERS diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirForeignAnnotationsTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirForeignAnnotationsTest.kt index 328b22bdf74..da6fb54178f 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirForeignAnnotationsTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirForeignAnnotationsTest.kt @@ -5,11 +5,13 @@ package org.jetbrains.kotlin.test.runners +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.configureFirHandlersStep import org.jetbrains.kotlin.test.builders.firFrontendStep import org.jetbrains.kotlin.test.builders.firHandlersStep import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.classic.handlers.FirJspecifyDiagnosticComplianceHandler import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor import org.jetbrains.kotlin.test.frontend.fir.handlers.* @@ -17,7 +19,10 @@ import org.jetbrains.kotlin.test.model.FrontendKinds import org.jetbrains.kotlin.test.preprocessors.JspecifyMarksCleanupPreprocessor import org.jetbrains.kotlin.test.services.fir.FirOldFrontendMetaConfigurator -abstract class AbstractFirForeignAnnotationsTestBase(kind: ForeignAnnotationsTestKind) : AbstractForeignAnnotationsTestBase(kind) { +abstract class AbstractFirForeignAnnotationsTestBase( + kind: ForeignAnnotationsTestKind, + val parser: FirParser +) : AbstractForeignAnnotationsTestBase(kind) { override fun TestConfigurationBuilder.configureFrontend() { globalDefaults { frontend = FrontendKinds.FIR @@ -27,6 +32,8 @@ abstract class AbstractFirForeignAnnotationsTestBase(kind: ForeignAnnotationsTes LanguageSettingsDirectives.LANGUAGE with "+EnableDfaWarningsInK2" } + configureFirParser(parser) + useMetaInfoProcessors(::PsiLightTreeMetaInfoProcessor) firFrontendStep() firHandlersStep { @@ -56,11 +63,11 @@ abstract class AbstractFirForeignAnnotationsTestBase(kind: ForeignAnnotationsTes } } -abstract class AbstractFirForeignAnnotationsSourceJavaTest : - AbstractFirForeignAnnotationsTestBase(ForeignAnnotationsTestKind.SOURCE) +abstract class AbstractFirPsiForeignAnnotationsSourceJavaTest : + AbstractFirForeignAnnotationsTestBase(ForeignAnnotationsTestKind.SOURCE, FirParser.Psi) -abstract class AbstractFirForeignAnnotationsCompiledJavaTest : - AbstractFirForeignAnnotationsTestBase(ForeignAnnotationsTestKind.COMPILED_JAVA) +abstract class AbstractFirPsiForeignAnnotationsCompiledJavaTest : + AbstractFirForeignAnnotationsTestBase(ForeignAnnotationsTestKind.COMPILED_JAVA, FirParser.Psi) -abstract class AbstractFirForeignAnnotationsCompiledJavaWithPsiClassReadingTest : - AbstractFirForeignAnnotationsTestBase(ForeignAnnotationsTestKind.COMPILED_JAVA_WITH_PSI_CLASS_LOADING) +abstract class AbstractFirPsiForeignAnnotationsCompiledJavaWithPsiClassReadingTest : + AbstractFirForeignAnnotationsTestBase(ForeignAnnotationsTestKind.COMPILED_JAVA_WITH_PSI_CLASS_LOADING, FirParser.Psi) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt index 232971c56cf..72755b640f9 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt @@ -108,7 +108,7 @@ private class FirForeignDiagnosticsTestDataConsistencyHandler(testServices: Test FirTestDataConsistencyHandler(testServices) { override fun correspondingFirTest(): AbstractKotlinCompilerTest = - object : AbstractFirForeignAnnotationsSourceJavaTest() {} + object : AbstractFirPsiForeignAnnotationsSourceJavaTest() {} } abstract class AbstractOldFrontendForeignAnnotationsTestBase(kind: ForeignAnnotationsTestKind) : diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractAsmLikeInstructionListingTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractAsmLikeInstructionListingTest.kt index 1d811de5db8..f00ad2a22b3 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractAsmLikeInstructionListingTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractAsmLikeInstructionListingTest.kt @@ -18,7 +18,8 @@ import org.jetbrains.kotlin.test.builders.configureClassicFrontendHandlersStep import org.jetbrains.kotlin.test.builders.configureFirHandlersStep import org.jetbrains.kotlin.test.builders.configureJvmArtifactsHandlersStep import org.jetbrains.kotlin.test.directives.AsmLikeInstructionListingDirectives.CHECK_ASM_LIKE_INSTRUCTIONS -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.USE_LIGHT_TREE +import org.jetbrains.kotlin.test.FirParser +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade @@ -100,7 +101,7 @@ open class AbstractIrAsmLikeInstructionListingTest : get() = ::JvmIrBackendFacade } -abstract class AbstractFirAsmLikeInstructionListingTestBase(val useLightTree: Boolean) : +abstract class AbstractFirAsmLikeInstructionListingTestBase(val parser: FirParser) : AbstractAsmLikeInstructionListingTestBase( FrontendKinds.FIR, TargetBackend.JVM_IR @@ -117,12 +118,13 @@ abstract class AbstractFirAsmLikeInstructionListingTestBase(val useLightTree: Bo override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) - if (useLightTree) { - builder.defaultDirectives { +USE_LIGHT_TREE } - } + builder.configureFirParser(parser) } } -open class AbstractFirAsmLikeInstructionListingTest : AbstractFirAsmLikeInstructionListingTestBase(useLightTree = true) +open class AbstractFirLightTreeAsmLikeInstructionListingTest : AbstractFirAsmLikeInstructionListingTestBase(FirParser.LightTree) + +@FirPsiCodegenTest +open class AbstractFirPsiAsmLikeInstructionListingTest : AbstractFirAsmLikeInstructionListingTestBase(FirParser.Psi) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBlackBoxInlineCodegenTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBlackBoxInlineCodegenTest.kt index 0ae7a14c6b2..489176314c3 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBlackBoxInlineCodegenTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBlackBoxInlineCodegenTest.kt @@ -21,7 +21,7 @@ open class AbstractIrBlackBoxInlineCodegenTest : AbstractIrBlackBoxCodegenTest() } } -open class AbstractFirBlackBoxInlineCodegenTest : AbstractFirBlackBoxCodegenTest() { +open class AbstractFirLightTreeBlackBoxInlineCodegenTest : AbstractFirLightTreeBlackBoxCodegenTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.useInlineHandlers() @@ -32,8 +32,6 @@ open class AbstractFirBlackBoxInlineCodegenTest : AbstractFirBlackBoxCodegenTest open class AbstractFirPsiBlackBoxInlineCodegenTest : AbstractFirPsiBlackBoxCodegenTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) - with(builder) { - useInlineHandlers() - } + builder.useInlineHandlers() } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt index 09b0e09459a..0f355cdd008 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeListingTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.test.runners.codegen import org.jetbrains.kotlin.test.Constructor +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor import org.jetbrains.kotlin.test.backend.classic.ClassicBackendInput @@ -15,9 +16,7 @@ import org.jetbrains.kotlin.test.backend.ir.IrBackendInput import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.configureJvmArtifactsHandlersStep -import org.jetbrains.kotlin.test.directives.CodegenTestDirectives -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives -import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives +import org.jetbrains.kotlin.test.directives.* import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest import org.jetbrains.kotlin.test.frontend.classic.* import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter @@ -81,7 +80,7 @@ open class AbstractIrBytecodeListingTest : AbstractBytecodeListingTestBase( TargetBackend.JVM_IR, FrontendKinds.FIR @@ -97,13 +96,11 @@ abstract class AbstractFirBytecodeListingTestBase(val useLightTree: Boolean) : override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) - if (useLightTree) { - builder.defaultDirectives { +FirDiagnosticsDirectives.USE_LIGHT_TREE } - } + builder.configureFirParser(parser) } } -open class AbstractFirBytecodeListingTest : AbstractFirBytecodeListingTestBase(useLightTree = true) +open class AbstractFirLightTreeBytecodeListingTest : AbstractFirBytecodeListingTestBase(FirParser.LightTree) @FirPsiCodegenTest -open class AbstractFirPsiBytecodeListingTest : AbstractFirBytecodeListingTestBase(useLightTree = false) +open class AbstractFirPsiBytecodeListingTest : AbstractFirBytecodeListingTestBase(FirParser.Psi) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt index 3f2f7f403c2..ab4db59c612 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt @@ -18,7 +18,8 @@ import org.jetbrains.kotlin.test.builders.configureJvmArtifactsHandlersStep import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_PSI_CLASS_FILES_READING import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_REFLECT import org.jetbrains.kotlin.test.directives.ConfigurationDirectives.WITH_STDLIB -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives +import org.jetbrains.kotlin.test.FirParser +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade @@ -83,7 +84,7 @@ open class AbstractIrBytecodeTextTest : AbstractBytecodeTextTestBase( +open class AbstractFirBytecodeTextTestBase(val parser: FirParser) : AbstractBytecodeTextTestBase( targetBackend = TargetBackend.JVM_IR, targetFrontend = FrontendKinds.FIR ) { @@ -102,15 +103,13 @@ open class AbstractFirBytecodeTextTestBase(val useLightTree: Boolean) : Abstract defaultDirectives { // See KT-44152 -USE_PSI_CLASS_FILES_READING - if (useLightTree) { - +FirDiagnosticsDirectives.USE_LIGHT_TREE - } + builder.configureFirParser(parser) } } } } -open class AbstractFirBytecodeTextTest : AbstractFirBytecodeTextTestBase(useLightTree = true) +open class AbstractFirLightTreeBytecodeTextTest : AbstractFirBytecodeTextTestBase(FirParser.LightTree) @FirPsiCodegenTest -open class AbstractFirPsiBytecodeTextTest : AbstractFirBytecodeTextTestBase(useLightTree = false) +open class AbstractFirPsiBytecodeTextTest : AbstractFirBytecodeTextTestBase(FirParser.Psi) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt index 6b5c9bd19ba..4b51479c9de 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt @@ -20,8 +20,9 @@ import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.configureIrHandlersStep import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND_K2_MULTI_MODULE import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND_MULTI_MODULE -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.SERIALIZE_IR +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.directives.model.ValueDirective import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter @@ -103,7 +104,7 @@ open class AbstractIrSerializeCompileKotlinAgainstInlineKotlinTest : AbstractIrC } } -open class AbstractFirSerializeCompileKotlinAgainstInlineKotlinTestBase(val useLightTree: Boolean) : +open class AbstractFirSerializeCompileKotlinAgainstInlineKotlinTestBase(val parser: FirParser) : AbstractCompileKotlinAgainstInlineKotlinTestBase(FrontendKinds.FIR, TargetBackend.JVM_IR_SERIALIZE) { override val frontendFacade: Constructor> @@ -120,15 +121,13 @@ open class AbstractFirSerializeCompileKotlinAgainstInlineKotlinTestBase(val useL override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.configureForSerialization() - if (useLightTree) { - builder.defaultDirectives { +FirDiagnosticsDirectives.USE_LIGHT_TREE } - } + builder.configureFirParser(parser) } } -open class AbstractFirSerializeCompileKotlinAgainstInlineKotlinTest : - AbstractFirSerializeCompileKotlinAgainstInlineKotlinTestBase(useLightTree = true) +open class AbstractFirLightTreeSerializeCompileKotlinAgainstInlineKotlinTest : + AbstractFirSerializeCompileKotlinAgainstInlineKotlinTestBase(FirParser.LightTree) @FirPsiCodegenTest open class AbstractFirPsiSerializeCompileKotlinAgainstInlineKotlinTest : - AbstractFirSerializeCompileKotlinAgainstInlineKotlinTestBase(useLightTree = false) + AbstractFirSerializeCompileKotlinAgainstInlineKotlinTestBase(FirParser.Psi) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirBlackBoxCodegenTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirBlackBoxCodegenTest.kt index c3e1f67bcf6..58eb0b50308 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirBlackBoxCodegenTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirBlackBoxCodegenTest.kt @@ -13,8 +13,9 @@ import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.configureFirHandlersStep import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_PSI_CLASS_FILES_READING import org.jetbrains.kotlin.test.directives.ConfigurationDirectives.WITH_STDLIB -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.USE_LIGHT_TREE +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.FirMetaInfoDiffSuppressor @@ -26,7 +27,7 @@ import org.jetbrains.kotlin.test.frontend.fir.handlers.FirScopeDumpHandler import org.jetbrains.kotlin.test.model.* abstract class AbstractFirBlackBoxCodegenTestBase( - val useLightTree: Boolean + val parser: FirParser ) : AbstractJvmBlackBoxCodegenTestBase( FrontendKinds.FIR, TargetBackend.JVM_IR @@ -43,12 +44,10 @@ abstract class AbstractFirBlackBoxCodegenTestBase( override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) with(builder) { + configureFirParser(parser) defaultDirectives { // See KT-44152 -USE_PSI_CLASS_FILES_READING - if (useLightTree) { - +USE_LIGHT_TREE - } } forTestsMatching("*WithStdLib/*") { @@ -84,7 +83,7 @@ abstract class AbstractFirBlackBoxCodegenTestBase( } } -open class AbstractFirBlackBoxCodegenTest : AbstractFirBlackBoxCodegenTestBase(useLightTree = true) +open class AbstractFirLightTreeBlackBoxCodegenTest : AbstractFirBlackBoxCodegenTestBase(FirParser.LightTree) @FirPsiCodegenTest -open class AbstractFirPsiBlackBoxCodegenTest : AbstractFirBlackBoxCodegenTestBase(useLightTree = false) +open class AbstractFirPsiBlackBoxCodegenTest : AbstractFirBlackBoxCodegenTestBase(FirParser.Psi) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTest.kt index 5d6e6732478..5967436d21d 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTest.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.test.backend.classic.ClassicJvmBackendFacade import org.jetbrains.kotlin.test.backend.ir.IrBackendInput import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives +import org.jetbrains.kotlin.test.FirParser +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade @@ -61,7 +62,7 @@ open class AbstractLocalVariableTest : AbstractLocalVariableTestBase( +open class AbstractFirLocalVariableTestBase(val parser: FirParser) : AbstractLocalVariableTestBase( FrontendKinds.FIR, TargetBackend.JVM_IR ) { @@ -77,13 +78,11 @@ open class AbstractFirLocalVariableTestBase(val useLightTree: Boolean) : Abstrac override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.configureDumpHandlersForCodegenTest() - if (useLightTree) { - builder.defaultDirectives { +FirDiagnosticsDirectives.USE_LIGHT_TREE } - } + builder.configureFirParser(parser) } } -open class AbstractFirLocalVariableTest : AbstractFirLocalVariableTestBase(useLightTree = true) +open class AbstractFirLightTreeLocalVariableTest : AbstractFirLocalVariableTestBase(FirParser.LightTree) @FirPsiCodegenTest -open class AbstractFirPsiLocalVariableTest : AbstractFirLocalVariableTestBase(useLightTree = false) +open class AbstractFirPsiLocalVariableTest : AbstractFirLocalVariableTestBase(FirParser.Psi) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTest.kt index 2915445201b..966eff4ffb6 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTest.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.test.backend.classic.ClassicJvmBackendFacade import org.jetbrains.kotlin.test.backend.ir.IrBackendInput import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives +import org.jetbrains.kotlin.test.FirParser +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade @@ -61,7 +62,7 @@ open class AbstractSteppingTest : AbstractSteppingTestBase( +open class AbstractFirSteppingTestBase(val parser: FirParser) : AbstractSteppingTestBase( FrontendKinds.FIR, TargetBackend.JVM_IR ) { @@ -77,13 +78,11 @@ open class AbstractFirSteppingTestBase(val useLightTree: Boolean) : AbstractStep override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.configureDumpHandlersForCodegenTest() - if (useLightTree) { - builder.defaultDirectives { +FirDiagnosticsDirectives.USE_LIGHT_TREE } - } + builder.configureFirParser(parser) } } -open class AbstractFirSteppingTest : AbstractFirSteppingTestBase(useLightTree = true) +open class AbstractFirLightTreeSteppingTest : AbstractFirSteppingTestBase(FirParser.LightTree) @FirPsiCodegenTest -open class AbstractFirPsiSteppingTest : AbstractFirSteppingTestBase(useLightTree = false) +open class AbstractFirPsiSteppingTest : AbstractFirSteppingTestBase(FirParser.Psi) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt index 7756c53f7ad..c669408f6b7 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt @@ -18,8 +18,9 @@ import org.jetbrains.kotlin.test.builders.firHandlersStep import org.jetbrains.kotlin.test.builders.irHandlersStep import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.DUMP_IR import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.DUMP_KT_IR -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact @@ -116,7 +117,7 @@ open class AbstractIrTextTest : AbstractIrTextTestBase() { +open class AbstractFirIrTextTestBase(val parser: FirParser) : AbstractIrTextTestBase() { override val frontend: FrontendKind<*> get() = FrontendKinds.FIR override val frontendFacade: Constructor> @@ -127,12 +128,7 @@ open class AbstractFir2IrTextTestBase(val useLightTree: Boolean) : AbstractIrTex override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) with(builder) { - if (useLightTree) { - defaultDirectives { - +FirDiagnosticsDirectives.USE_LIGHT_TREE - } - } - + configureFirParser(parser) useAfterAnalysisCheckers( ::FirIrDumpIdenticalChecker, ::BlackBoxCodegenSuppressor @@ -147,12 +143,12 @@ open class AbstractFir2IrTextTestBase(val useLightTree: Boolean) : AbstractIrTex } } -open class AbstractFir2IrTextTest : AbstractFir2IrTextTestBase(useLightTree = true) +open class AbstractFirLightTreeIrTextTest : AbstractFirIrTextTestBase(FirParser.LightTree) @FirPsiCodegenTest -open class AbstractFirPsi2IrTextTest : AbstractFir2IrTextTestBase(useLightTree = false) +open class AbstractFirPsiIrTextTest : AbstractFirIrTextTestBase(FirParser.Psi) -open class AbstractFir2IrJsTextTestBase(useLightTree: Boolean) : AbstractFir2IrTextTestBase(useLightTree) { +open class AbstractFirIrJsTextTestBase(parser: FirParser) : AbstractFirIrTextTestBase(parser) { override fun TestConfigurationBuilder.applyConfigurators() { useConfigurators( ::CommonEnvironmentConfigurator, @@ -175,4 +171,4 @@ open class AbstractFir2IrJsTextTestBase(useLightTree: Boolean) : AbstractFir2IrT } } -open class AbstractFir2IrJsTextTest : AbstractFir2IrJsTextTestBase(useLightTree = true) +open class AbstractFirLightTreeIrJsTextTest : AbstractFirIrJsTextTestBase(FirParser.LightTree) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/interpreter/AbstractIrInterpreterTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/interpreter/AbstractIrInterpreterTest.kt index aba7d72ab0e..26c0233b374 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/interpreter/AbstractIrInterpreterTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/interpreter/AbstractIrInterpreterTest.kt @@ -9,12 +9,14 @@ import org.jetbrains.kotlin.config.AnalysisFlag import org.jetbrains.kotlin.config.AnalysisFlags import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.platform.jvm.JvmPlatforms +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor import org.jetbrains.kotlin.test.backend.handlers.IrInterpreterBackendHandler import org.jetbrains.kotlin.test.builders.* import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives import org.jetbrains.kotlin.test.model.BinaryKind import org.jetbrains.kotlin.test.model.DependencyKind @@ -22,6 +24,7 @@ import org.jetbrains.kotlin.test.model.FrontendKind import org.jetbrains.kotlin.test.model.FrontendKinds import org.jetbrains.kotlin.test.preprocessors.IrInterpreterImplicitKotlinImports import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest +import org.jetbrains.kotlin.test.runners.codegen.FirPsiCodegenTest import org.jetbrains.kotlin.test.services.EnvironmentConfigurator import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator @@ -81,7 +84,15 @@ open class AbstractJvmIrInterpreterTest(frontendKind: FrontendKind<*>) : Abstrac } } -open class AbstractJvmIrInterpreterAfterFir2IrTest : AbstractJvmIrInterpreterTest(FrontendKinds.FIR) +abstract class AbstractJvmIrInterpreterAfterFir2IrTestBase(val parser: FirParser) : AbstractJvmIrInterpreterTest(FrontendKinds.FIR) { + override fun configure(builder: TestConfigurationBuilder) { + super.configure(builder) + builder.configureFirParser(parser) + } +} + +open class AbstractJvmIrInterpreterAfterFirPsi2IrTest : AbstractJvmIrInterpreterAfterFir2IrTestBase(FirParser.Psi) + open class AbstractJvmIrInterpreterAfterPsi2IrTest : AbstractJvmIrInterpreterTest(FrontendKinds.ClassicFrontend) class IrInterpreterEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) { diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt index 90387812dd6..36b828841cb 100644 --- a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt +++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt @@ -45,6 +45,7 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.AnalyzingUtils import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.util.DummyLogger import org.jetbrains.kotlin.util.Logger import java.io.File @@ -124,6 +125,7 @@ object GenerationUtils { files, emptyList(), IrGenerationExtension.getInstances(project), + FirParser.Psi, generateSignatures = false ) val fir2IrExtensions = JvmFir2IrExtensions(configuration, JvmIrDeserializerImpl(), JvmIrMangler) diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirAnalyzerFacade.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirAnalyzerFacade.kt index b6c9b3233a6..cebfe893e88 100644 --- a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirAnalyzerFacade.kt +++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirAnalyzerFacade.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmIrMangler import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.sourceFiles.LightTreeFile +import org.jetbrains.kotlin.test.FirParser abstract class AbstractFirAnalyzerFacade { abstract val scopeSession: ScopeSession @@ -45,7 +46,7 @@ class FirAnalyzerFacade( val ktFiles: Collection = emptyList(), // may be empty if light tree mode enabled val lightTreeFiles: Collection = emptyList(), // may be empty if light tree mode disabled val irGeneratorExtensions: Collection, - val useLightTree: Boolean = false, + val parser: FirParser, val enablePluginPhases: Boolean = false, val generateSignatures: Boolean = false ) : AbstractFirAnalyzerFacade() { @@ -59,18 +60,21 @@ class FirAnalyzerFacade( private fun buildRawFir() { if (firFiles != null) return val firProvider = (session.firProvider as FirProviderImpl) - firFiles = if (useLightTree) { - val builder = LightTree2Fir(session, firProvider.kotlinScopeProvider) - lightTreeFiles.map { - builder.buildFirFile(it.lightTree, it.sourceFile, it.linesMapping).also { firFile -> - firProvider.recordFile(firFile) + firFiles = when (parser) { + FirParser.LightTree -> { + val builder = LightTree2Fir(session, firProvider.kotlinScopeProvider) + lightTreeFiles.map { + builder.buildFirFile(it.lightTree, it.sourceFile, it.linesMapping).also { firFile -> + firProvider.recordFile(firFile) + } } } - } else { - val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider) - ktFiles.map { - builder.buildFirFile(it).also { firFile -> - firProvider.recordFile(firFile) + FirParser.Psi -> { + val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider) + ktFiles.map { + builder.buildFirFile(it).also { firFile -> + firProvider.recordFile(firFile) + } } } } diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt index b39299ff048..5ffef984ce2 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt @@ -10,11 +10,8 @@ import org.jetbrains.kotlin.generators.util.TestGeneratorUtil import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.runners.* import org.jetbrains.kotlin.test.runners.codegen.* -import org.jetbrains.kotlin.test.runners.ir.AbstractFir2IrTextTest -import org.jetbrains.kotlin.test.runners.ir.AbstractIrTextTest -import org.jetbrains.kotlin.test.runners.ir.AbstractFirPsi2IrTextTest -import org.jetbrains.kotlin.test.runners.ir.interpreter.AbstractJvmIrInterpreterAfterFir2IrTest -import org.jetbrains.kotlin.test.runners.ir.interpreter.AbstractJvmIrInterpreterAfterPsi2IrTest +import org.jetbrains.kotlin.test.runners.ir.* +import org.jetbrains.kotlin.test.runners.ir.interpreter.* import org.jetbrains.kotlin.test.utils.CUSTOM_TEST_DATA_EXTENSION_PATTERN import org.jetbrains.kotlin.visualizer.fir.AbstractFirVisualizerTest import org.jetbrains.kotlin.visualizer.psi.AbstractPsiVisualizerTest @@ -179,7 +176,7 @@ fun generateJUnit5CompilerTests(args: Array) { model("codegen/asmLike") } - testClass { + testClass { model("ir/interpreter", excludeDirs = listOf("helpers")) } @@ -191,57 +188,57 @@ fun generateJUnit5CompilerTests(args: Array) { // ---------------------------------------------- FIR tests ---------------------------------------------- testGroup(testsRoot = "compiler/fir/analysis-tests/tests-gen", testDataRoot = "compiler/testData") { - testClass(suiteTestClassName = "FirOldFrontendDiagnosticsTestGenerated") { + testClass(suiteTestClassName = "FirPsiOldFrontendDiagnosticsTestGenerated") { model("diagnostics/tests", pattern = "^(.*)\\.kts?$", excludedPattern = excludedCustomTestdataPattern) model("diagnostics/testsWithStdLib", excludedPattern = excludedCustomTestdataPattern) } - testClass( - suiteTestClassName = "FirOldFrontendDiagnosticsWithLightTreeTestGenerated" + testClass( + suiteTestClassName = "FirLightTreeOldFrontendDiagnosticsTestGenerated" ) { model("diagnostics/tests", excludedPattern = excludedCustomTestdataPattern) model("diagnostics/testsWithStdLib", excludedPattern = excludedCustomTestdataPattern) } - testClass( - suiteTestClassName = "FirOldFrontendForeignAnnotationsSourceJavaTestGenerated" + testClass( + suiteTestClassName = "FirPsiOldFrontendForeignAnnotationsSourceJavaTestGenerated" ) { model("diagnostics/foreignAnnotationsTests/tests", excludedPattern = excludedCustomTestdataPattern) model("diagnostics/foreignAnnotationsTests/java8Tests", excludedPattern = excludedCustomTestdataPattern) model("diagnostics/foreignAnnotationsTests/java11Tests", excludedPattern = excludedCustomTestdataPattern) } - testClass( - suiteTestClassName = "FirOldFrontendForeignAnnotationsCompiledJavaTestGenerated" + testClass( + suiteTestClassName = "FirPsiOldFrontendForeignAnnotationsCompiledJavaTestGenerated" ) { model("diagnostics/foreignAnnotationsTests/tests", excludedPattern = excludedCustomTestdataPattern) model("diagnostics/foreignAnnotationsTests/java8Tests", excludedPattern = excludedCustomTestdataPattern) model("diagnostics/foreignAnnotationsTests/java11Tests", excludedPattern = excludedCustomTestdataPattern) } - testClass( - suiteTestClassName = "FirOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated" + testClass( + suiteTestClassName = "FirPsiOldFrontendForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated" ) { model("diagnostics/foreignAnnotationsTests/tests", excludedPattern = excludedCustomTestdataPattern) model("diagnostics/foreignAnnotationsTests/java8Tests", excludedPattern = excludedCustomTestdataPattern) model("diagnostics/foreignAnnotationsTests/java11Tests", excludedPattern = excludedCustomTestdataPattern) } - testClass( - suiteTestClassName = "FirOldFrontendNativeDiagnosticsTestGenerated" + testClass( + suiteTestClassName = "FirPsiOldFrontendNativeDiagnosticsTestGenerated" ) { model("diagnostics/nativeTests", excludedPattern = excludedCustomTestdataPattern) } - testClass( - suiteTestClassName = "FirOldFrontendNativeDiagnosticsWithLightTreeTestGenerated" + testClass( + suiteTestClassName = "FirLightTreeOldFrontendNativeDiagnosticsTestGenerated" ) { model("diagnostics/nativeTests", excludedPattern = excludedCustomTestdataPattern) } } testGroup(testsRoot = "compiler/fir/fir2ir/tests-gen", testDataRoot = "compiler/testData") { - testClass { + testClass { model("codegen/box") } @@ -249,7 +246,7 @@ fun generateJUnit5CompilerTests(args: Array) { model("codegen/box") } - testClass("FirBlackBoxModernJdkCodegenTestGenerated") { + testClass("FirLightTreeBlackBoxModernJdkCodegenTestGenerated") { model("codegen/boxModernJdk") } @@ -257,7 +254,7 @@ fun generateJUnit5CompilerTests(args: Array) { model("codegen/boxModernJdk") } - testClass { + testClass { model("codegen/boxInline") } @@ -265,7 +262,7 @@ fun generateJUnit5CompilerTests(args: Array) { model("codegen/boxInline") } - testClass { + testClass { model("debug/stepping") } @@ -273,7 +270,7 @@ fun generateJUnit5CompilerTests(args: Array) { model("debug/stepping") } - testClass { + testClass { model("debug/localVariables") } @@ -281,15 +278,15 @@ fun generateJUnit5CompilerTests(args: Array) { model("debug/localVariables") } - testClass { + testClass { model("diagnostics/firTestWithJvmBackend") } - testClass(suiteTestClassName = "FirOldDiagnosticsTestWithJvmIrBackendGenerated") { + testClass(suiteTestClassName = "FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated") { model("diagnostics/testsWithJvmBackend", excludedPattern = excludedCustomTestdataPattern) } - testClass { + testClass { model("codegen/boxInline") } @@ -299,8 +296,8 @@ fun generateJUnit5CompilerTests(args: Array) { } testGroup(testsRoot = "compiler/fir/fir2ir/tests-gen", testDataRoot = "compiler/fir/fir2ir/testData") { - testClass( - suiteTestClassName = "FirSpecificBlackBoxCodegenTestGenerated" + testClass( + suiteTestClassName = "FirLightTreeSpecificBlackBoxCodegenTestGenerated" ) { model("codegen/box") model("codegen/boxWithStdLib") @@ -313,53 +310,53 @@ fun generateJUnit5CompilerTests(args: Array) { model("codegen/boxWithStdLib") } - testClass( - suiteTestClassName = "Fir2IrSpecificTextTestGenerated" + testClass( + suiteTestClassName = "FirLightTreeIrSpecificTextTestGenerated" ) { model("ir/irText") } - testClass( - suiteTestClassName = "LightTreeFir2IrSpecificTextTestGenerated" + testClass( + suiteTestClassName = "FirPsiIrSpecificTextTestGenerated" ) { model("ir/irText") } - testClass( - suiteTestClassName = "Fir2IrSpecificBytecodeListingTestGenerated" + testClass( + suiteTestClassName = "FirLightTreeSpecificBytecodeListingTestGenerated" ) { model("codegen/bytecodeListing") } testClass( - suiteTestClassName = "Fir2IrSpecificBytecodeListingPsiTestGenerated" + suiteTestClassName = "FirPsiSpecificBytecodeListingTestGenerated" ) { model("codegen/bytecodeListing") } } testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") { - testClass { + testClass { model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) model("resolveWithStdlib", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) } - testClass { + testClass { model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) model("resolveWithStdlib", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) } } testGroup(testsRoot = "compiler/fir/fir2ir/tests-gen", testDataRoot = "compiler/testData") { - testClass { + testClass { model("ir/irText") } - testClass { + testClass { model("ir/irText") } - testClass { + testClass { model("codegen/bytecodeText") } diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/DiagnosticsTestSpecGenerated.java b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/DiagnosticsTestSpecGenerated.java index 96f66061bad..fbeff52180d 100644 --- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/DiagnosticsTestSpecGenerated.java +++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/DiagnosticsTestSpecGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/BlackBoxCodegenTestSpecGenerated.java b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/BlackBoxCodegenTestSpecGenerated.java index 32349bdc9df..b462ca8a736 100644 --- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/BlackBoxCodegenTestSpecGenerated.java +++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/BlackBoxCodegenTestSpecGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsing/ParsingTestSpecGenerated.java b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsing/ParsingTestSpecGenerated.java index f7b4d9ae1ea..0de64aaef80 100644 --- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsing/ParsingTestSpecGenerated.java +++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsing/ParsingTestSpecGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt index 481c301f06c..46eb53a6edb 100644 --- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt +++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.spec.utils.GeneralConfiguration.SPEC_TEST_PATH import org.jetbrains.kotlin.spec.utils.GeneralConfiguration.TESTS_MAP_FILENAME import org.jetbrains.kotlin.spec.utils.SectionsJsonMapGenerator import org.jetbrains.kotlin.spec.utils.TestsJsonMapGenerator -import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestSpec +import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTestSpec import org.jetbrains.kotlin.test.utils.CUSTOM_TEST_DATA_EXTENSION_PATTERN import java.io.File import java.nio.file.Files @@ -65,7 +65,7 @@ fun generateTests() { generateTestGroupSuiteWithJUnit5 { testGroup(testsRoot = "compiler/fir/analysis-tests/tests-gen", testDataRoot = SPEC_TESTDATA_PATH) { - testClass { + testClass { model( "diagnostics", excludeDirs = listOf("helpers") + detectDirsWithTestsMapFileOnly("diagnostics"), diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index fa071fc9707..f1fa40221a2 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -14,12 +14,12 @@ import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidBoxTest import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidBytecodeShapeTest import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidIrBoxTest import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidSyntheticPropertyDescriptorTest -import org.jetbrains.kotlin.assignment.plugin.AbstractFirBlackBoxCodegenTestForAssignmentPlugin -import org.jetbrains.kotlin.assignment.plugin.AbstractFirAssignmentPluginDiagnosticTest import org.jetbrains.kotlin.assignment.plugin.AbstractIrBlackBoxCodegenTestAssignmentPlugin import org.jetbrains.kotlin.assignment.plugin.AbstractAssignmentPluginDiagnosticTest -import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirPluginBlackBoxCodegenTest -import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirPluginDiagnosticTest +import org.jetbrains.kotlin.assignment.plugin.AbstractFirLightTreeBlackBoxCodegenTestForAssignmentPlugin +import org.jetbrains.kotlin.assignment.plugin.AbstractFirPsiAssignmentPluginDiagnosticTest +import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirLightTreePluginBlackBoxCodegenTest +import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirPsiPluginDiagnosticTest import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.generators.model.annotation @@ -226,7 +226,7 @@ fun main(args: Array) { model("box") } - testClass { + testClass { model("box") } @@ -242,17 +242,17 @@ fun main(args: Array) { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } - testClass { + testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } } testGroup("plugins/fir-plugin-prototype/tests-gen", "plugins/fir-plugin-prototype/testData") { - testClass { + testClass { model("diagnostics") } - testClass { + testClass { model("box") } } @@ -284,13 +284,13 @@ fun main(args: Array) { testClass { model("bytecodeListing", excludedPattern = excludedFirTestdataPattern) } - testClass { + testClass { model("bytecodeListing", excludedPattern = excludedFirTestdataPattern) } - testClass() { + testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } - testClass() { + testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } } @@ -299,7 +299,7 @@ fun main(args: Array) { testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } - testClass { + testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } testClass { @@ -308,7 +308,7 @@ fun main(args: Array) { testClass { model("bytecodeListing", excludedPattern = excludedFirTestdataPattern) } - testClass { + testClass { model("bytecodeListing", excludedPattern = excludedFirTestdataPattern) } testClass { @@ -317,7 +317,7 @@ fun main(args: Array) { testClass { model("box") } - testClass { + testClass { model("box") } } @@ -329,13 +329,13 @@ fun main(args: Array) { testClass { model("box") } - testClass { + testClass { model("box") } testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } - testClass { + testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } } @@ -344,13 +344,13 @@ fun main(args: Array) { testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } - testClass { + testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } testClass { model("codegen", excludedPattern = excludedFirTestdataPattern) } - testClass { + testClass { model("codegen", excludedPattern = excludedFirTestdataPattern) } } @@ -388,13 +388,13 @@ fun main(args: Array) { testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } - testClass { + testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } testClass { model("codegen", excludedPattern = excludedFirTestdataPattern) } - testClass { + testClass { model("codegen", excludedPattern = excludedFirTestdataPattern) } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index f3765fab673..e140f93b9ce 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.js.test.ir.* import org.jetbrains.kotlin.js.testOld.AbstractDceTest import org.jetbrains.kotlin.js.testOld.compatibility.binary.AbstractJsKlibBinaryCompatibilityTest import org.jetbrains.kotlin.test.TargetBackend -import org.jetbrains.kotlin.test.runners.ir.AbstractFir2IrJsTextTest +import org.jetbrains.kotlin.test.runners.ir.AbstractFirLightTreeIrJsTextTest fun main(args: Array) { System.setProperty("java.awt.headless", "true") @@ -170,12 +170,12 @@ fun main(args: Array) { model("debug/localVariables") } - testClass(suiteTestClassName = "FirJsOldFrontendDiagnosticsTestGenerated") { + testClass(suiteTestClassName = "FirPsiJsOldFrontendDiagnosticsTestGenerated") { model("diagnostics/testsWithJsStdLib", pattern = "^([^_](.+))\\.kt$", excludedPattern = excludedFirTestdataPattern) } - testClass( - suiteTestClassName = "Fir2IrJsTextTestGenerated" + testClass( + suiteTestClassName = "FirLightTreeJsIrTextTestGenerated" ) { model("ir/irJsText") } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirJsDiagnosticTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt similarity index 88% rename from js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirJsDiagnosticTest.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt index d2670ed3854..90a806a1b1f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirJsDiagnosticTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt @@ -7,10 +7,12 @@ package org.jetbrains.kotlin.js.test.fir import org.jetbrains.kotlin.js.test.JsAdditionalSourceProvider import org.jetbrains.kotlin.platform.js.JsPlatforms +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.firHandlersStep import org.jetbrains.kotlin.test.directives.ConfigurationDirectives import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade import org.jetbrains.kotlin.test.frontend.fir.handlers.* import org.jetbrains.kotlin.test.model.DependencyKind @@ -22,7 +24,7 @@ import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigu import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator import org.jetbrains.kotlin.test.services.sourceProviders.CoroutineHelpersSourceFilesProvider -abstract class AbstractFirJsDiagnosticTest : AbstractKotlinCompilerTest() { +abstract class AbstractFirJsDiagnosticTestBase(val parser: FirParser) : AbstractKotlinCompilerTest() { override fun TestConfigurationBuilder.configuration() { globalDefaults { frontend = FrontendKinds.FIR @@ -35,6 +37,8 @@ abstract class AbstractFirJsDiagnosticTest : AbstractKotlinCompilerTest() { DiagnosticsDirectives.DIAGNOSTICS with listOf("-warnings", "-infos") } + configureFirParser(parser) + enableMetaInfoHandler() configurationForClassicAndFirTestsAlongside() @@ -64,3 +68,5 @@ abstract class AbstractFirJsDiagnosticTest : AbstractKotlinCompilerTest() { } } } + +abstract class AbstractFirPsiJsDiagnosticTest : AbstractFirJsDiagnosticTestBase(FirParser.Psi) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt index 6805a0e53ba..e8331924bc8 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractJsFirTest.kt @@ -7,10 +7,12 @@ import org.jetbrains.kotlin.js.test.converters.incremental.RecompileModuleJsIrBa import org.jetbrains.kotlin.js.test.handlers.JsIrRecompiledArtifactsIdentityHandler import org.jetbrains.kotlin.parsing.parseBoolean import org.jetbrains.kotlin.test.Constructor +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.ir.IrBackendInput import org.jetbrains.kotlin.test.builders.* import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives +import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJsResultsConverter @@ -59,6 +61,7 @@ open class AbstractFirJsTest( +LanguageSettingsDirectives.ALLOW_KOTLIN_PACKAGE -JsEnvironmentConfigurationDirectives.GENERATE_NODE_JS_RUNNER DiagnosticsDirectives.DIAGNOSTICS with listOf("-infos") + FirDiagnosticsDirectives.FIR_PARSER with FirParser.Psi } firHandlersStep { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsOldFrontendDiagnosticsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsOldFrontendDiagnosticsTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsOldFrontendDiagnosticsTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsOldFrontendDiagnosticsTestGenerated.java index f08360bb872..40d057deeac 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsOldFrontendDiagnosticsTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsOldFrontendDiagnosticsTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib") @TestDataPath("$PROJECT_ROOT") -public class FirJsOldFrontendDiagnosticsTestGenerated extends AbstractFirJsDiagnosticTest { +public class FirPsiJsOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiJsDiagnosticTest { @Test public void testAllFilesPresentInTestsWithJsStdLib() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib"), Pattern.compile("^([^_](.+))\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrJsTextTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJsIrTextTestGenerated.java similarity index 98% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrJsTextTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJsIrTextTestGenerated.java index f2a148d52cd..c880e2feb20 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrJsTextTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJsIrTextTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/ir/irJsText") @TestDataPath("$PROJECT_ROOT") -public class Fir2IrJsTextTestGenerated extends AbstractFir2IrJsTextTest { +public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeIrJsTextTest { @Test public void testAllFilesPresentInIrJsText() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irJsText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt b/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt index adc653eaa9a..8ea013106e5 100644 --- a/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt +++ b/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt @@ -17,12 +17,14 @@ package org.jetbrains.kotlin.allopen import org.jetbrains.kotlin.test.Constructor +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.classic.ClassicBackendInput import org.jetbrains.kotlin.test.backend.classic.ClassicJvmBackendFacade import org.jetbrains.kotlin.test.backend.ir.IrBackendInput import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder +import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade @@ -69,7 +71,7 @@ open class AbstractIrBytecodeListingTestForAllOpen : get() = ::JvmIrBackendFacade } -open class AbstractFirBytecodeListingTestForAllOpen : +open class AbstractFirPsiBytecodeListingTestForAllOpen : AbstractBytecodeListingTestForAllOpenBase( TargetBackend.JVM_IR, FrontendKinds.FIR ) { @@ -79,4 +81,9 @@ open class AbstractFirBytecodeListingTestForAllOpen : get() = ::Fir2IrResultsConverter override val backendFacade: Constructor> get() = ::JvmIrBackendFacade + + override fun configure(builder: TestConfigurationBuilder) { + super.configure(builder) + builder.configureFirParser(FirParser.Psi) + } } diff --git a/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractFirDiagnosticTestForAllOpen.kt b/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractFirDiagnosticTestForAllOpen.kt index c6a1cc3bd28..2c59edb47c5 100644 --- a/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractFirDiagnosticTestForAllOpen.kt +++ b/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractFirDiagnosticTestForAllOpen.kt @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.allopen import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives -import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTest +import org.jetbrains.kotlin.test.FirParser +import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestBase import org.jetbrains.kotlin.test.runners.configurationForClassicAndFirTestsAlongside -abstract class AbstractFirDiagnosticTestForAllOpen : AbstractFirDiagnosticTest() { +abstract class AbstractFirDiagnosticTestForAllOpenBase(parser: FirParser) : AbstractFirDiagnosticTestBase(parser) { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) @@ -32,14 +32,5 @@ abstract class AbstractFirDiagnosticTestForAllOpen : AbstractFirDiagnosticTest() } } -abstract class AbstractFirDiagnosticsWithLightTreeTestForAllOpen : AbstractFirDiagnosticTestForAllOpen() { - override fun configure(builder: TestConfigurationBuilder) { - super.configure(builder) - - with(builder) { - defaultDirectives { - +FirDiagnosticsDirectives.USE_LIGHT_TREE - } - } - } -} +abstract class AbstractFirPsiDiagnosticTestForAllOpen : AbstractFirDiagnosticTestForAllOpenBase(FirParser.Psi) +abstract class AbstractFirLightTreeDiagnosticTestForAllOpen : AbstractFirDiagnosticTestForAllOpenBase(FirParser.LightTree) diff --git a/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirDiagnosticsWithLightTreeTestForAllOpenGenerated.java b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirLightTreeDiagnosticTestForAllOpenGenerated.java similarity index 90% rename from plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirDiagnosticsWithLightTreeTestForAllOpenGenerated.java rename to plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirLightTreeDiagnosticTestForAllOpenGenerated.java index cf9becffed0..fd56b4abdba 100644 --- a/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirDiagnosticsWithLightTreeTestForAllOpenGenerated.java +++ b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirLightTreeDiagnosticTestForAllOpenGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/allopen/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") -public class FirDiagnosticsWithLightTreeTestForAllOpenGenerated extends AbstractFirDiagnosticsWithLightTreeTestForAllOpen { +public class FirLightTreeDiagnosticTestForAllOpenGenerated extends AbstractFirLightTreeDiagnosticTestForAllOpen { @Test public void testAllFilesPresentInDiagnostics() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/allopen/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); diff --git a/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirBytecodeListingTestForAllOpenGenerated.java b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirPsiBytecodeListingTestForAllOpenGenerated.java similarity index 97% rename from plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirBytecodeListingTestForAllOpenGenerated.java rename to plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirPsiBytecodeListingTestForAllOpenGenerated.java index 49fb72691f9..ae99ea1c374 100644 --- a/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirBytecodeListingTestForAllOpenGenerated.java +++ b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirPsiBytecodeListingTestForAllOpenGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/allopen/testData/bytecodeListing") @TestDataPath("$PROJECT_ROOT") -public class FirBytecodeListingTestForAllOpenGenerated extends AbstractFirBytecodeListingTestForAllOpen { +public class FirPsiBytecodeListingTestForAllOpenGenerated extends AbstractFirPsiBytecodeListingTestForAllOpen { @Test public void testAllFilesPresentInBytecodeListing() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/allopen/testData/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), TargetBackend.JVM_IR, true); diff --git a/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirDiagnosticTestForAllOpenGenerated.java b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirPsiDiagnosticTestForAllOpenGenerated.java similarity index 92% rename from plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirDiagnosticTestForAllOpenGenerated.java rename to plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirPsiDiagnosticTestForAllOpenGenerated.java index 9e8f6770017..8ecd46ca028 100644 --- a/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirDiagnosticTestForAllOpenGenerated.java +++ b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirPsiDiagnosticTestForAllOpenGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/allopen/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") -public class FirDiagnosticTestForAllOpenGenerated extends AbstractFirDiagnosticTestForAllOpen { +public class FirPsiDiagnosticTestForAllOpenGenerated extends AbstractFirPsiDiagnosticTestForAllOpen { @Test public void testAllFilesPresentInDiagnostics() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/allopen/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); diff --git a/plugins/assign-plugin/test/org/jetbrains/kotlin/assignment/plugin/AssignmentPluginTests.kt b/plugins/assign-plugin/test/org/jetbrains/kotlin/assignment/plugin/AssignmentPluginTests.kt index 40fbc296b9f..5a3b4494429 100644 --- a/plugins/assign-plugin/test/org/jetbrains/kotlin/assignment/plugin/AssignmentPluginTests.kt +++ b/plugins/assign-plugin/test/org/jetbrains/kotlin/assignment/plugin/AssignmentPluginTests.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.RENDER_DIAGNOSTICS_FULL_TEXT import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.runners.AbstractDiagnosticTest -import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTest -import org.jetbrains.kotlin.test.runners.codegen.AbstractFirBlackBoxCodegenTest +import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTest +import org.jetbrains.kotlin.test.runners.codegen.AbstractFirLightTreeBlackBoxCodegenTest import org.jetbrains.kotlin.test.runners.codegen.AbstractIrBlackBoxCodegenTest import org.jetbrains.kotlin.test.runners.configurationForClassicAndFirTestsAlongside import org.jetbrains.kotlin.test.services.EnvironmentConfigurator @@ -33,7 +33,7 @@ abstract class AbstractAssignmentPluginDiagnosticTest : AbstractDiagnosticTest() } } -abstract class AbstractFirAssignmentPluginDiagnosticTest : AbstractFirDiagnosticTest() { +abstract class AbstractFirPsiAssignmentPluginDiagnosticTest : AbstractFirPsiDiagnosticTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.configurePlugin() @@ -51,7 +51,7 @@ open class AbstractIrBlackBoxCodegenTestAssignmentPlugin : AbstractIrBlackBoxCod } } -open class AbstractFirBlackBoxCodegenTestForAssignmentPlugin : AbstractFirBlackBoxCodegenTest() { +open class AbstractFirLightTreeBlackBoxCodegenTestForAssignmentPlugin : AbstractFirLightTreeBlackBoxCodegenTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.configurePlugin() diff --git a/plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirBlackBoxCodegenTestForAssignmentPluginGenerated.java b/plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirLightTreeBlackBoxCodegenTestForAssignmentPluginGenerated.java similarity index 94% rename from plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirBlackBoxCodegenTestForAssignmentPluginGenerated.java rename to plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirLightTreeBlackBoxCodegenTestForAssignmentPluginGenerated.java index bf5eb1e4cae..33d5740f05f 100644 --- a/plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirBlackBoxCodegenTestForAssignmentPluginGenerated.java +++ b/plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirLightTreeBlackBoxCodegenTestForAssignmentPluginGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/assign-plugin/testData/codegen") @TestDataPath("$PROJECT_ROOT") -public class FirBlackBoxCodegenTestForAssignmentPluginGenerated extends AbstractFirBlackBoxCodegenTestForAssignmentPlugin { +public class FirLightTreeBlackBoxCodegenTestForAssignmentPluginGenerated extends AbstractFirLightTreeBlackBoxCodegenTestForAssignmentPlugin { @Test public void testAllFilesPresentInCodegen() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/assign-plugin/testData/codegen"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), TargetBackend.JVM_IR, true); diff --git a/plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirAssignmentPluginDiagnosticTestGenerated.java b/plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirPsiAssignmentPluginDiagnosticTestGenerated.java similarity index 95% rename from plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirAssignmentPluginDiagnosticTestGenerated.java rename to plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirPsiAssignmentPluginDiagnosticTestGenerated.java index 1de84395750..6045aa2584f 100644 --- a/plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirAssignmentPluginDiagnosticTestGenerated.java +++ b/plugins/assign-plugin/tests-gen/org/jetbrains/kotlin/assignment/plugin/FirPsiAssignmentPluginDiagnosticTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/assign-plugin/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") -public class FirAssignmentPluginDiagnosticTestGenerated extends AbstractFirAssignmentPluginDiagnosticTest { +public class FirPsiAssignmentPluginDiagnosticTestGenerated extends AbstractFirPsiAssignmentPluginDiagnosticTest { @Test public void testAllFilesPresentInDiagnostics() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/assign-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); diff --git a/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginBlackBoxCodegenTestGenerated.java b/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirLightTreePluginBlackBoxCodegenTestGenerated.java similarity index 96% rename from plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginBlackBoxCodegenTestGenerated.java rename to plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirLightTreePluginBlackBoxCodegenTestGenerated.java index 96141894daf..bae7fb53c4d 100644 --- a/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginBlackBoxCodegenTestGenerated.java +++ b/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirLightTreePluginBlackBoxCodegenTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/fir-plugin-prototype/testData/box") @TestDataPath("$PROJECT_ROOT") -public class FirPluginBlackBoxCodegenTestGenerated extends AbstractFirPluginBlackBoxCodegenTest { +public class FirLightTreePluginBlackBoxCodegenTestGenerated extends AbstractFirLightTreePluginBlackBoxCodegenTest { @Test public void testAllFilesPresentInBox() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginDiagnosticTestGenerated.java b/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPsiPluginDiagnosticTestGenerated.java similarity index 98% rename from plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginDiagnosticTestGenerated.java rename to plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPsiPluginDiagnosticTestGenerated.java index 79495e9da36..8999f69bda2 100644 --- a/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginDiagnosticTestGenerated.java +++ b/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPsiPluginDiagnosticTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/fir-plugin-prototype/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") -public class FirPluginDiagnosticTestGenerated extends AbstractFirPluginDiagnosticTest { +public class FirPsiPluginDiagnosticTestGenerated extends AbstractFirPsiPluginDiagnosticTest { @Test public void testAllFilesPresentInDiagnostics() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true); diff --git a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt index a7d6e33c1c1..7eb730926d7 100644 --- a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt +++ b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt @@ -10,18 +10,18 @@ import org.jetbrains.kotlin.fir.plugin.services.PluginAnnotationsProvider import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP -import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTest -import org.jetbrains.kotlin.test.runners.codegen.AbstractFirBlackBoxCodegenTest +import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTest +import org.jetbrains.kotlin.test.runners.codegen.AbstractFirLightTreeBlackBoxCodegenTest import org.jetbrains.kotlin.test.runners.enableLazyResolvePhaseChecking -open class AbstractFirPluginBlackBoxCodegenTest : AbstractFirBlackBoxCodegenTest() { +open class AbstractFirLightTreePluginBlackBoxCodegenTest : AbstractFirLightTreeBlackBoxCodegenTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.commonFirWithPluginFrontendConfiguration() } } -abstract class AbstractFirPluginDiagnosticTest : AbstractFirDiagnosticTest() { +abstract class AbstractFirPsiPluginDiagnosticTest : AbstractFirPsiDiagnosticTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.commonFirWithPluginFrontendConfiguration() diff --git a/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFir2IrAsmLikeInstructionsListingTestGenerated.java b/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirLightTreeAsmLikeInstructionsListingTestGenerated.java similarity index 92% rename from plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFir2IrAsmLikeInstructionsListingTestGenerated.java rename to plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirLightTreeAsmLikeInstructionsListingTestGenerated.java index 0fe03620e9f..4639d5fb9a9 100644 --- a/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFir2IrAsmLikeInstructionsListingTestGenerated.java +++ b/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirLightTreeAsmLikeInstructionsListingTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/kotlinx-serialization/testData/codegen") @TestDataPath("$PROJECT_ROOT") -public class SerializationFir2IrAsmLikeInstructionsListingTestGenerated extends AbstractSerializationFir2IrAsmLikeInstructionsListingTest { +public class SerializationFirLightTreeAsmLikeInstructionsListingTestGenerated extends AbstractSerializationFirLightTreeAsmLikeInstructionsListingTest { @Test public void testAllFilesPresentInCodegen() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/kotlinx-serialization/testData/codegen"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirBlackBoxTestGenerated.java b/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirLightTreeBlackBoxTestGenerated.java similarity index 99% rename from plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirBlackBoxTestGenerated.java rename to plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirLightTreeBlackBoxTestGenerated.java index a56971730b0..70f34f7c4a8 100644 --- a/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirBlackBoxTestGenerated.java +++ b/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirLightTreeBlackBoxTestGenerated.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlinx.serialization.TestGeneratorKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -public class SerializationFirBlackBoxTestGenerated extends AbstractSerializationFirBlackBoxTest { +public class SerializationFirLightTreeBlackBoxTestGenerated extends AbstractSerializationFirLightTreeBlackBoxTest { @Nested @TestMetadata("plugins/kotlinx-serialization/testData/boxIr") @TestDataPath("$PROJECT_ROOT") diff --git a/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirDiagnosticTestGenerated.java b/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirPsiDiagnosticTestGenerated.java similarity index 98% rename from plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirDiagnosticTestGenerated.java rename to plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirPsiDiagnosticTestGenerated.java index 58708e89873..16e71234ffc 100644 --- a/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirDiagnosticTestGenerated.java +++ b/plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirPsiDiagnosticTestGenerated.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlinx.serialization.TestGeneratorKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -public class SerializationFirDiagnosticTestGenerated extends AbstractSerializationFirDiagnosticTest { +public class SerializationFirPsiDiagnosticTestGenerated extends AbstractSerializationFirPsiDiagnosticTest { @Nested @TestMetadata("plugins/kotlinx-serialization/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") diff --git a/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/TestGenerator.kt b/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/TestGenerator.kt index bf8086815ec..ce3a36eb83c 100644 --- a/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/TestGenerator.kt +++ b/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/TestGenerator.kt @@ -23,7 +23,7 @@ fun main(args: Array) { model("diagnostics", excludedPattern = excludedFirTestdataPattern) } - testClass { + testClass { model("diagnostics", excludedPattern = excludedFirTestdataPattern) model("firMembers") } @@ -38,7 +38,7 @@ fun main(args: Array) { model("codegen") } - testClass { + testClass { model("codegen") } @@ -48,7 +48,7 @@ fun main(args: Array) { model("boxIr") } - testClass { + testClass { model("boxIr") model("firMembers") } diff --git a/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/AsmLikeInstructionsListingTests.kt b/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/AsmLikeInstructionsListingTests.kt index b3dd8b589cf..ebb0f247b92 100644 --- a/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/AsmLikeInstructionsListingTests.kt +++ b/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/AsmLikeInstructionsListingTests.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlinx.serialization.runners import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.AsmLikeInstructionListingDirectives import org.jetbrains.kotlin.test.runners.codegen.AbstractAsmLikeInstructionListingTest -import org.jetbrains.kotlin.test.runners.codegen.AbstractFirAsmLikeInstructionListingTest +import org.jetbrains.kotlin.test.runners.codegen.AbstractFirLightTreeAsmLikeInstructionListingTest import org.jetbrains.kotlin.test.runners.codegen.AbstractIrAsmLikeInstructionListingTest import org.jetbrains.kotlinx.serialization.configureForKotlinxSerialization @@ -28,7 +28,7 @@ open class AbstractSerializationIrAsmLikeInstructionsListingTest : AbstractIrAsm } } -open class AbstractSerializationFir2IrAsmLikeInstructionsListingTest : AbstractFirAsmLikeInstructionListingTest() { +open class AbstractSerializationFirLightTreeAsmLikeInstructionsListingTest : AbstractFirLightTreeAsmLikeInstructionListingTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.defaultDirectives { diff --git a/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/BoxTests.kt b/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/BoxTests.kt index 24c359b84b1..6c4a9c5740e 100644 --- a/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/BoxTests.kt +++ b/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/BoxTests.kt @@ -6,8 +6,7 @@ package org.jetbrains.kotlinx.serialization.runners import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP -import org.jetbrains.kotlin.test.runners.codegen.AbstractFirBlackBoxCodegenTest +import org.jetbrains.kotlin.test.runners.codegen.AbstractFirLightTreeBlackBoxCodegenTest import org.jetbrains.kotlin.test.runners.codegen.AbstractIrBlackBoxCodegenTest import org.jetbrains.kotlinx.serialization.configureForKotlinxSerialization @@ -25,7 +24,7 @@ open class AbstractSerializationWithoutRuntimeIrBoxTest : AbstractIrBlackBoxCode } } -open class AbstractSerializationFirBlackBoxTest : AbstractFirBlackBoxCodegenTest() { +open class AbstractSerializationFirLightTreeBlackBoxTest : AbstractFirLightTreeBlackBoxCodegenTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.configureForKotlinxSerialization() diff --git a/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/DiagnosticTests.kt b/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/DiagnosticTests.kt index 24865205d45..db316994381 100644 --- a/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/DiagnosticTests.kt +++ b/plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/DiagnosticTests.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP import org.jetbrains.kotlin.test.runners.AbstractDiagnosticTest -import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTest +import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTest import org.jetbrains.kotlin.test.runners.configurationForClassicAndFirTestsAlongside import org.jetbrains.kotlinx.serialization.configureForKotlinxSerialization @@ -23,7 +23,7 @@ abstract class AbstractSerializationPluginDiagnosticTest : AbstractDiagnosticTes } } -abstract class AbstractSerializationFirDiagnosticTest : AbstractFirDiagnosticTest() { +abstract class AbstractSerializationFirPsiDiagnosticTest : AbstractFirPsiDiagnosticTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) with(builder) { diff --git a/plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirBlackBoxCodegenTestForLombokGenerated.java b/plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirLightTreeBlackBoxCodegenTestForLombokGenerated.java similarity index 98% rename from plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirBlackBoxCodegenTestForLombokGenerated.java rename to plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirLightTreeBlackBoxCodegenTestForLombokGenerated.java index bfdfe1bf61f..e96818b5c63 100644 --- a/plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirBlackBoxCodegenTestForLombokGenerated.java +++ b/plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirLightTreeBlackBoxCodegenTestForLombokGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/lombok/testData/box") @TestDataPath("$PROJECT_ROOT") -public class FirBlackBoxCodegenTestForLombokGenerated extends AbstractFirBlackBoxCodegenTestForLombok { +public class FirLightTreeBlackBoxCodegenTestForLombokGenerated extends AbstractFirLightTreeBlackBoxCodegenTestForLombok { @Test @TestMetadata("accessorsStripPrefix.kt") public void testAccessorsStripPrefix() throws Exception { diff --git a/plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirDiagnosticTestForLombokGenerated.java b/plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirPsiDiagnosticTestForLombokGenerated.java similarity index 96% rename from plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirDiagnosticTestForLombokGenerated.java rename to plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirPsiDiagnosticTestForLombokGenerated.java index 53348ce06f7..3333703e354 100644 --- a/plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirDiagnosticTestForLombokGenerated.java +++ b/plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/FirPsiDiagnosticTestForLombokGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/lombok/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") -public class FirDiagnosticTestForLombokGenerated extends AbstractFirDiagnosticTestForLombok { +public class FirPsiDiagnosticTestForLombokGenerated extends AbstractFirPsiDiagnosticTestForLombok { @Test @TestMetadata("accessorsStripPrefixCombined.kt") public void testAccessorsStripPrefixCombined() throws Exception { diff --git a/plugins/lombok/tests/org/jetbrains/kotlin/lombok/LombokTests.kt b/plugins/lombok/tests/org/jetbrains/kotlin/lombok/LombokTests.kt index a00986243d4..0afbcb64ce4 100644 --- a/plugins/lombok/tests/org/jetbrains/kotlin/lombok/LombokTests.kt +++ b/plugins/lombok/tests/org/jetbrains/kotlin/lombok/LombokTests.kt @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.lombok import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.runners.AbstractDiagnosticTest -import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTest +import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTest import org.jetbrains.kotlin.test.runners.codegen.AbstractBlackBoxCodegenTest -import org.jetbrains.kotlin.test.runners.codegen.AbstractFirBlackBoxCodegenTest +import org.jetbrains.kotlin.test.runners.codegen.AbstractFirLightTreeBlackBoxCodegenTest import org.jetbrains.kotlin.test.runners.codegen.AbstractIrBlackBoxCodegenTest import org.jetbrains.kotlin.test.runners.configurationForClassicAndFirTestsAlongside @@ -29,7 +29,7 @@ open class AbstractIrBlackBoxCodegenTestForLombok : AbstractIrBlackBoxCodegenTes } } -open class AbstractFirBlackBoxCodegenTestForLombok : AbstractFirBlackBoxCodegenTest() { +open class AbstractFirLightTreeBlackBoxCodegenTestForLombok : AbstractFirLightTreeBlackBoxCodegenTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.enableLombok() @@ -45,7 +45,7 @@ open class AbstractDiagnosticTestForLombok : AbstractDiagnosticTest() { } } -open class AbstractFirDiagnosticTestForLombok : AbstractFirDiagnosticTest() { +open class AbstractFirPsiDiagnosticTestForLombok : AbstractFirPsiDiagnosticTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.configurationForClassicAndFirTestsAlongside() diff --git a/plugins/noarg/test/org/jetbrains/kotlin/noarg/NoArgTests.kt b/plugins/noarg/test/org/jetbrains/kotlin/noarg/NoArgTests.kt index 0c64dca0eb6..343bdc9062f 100644 --- a/plugins/noarg/test/org/jetbrains/kotlin/noarg/NoArgTests.kt +++ b/plugins/noarg/test/org/jetbrains/kotlin/noarg/NoArgTests.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.test.directives.model.DirectivesContainer import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.runners.AbstractDiagnosticTest -import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTest +import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTest import org.jetbrains.kotlin.test.runners.codegen.* import org.jetbrains.kotlin.test.runners.configurationForClassicAndFirTestsAlongside import org.jetbrains.kotlin.test.services.EnvironmentConfigurator @@ -34,7 +34,7 @@ open class AbstractIrBlackBoxCodegenTestForNoArg : AbstractIrBlackBoxCodegenTest } } -open class AbstractFirBlackBoxCodegenTestForNoArg : AbstractFirBlackBoxCodegenTest() { +open class AbstractFirLightTreeBlackBoxCodegenTestForNoArg : AbstractFirLightTreeBlackBoxCodegenTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.enableNoArg() @@ -57,7 +57,7 @@ open class AbstractIrBytecodeListingTestForNoArg : AbstractIrBytecodeListingTest } } -open class AbstractFirBytecodeListingTestForNoArg : AbstractFirBytecodeListingTest() { +open class AbstractFirLightTreeBytecodeListingTestForNoArg : AbstractFirLightTreeBytecodeListingTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.enableNoArg() @@ -73,7 +73,7 @@ abstract class AbstractDiagnosticsTestForNoArg : AbstractDiagnosticTest() { } } -abstract class AbstractFirDiagnosticsTestForNoArg : AbstractFirDiagnosticTest() { +abstract class AbstractFirPsiDiagnosticsTestForNoArg : AbstractFirPsiDiagnosticTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.configurationForClassicAndFirTestsAlongside() diff --git a/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirBlackBoxCodegenTestForNoArgGenerated.java b/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirLightTreeBlackBoxCodegenTestForNoArgGenerated.java similarity index 96% rename from plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirBlackBoxCodegenTestForNoArgGenerated.java rename to plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirLightTreeBlackBoxCodegenTestForNoArgGenerated.java index 2c5f6e5ede0..c727d6d77d1 100644 --- a/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirBlackBoxCodegenTestForNoArgGenerated.java +++ b/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirLightTreeBlackBoxCodegenTestForNoArgGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/noarg/testData/box") @TestDataPath("$PROJECT_ROOT") -public class FirBlackBoxCodegenTestForNoArgGenerated extends AbstractFirBlackBoxCodegenTestForNoArg { +public class FirLightTreeBlackBoxCodegenTestForNoArgGenerated extends AbstractFirLightTreeBlackBoxCodegenTestForNoArg { @Test public void testAllFilesPresentInBox() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/noarg/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirBytecodeListingTestForNoArgGenerated.java b/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirLightTreeBytecodeListingTestForNoArgGenerated.java similarity index 95% rename from plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirBytecodeListingTestForNoArgGenerated.java rename to plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirLightTreeBytecodeListingTestForNoArgGenerated.java index 74379ba098f..797bbef4144 100644 --- a/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirBytecodeListingTestForNoArgGenerated.java +++ b/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirLightTreeBytecodeListingTestForNoArgGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/noarg/testData/bytecodeListing") @TestDataPath("$PROJECT_ROOT") -public class FirBytecodeListingTestForNoArgGenerated extends AbstractFirBytecodeListingTestForNoArg { +public class FirLightTreeBytecodeListingTestForNoArgGenerated extends AbstractFirLightTreeBytecodeListingTestForNoArg { @Test public void testAllFilesPresentInBytecodeListing() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/noarg/testData/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), TargetBackend.JVM_IR, true); diff --git a/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirDiagnosticsTestForNoArgGenerated.java b/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirPsiDiagnosticsTestForNoArgGenerated.java similarity index 93% rename from plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirDiagnosticsTestForNoArgGenerated.java rename to plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirPsiDiagnosticsTestForNoArgGenerated.java index 5f7ffaf8162..87d63f1cb67 100644 --- a/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirDiagnosticsTestForNoArgGenerated.java +++ b/plugins/noarg/tests-gen/org/jetbrains/kotlin/noarg/FirPsiDiagnosticsTestForNoArgGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/noarg/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") -public class FirDiagnosticsTestForNoArgGenerated extends AbstractFirDiagnosticsTestForNoArg { +public class FirPsiDiagnosticsTestForNoArgGenerated extends AbstractFirPsiDiagnosticsTestForNoArg { @Test public void testAllFilesPresentInDiagnostics() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/noarg/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); diff --git a/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/FirParcelizeDiagnosticTestGenerated.java b/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/FirPsiParcelizeDiagnosticTestGenerated.java similarity index 98% rename from plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/FirParcelizeDiagnosticTestGenerated.java rename to plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/FirPsiParcelizeDiagnosticTestGenerated.java index 072bc4515c6..4827c46efad 100644 --- a/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/FirParcelizeDiagnosticTestGenerated.java +++ b/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/FirPsiParcelizeDiagnosticTestGenerated.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/parcelize/parcelize-compiler/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") -public class FirParcelizeDiagnosticTestGenerated extends AbstractFirParcelizeDiagnosticTest { +public class FirPsiParcelizeDiagnosticTestGenerated extends AbstractFirPsiParcelizeDiagnosticTest { @Test public void testAllFilesPresentInDiagnostics() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/parcelize/parcelize-compiler/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true); diff --git a/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/ParcelizeFirBoxTestGenerated.java b/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/ParcelizeFirLightTreeBoxTestGenerated.java similarity index 99% rename from plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/ParcelizeFirBoxTestGenerated.java rename to plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/ParcelizeFirLightTreeBoxTestGenerated.java index 893c95a2dfd..c5fd87c469f 100644 --- a/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/ParcelizeFirBoxTestGenerated.java +++ b/plugins/parcelize/parcelize-compiler/tests-gen/org/jetbrains/kotlin/parcelize/test/runners/ParcelizeFirLightTreeBoxTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("plugins/parcelize/parcelize-compiler/testData/box") @TestDataPath("$PROJECT_ROOT") -public class ParcelizeFirBoxTestGenerated extends AbstractParcelizeFirBoxTest { +public class ParcelizeFirLightTreeBoxTestGenerated extends AbstractParcelizeFirLightTreeBoxTest { @Test public void testAllFilesPresentInBox() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/parcelize/parcelize-compiler/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractFirParcelizeDiagnosticTest.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractFirPsiParcelizeDiagnosticTest.kt similarity index 81% rename from plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractFirParcelizeDiagnosticTest.kt rename to plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractFirPsiParcelizeDiagnosticTest.kt index ac442a690d2..9c816ba72e7 100644 --- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractFirParcelizeDiagnosticTest.kt +++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractFirPsiParcelizeDiagnosticTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.parcelize.test.runners import org.jetbrains.kotlin.parcelize.test.services.ParcelizeEnvironmentConfigurator +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor @@ -15,13 +16,14 @@ import org.jetbrains.kotlin.test.runners.baseFirDiagnosticTestConfiguration import org.jetbrains.kotlin.test.runners.enableLazyResolvePhaseChecking import org.jetbrains.kotlin.test.services.fir.FirOldFrontendMetaConfigurator -abstract class AbstractFirParcelizeDiagnosticTest : AbstractKotlinCompilerTest() { +abstract class AbstractFirParcelizeDiagnosticTestBase(val parser: FirParser) : AbstractKotlinCompilerTest() { override fun TestConfigurationBuilder.configuration() { baseFirDiagnosticTestConfiguration() enableLazyResolvePhaseChecking() defaultDirectives { +FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES + FirDiagnosticsDirectives.FIR_PARSER with parser } useConfigurators(::ParcelizeEnvironmentConfigurator) @@ -34,3 +36,5 @@ abstract class AbstractFirParcelizeDiagnosticTest : AbstractKotlinCompilerTest() useMetaTestConfigurators(::FirOldFrontendMetaConfigurator) } } + +abstract class AbstractFirPsiParcelizeDiagnosticTest : AbstractFirParcelizeDiagnosticTestBase(FirParser.Psi) diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt index 9397196550e..23592528234 100644 --- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt +++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.parcelize.test.services.ParcelizeMainClassProvider import org.jetbrains.kotlin.parcelize.test.services.ParcelizeRuntimeClasspathProvider import org.jetbrains.kotlin.parcelize.test.services.ParcelizeUtilSourcesProvider import org.jetbrains.kotlin.test.Constructor +import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor import org.jetbrains.kotlin.test.backend.classic.ClassicBackendInput @@ -23,6 +24,7 @@ import org.jetbrains.kotlin.test.builders.configureFirHandlersStep import org.jetbrains.kotlin.test.builders.configureIrHandlersStep import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.REQUIRES_SEPARATE_PROCESS import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO +import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter @@ -116,7 +118,7 @@ open class AbstractParcelizeIrBoxTest : AbstractParcelizeBoxTestBase( +abstract class AbstractParcelizeFirBoxTestBase(val parser: FirParser) : AbstractParcelizeBoxTestBase( FrontendKinds.FIR, TargetBackend.JVM_IR ) { @@ -133,7 +135,10 @@ open class AbstractParcelizeFirBoxTest : AbstractParcelizeBoxTestBase