From cdf4b1705263922ed3c72088f4541074b9abc81d Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 21 Dec 2023 17:28:52 +0100 Subject: [PATCH] K2 Scripting tests: adding tests on script decls visibility fixes (makes it stable) behavior of the script top-level declarations visibility in K2 scripts --- ...CompilerTestFE10TestdataTestGenerated.java | 6 + ...cCompilerTestFirTestdataTestGenerated.java | 10 + ...sticCompilerFE10TestDataTestGenerated.java | 6 + ...osticCompilerFirTestDataTestGenerated.java | 10 + ...clsShouldBeVisibleFromOtherSources.fir.txt | 57 +++++ ...ptDeclsShouldBeVisibleFromOtherSources.kts | 28 +++ .../scripts/scriptsDeclsMayConflict.fir.txt | 20 ++ .../scripts/scriptsDeclsMayConflict.kts | 12 ++ .../FirLightTreeDiagnosticsTestGenerated.java | 10 + .../FirPsiDiagnosticTestGenerated.java | 204 ++++++++++-------- ...siOldFrontendDiagnosticsTestGenerated.java | 6 + .../scriptDeclsShouldVisibleLocally.kts | 25 +++ .../test/runners/DiagnosticTestGenerated.java | 6 + .../generators/GenerateJUnit5CompilerTests.kt | 4 +- 14 files changed, 311 insertions(+), 93 deletions(-) create mode 100644 compiler/fir/analysis-tests/testData/resolve/scripts/scriptDeclsShouldBeVisibleFromOtherSources.fir.txt create mode 100644 compiler/fir/analysis-tests/testData/resolve/scripts/scriptDeclsShouldBeVisibleFromOtherSources.kts create mode 100644 compiler/fir/analysis-tests/testData/resolve/scripts/scriptsDeclsMayConflict.fir.txt create mode 100644 compiler/fir/analysis-tests/testData/resolve/scripts/scriptsDeclsMayConflict.kts create mode 100644 compiler/testData/diagnostics/tests/script/scriptDeclsShouldVisibleLocally.kts diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index 4f8c29bd29d..d0e2faf9f1c 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -34176,6 +34176,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/script/resolveInitializerOfDestructuringDeclarationOnce.kts"); } + @Test + @TestMetadata("scriptDeclsShouldVisibleLocally.kts") + public void testScriptDeclsShouldVisibleLocally() { + runTest("compiler/testData/diagnostics/tests/script/scriptDeclsShouldVisibleLocally.kts"); + } + @Test @TestMetadata("scriptScopes.kts") public void testScriptScopes() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java index 69018cef6ed..8fbc3e0bd8f 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java @@ -4472,6 +4472,16 @@ public class DiagnosticCompilerTestFirTestdataTestGenerated extends AbstractDiag } } + @Nested + @TestMetadata("compiler/fir/analysis-tests/testData/resolve/scripts") + @TestDataPath("$PROJECT_ROOT") + public class Scripts { + @Test + public void testAllFilesPresentInScripts() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/scripts"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + } + @Nested @TestMetadata("compiler/fir/analysis-tests/testData/resolve/smartcasts") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index aad6d76526e..9fa3d54c637 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -34176,6 +34176,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/script/resolveInitializerOfDestructuringDeclarationOnce.kts"); } + @Test + @TestMetadata("scriptDeclsShouldVisibleLocally.kts") + public void testScriptDeclsShouldVisibleLocally() { + runTest("compiler/testData/diagnostics/tests/script/scriptDeclsShouldVisibleLocally.kts"); + } + @Test @TestMetadata("scriptScopes.kts") public void testScriptScopes() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java index 391177e3a87..e85c8d1fb44 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java @@ -4472,6 +4472,16 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated } } + @Nested + @TestMetadata("compiler/fir/analysis-tests/testData/resolve/scripts") + @TestDataPath("$PROJECT_ROOT") + public class Scripts { + @Test + public void testAllFilesPresentInScripts() { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/scripts"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + } + @Nested @TestMetadata("compiler/fir/analysis-tests/testData/resolve/smartcasts") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/testData/resolve/scripts/scriptDeclsShouldBeVisibleFromOtherSources.fir.txt b/compiler/fir/analysis-tests/testData/resolve/scripts/scriptDeclsShouldBeVisibleFromOtherSources.fir.txt new file mode 100644 index 00000000000..ed15df1a433 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolve/scripts/scriptDeclsShouldBeVisibleFromOtherSources.fir.txt @@ -0,0 +1,57 @@ +FILE: script.kts + context(