[FIR] Remove lightTree exclusion dir from tests

It reverts changes introduced by cf6413e
JetBrains · Feb 13, 2025 · 04548b9 · 04548b9
1 parent 8e592cb
commit 04548b9
Show file tree

Hide file tree

Showing 8 changed files with 1,501 additions and 1,517 deletions.
diff --git a/...el/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/...el/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
diff --git a/...vel/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java b/...vel/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java
diff --git a/...c/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/...c/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
diff --git a/...ic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java b/...ic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java
diff --git a/...sts-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/...sts-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
diff --git a/...piler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/...piler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
@@ -312,7 +312,7 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
             }
 
             testClass<AbstractFirPsiBlackBoxCodegenTest> {
-                model("codegen/box", excludeDirs = k1BoxTestDir, excludeDirsRecursively = listOf("lightTree"))
+                model("codegen/box", excludeDirs = k1BoxTestDir)
             }
 
             testClass<AbstractFirLightTreeBlackBoxCodegenTest>("FirLightTreeBlackBoxModernJdkCodegenTestGenerated") {
@@ -432,20 +432,15 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
                     true -> TestGeneratorUtil.KT_OR_KTS_WITHOUT_DOTS_IN_NAME
                     false -> TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME
                 }
-                val excludeLightTreeForPsi =
-                    if (baseTestClassName == AbstractFirPsiDiagnosticTest::class.java.name) listOf("lightTree") else emptyList()
-
                 model(
                     "resolve",
                     pattern = pattern,
-                    excludeDirsRecursively = excludeLightTreeForPsi,
                     skipSpecificFile = skipSpecificFileForFirDiagnosticTest(onlyTypealiases),
                     skipTestAllFilesCheck = onlyTypealiases
                 )
                 model(
                     "resolveWithStdlib",
                     pattern = pattern,
-                    excludeDirsRecursively = excludeLightTreeForPsi,
                     skipSpecificFile = skipSpecificFileForFirDiagnosticTest(onlyTypealiases),
                     skipTestAllFilesCheck = onlyTypealiases
                 )
@@ -455,7 +450,6 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
                 model(
                     "resolveFreezesIDE",
                     pattern = """^(.+)\.(nkt)$""",
-                    excludeDirsRecursively = excludeLightTreeForPsi,
                     skipSpecificFile = skipSpecificFileForFirDiagnosticTest(onlyTypealiases),
                     skipTestAllFilesCheck = onlyTypealiases
                 )
@@ -531,7 +525,7 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
                 phasedModel(allowKts = false)
             }
             testClass<AbstractPhasedJvmDiagnosticPsiTest> {
-                phasedModel(allowKts = true, excludeDirsRecursively = listOf("lightTree"))
+                phasedModel(allowKts = true)
             }
         }
     }

diff --git a/...sis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt b/...sis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt
@@ -326,8 +326,8 @@ internal fun TestGroupSuite.generateFirLowLevelApiTests() {
         "compiler/fir/analysis-tests/testData",
     ) {
         fun TestGroup.TestClass.modelInit() {
-            model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, excludeDirsRecursively = listOf("lightTree"))
-            model("resolveWithStdlib", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, excludeDirsRecursively = listOf("lightTree"))
+            model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME)
+            model("resolveWithStdlib", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME)
         }
 
         testClass<AbstractDiagnosticCompilerTestDataTest>(suiteTestClassName = "DiagnosticCompilerTestFirTestdataTestGenerated") {
@@ -401,7 +401,6 @@ internal fun TestGroupSuite.generateFirLowLevelApiTests() {
                 "diagnostics/tests",
                 excludedPattern = CUSTOM_TEST_DATA_EXTENSION_PATTERN,
                 pattern = KT_OR_KTS,
-                excludeDirsRecursively = listOf("lightTree"),
             )
             model(
                 "diagnostics/testsWithStdLib",

diff --git a/...n/org/jetbrains/kotlin/konan/test/inlining/NativeUnboundIrSerializationTestGenerated.java b/...n/org/jetbrains/kotlin/konan/test/inlining/NativeUnboundIrSerializationTestGenerated.java