From 27ffe7c31e59cda225ef0cdde9515b3011d35c29 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 22 Dec 2022 19:23:44 +0100 Subject: [PATCH] [LC] move scripts to lightClassByPsi --- ...olLightClassesForLibraryTestGenerated.java | 56 ++++++------------- ...ClassesLoadingForLibraryTestGenerated.java | 34 +++++++++-- ...assesParentingForLibraryTestGenerated.java | 56 ++++++------------- ...bolLightClassesForSourceTestGenerated.java | 56 ++++++------------- ...tClassesLoadingForSourceTestGenerated.java | 34 +++++++++-- ...lassesParentingForSourceTestGenerated.java | 56 ++++++------------- .../{publicField => }/CompanionObject.java | 0 .../{publicField => }/CompanionObject.kt | 0 .../{object => }/SimpleObject.java | 0 .../{object => }/SimpleObject.kt | 0 .../Simple.java => SimplePublicField.java} | 0 .../Simple.kt => SimplePublicField.kt} | 0 .../WithPlatformTypes.NoCompile.java | 9 +-- .../lightClasses/lightClassByPsi/script.java | 1 - .../lightClasses/lightClassByPsi/script.kts | 1 - .../lightClassByPsi/script.lib.java | 5 -- .../FunsPropsAndFields.fir.java} | 0 .../scripts}/FunsPropsAndFields.java | 0 .../scripts}/FunsPropsAndFields.kts | 0 .../scripts/FunsPropsAndFields.lib.java | 21 +++++++ .../scripts/HelloWorld.fir.java | 1 + .../scripts}/HelloWorld.java | 0 .../scripts}/HelloWorld.kts | 0 .../scripts/HelloWorld.lib.java | 5 ++ .../scripts/InnerClasses.fir.java | 1 + .../scripts}/InnerClasses.java | 7 ++- .../scripts}/InnerClasses.kts | 4 +- .../scripts/InnerClasses.lib.java | 29 ++++++++++ .../lightClasses/script/ide/HelloWorld.java | 6 -- .../lightClasses/script/ide/HelloWorld.kts | 3 - .../ultraLightScripts/InnerClasses.java | 7 --- .../ultraLightScripts/InnerClasses.kts | 11 ---- .../CompilerLightClassTestGenerated.java | 56 +++++-------------- 33 files changed, 210 insertions(+), 249 deletions(-) rename compiler/testData/asJava/lightClasses/lightClassByFqName/{publicField => }/CompanionObject.java (100%) rename compiler/testData/asJava/lightClasses/lightClassByFqName/{publicField => }/CompanionObject.kt (100%) rename compiler/testData/asJava/lightClasses/lightClassByFqName/{object => }/SimpleObject.java (100%) rename compiler/testData/asJava/lightClasses/lightClassByFqName/{object => }/SimpleObject.kt (100%) rename compiler/testData/asJava/lightClasses/lightClassByFqName/{publicField/Simple.java => SimplePublicField.java} (100%) rename compiler/testData/asJava/lightClasses/lightClassByFqName/{publicField/Simple.kt => SimplePublicField.kt} (100%) delete mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/script.java delete mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/script.kts delete mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java rename compiler/testData/asJava/lightClasses/lightClassByPsi/{script.fir.java => scripts/FunsPropsAndFields.fir.java} (100%) rename compiler/testData/asJava/lightClasses/{ultraLightScripts => lightClassByPsi/scripts}/FunsPropsAndFields.java (100%) rename compiler/testData/asJava/lightClasses/{ultraLightScripts => lightClassByPsi/scripts}/FunsPropsAndFields.kts (100%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.lib.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.fir.java rename compiler/testData/asJava/lightClasses/{ultraLightScripts => lightClassByPsi/scripts}/HelloWorld.java (100%) rename compiler/testData/asJava/lightClasses/{ultraLightScripts => lightClassByPsi/scripts}/HelloWorld.kts (100%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.lib.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.fir.java rename compiler/testData/asJava/lightClasses/{script/ide => lightClassByPsi/scripts}/InnerClasses.java (94%) rename compiler/testData/asJava/lightClasses/{script/ide => lightClassByPsi/scripts}/InnerClasses.kts (84%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.lib.java delete mode 100644 compiler/testData/asJava/lightClasses/script/ide/HelloWorld.java delete mode 100644 compiler/testData/asJava/lightClasses/script/ide/HelloWorld.kts delete mode 100644 compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.java delete mode 100644 compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.kts diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java index 4e62bec0bcf..8b50171f049 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java @@ -78,6 +78,12 @@ public class SymbolLightClassesForLibraryTestGenerated extends AbstractSymbolLig runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.kt"); } + @Test + @TestMetadata("CompanionObject.kt") + public void testCompanionObject() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/CompanionObject.kt"); + } + @Test @TestMetadata("Constructors.kt") public void testConstructors() throws Exception { @@ -222,6 +228,18 @@ public class SymbolLightClassesForLibraryTestGenerated extends AbstractSymbolLig runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.kt"); } + @Test + @TestMetadata("SimpleObject.kt") + public void testSimpleObject() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SimpleObject.kt"); + } + + @Test + @TestMetadata("SimplePublicField.kt") + public void testSimplePublicField() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SimplePublicField.kt"); + } + @Test @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt") public void testSpecialAnnotationsOnAnnotationClass() throws Exception { @@ -478,44 +496,6 @@ public class SymbolLightClassesForLibraryTestGenerated extends AbstractSymbolLig } } - @Nested - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/object") - @TestDataPath("$PROJECT_ROOT") - public class Object { - @Test - public void testAllFilesPresentInObject() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("SimpleObject.kt") - public void testSimpleObject() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField") - @TestDataPath("$PROJECT_ROOT") - public class PublicField { - @Test - public void testAllFilesPresentInPublicField() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("CompanionObject.kt") - public void testCompanionObject() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.kt"); - } - - @Test - @TestMetadata("Simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.kt"); - } - } - @Nested @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/script") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java index b4285aaf8c2..a032735f1c6 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java @@ -222,12 +222,6 @@ public class SymbolLightClassesLoadingForLibraryTestGenerated extends AbstractSy runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/properties.kt"); } - @Test - @TestMetadata("script.kts") - public void testScript() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/script.kts"); - } - @Test @TestMetadata("simpleFunctions.kt") public void testSimpleFunctions() throws Exception { @@ -345,4 +339,32 @@ public class SymbolLightClassesLoadingForLibraryTestGenerated extends AbstractSy runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.kt"); } } + + @Nested + @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts") + @TestDataPath("$PROJECT_ROOT") + public class Scripts { + @Test + public void testAllFilesPresentInScripts() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true); + } + + @Test + @TestMetadata("FunsPropsAndFields.kts") + public void testFunsPropsAndFields() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.kts"); + } + + @Test + @TestMetadata("HelloWorld.kts") + public void testHelloWorld() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.kts"); + } + + @Test + @TestMetadata("InnerClasses.kts") + public void testInnerClasses() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.kts"); + } + } } diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingForLibraryTestGenerated.java index c40935a2b65..f8f476aa7dd 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingForLibraryTestGenerated.java @@ -78,6 +78,12 @@ public class SymbolLightClassesParentingForLibraryTestGenerated extends Abstract runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.kt"); } + @Test + @TestMetadata("CompanionObject.kt") + public void testCompanionObject() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/CompanionObject.kt"); + } + @Test @TestMetadata("Constructors.kt") public void testConstructors() throws Exception { @@ -222,6 +228,18 @@ public class SymbolLightClassesParentingForLibraryTestGenerated extends Abstract runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.kt"); } + @Test + @TestMetadata("SimpleObject.kt") + public void testSimpleObject() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SimpleObject.kt"); + } + + @Test + @TestMetadata("SimplePublicField.kt") + public void testSimplePublicField() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SimplePublicField.kt"); + } + @Test @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt") public void testSpecialAnnotationsOnAnnotationClass() throws Exception { @@ -478,44 +496,6 @@ public class SymbolLightClassesParentingForLibraryTestGenerated extends Abstract } } - @Nested - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/object") - @TestDataPath("$PROJECT_ROOT") - public class Object { - @Test - public void testAllFilesPresentInObject() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("SimpleObject.kt") - public void testSimpleObject() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField") - @TestDataPath("$PROJECT_ROOT") - public class PublicField { - @Test - public void testAllFilesPresentInPublicField() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("CompanionObject.kt") - public void testCompanionObject() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.kt"); - } - - @Test - @TestMetadata("Simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.kt"); - } - } - @Nested @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/script") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java index 7cb103cd8eb..4bd395f7683 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java @@ -78,6 +78,12 @@ public class SymbolLightClassesForSourceTestGenerated extends AbstractSymbolLigh runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.kt"); } + @Test + @TestMetadata("CompanionObject.kt") + public void testCompanionObject() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/CompanionObject.kt"); + } + @Test @TestMetadata("Constructors.kt") public void testConstructors() throws Exception { @@ -222,6 +228,18 @@ public class SymbolLightClassesForSourceTestGenerated extends AbstractSymbolLigh runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.kt"); } + @Test + @TestMetadata("SimpleObject.kt") + public void testSimpleObject() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SimpleObject.kt"); + } + + @Test + @TestMetadata("SimplePublicField.kt") + public void testSimplePublicField() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SimplePublicField.kt"); + } + @Test @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt") public void testSpecialAnnotationsOnAnnotationClass() throws Exception { @@ -614,44 +632,6 @@ public class SymbolLightClassesForSourceTestGenerated extends AbstractSymbolLigh } } - @Nested - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/object") - @TestDataPath("$PROJECT_ROOT") - public class Object { - @Test - public void testAllFilesPresentInObject() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("SimpleObject.kt") - public void testSimpleObject() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField") - @TestDataPath("$PROJECT_ROOT") - public class PublicField { - @Test - public void testAllFilesPresentInPublicField() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("CompanionObject.kt") - public void testCompanionObject() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.kt"); - } - - @Test - @TestMetadata("Simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.kt"); - } - } - @Nested @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/script") @TestDataPath("$PROJECT_ROOT") diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java index f0c9b7a6f12..91ab4f01054 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java @@ -222,12 +222,6 @@ public class SymbolLightClassesLoadingForSourceTestGenerated extends AbstractSym runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/properties.kt"); } - @Test - @TestMetadata("script.kts") - public void testScript() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/script.kts"); - } - @Test @TestMetadata("simpleFunctions.kt") public void testSimpleFunctions() throws Exception { @@ -345,4 +339,32 @@ public class SymbolLightClassesLoadingForSourceTestGenerated extends AbstractSym runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.kt"); } } + + @Nested + @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts") + @TestDataPath("$PROJECT_ROOT") + public class Scripts { + @Test + public void testAllFilesPresentInScripts() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true); + } + + @Test + @TestMetadata("FunsPropsAndFields.kts") + public void testFunsPropsAndFields() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.kts"); + } + + @Test + @TestMetadata("HelloWorld.kts") + public void testHelloWorld() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.kts"); + } + + @Test + @TestMetadata("InnerClasses.kts") + public void testInnerClasses() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.kts"); + } + } } diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingForSourceTestGenerated.java index bf206765d3c..fe2b9c84430 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingForSourceTestGenerated.java @@ -78,6 +78,12 @@ public class SymbolLightClassesParentingForSourceTestGenerated extends AbstractS runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.kt"); } + @Test + @TestMetadata("CompanionObject.kt") + public void testCompanionObject() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/CompanionObject.kt"); + } + @Test @TestMetadata("Constructors.kt") public void testConstructors() throws Exception { @@ -222,6 +228,18 @@ public class SymbolLightClassesParentingForSourceTestGenerated extends AbstractS runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.kt"); } + @Test + @TestMetadata("SimpleObject.kt") + public void testSimpleObject() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SimpleObject.kt"); + } + + @Test + @TestMetadata("SimplePublicField.kt") + public void testSimplePublicField() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SimplePublicField.kt"); + } + @Test @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt") public void testSpecialAnnotationsOnAnnotationClass() throws Exception { @@ -614,44 +632,6 @@ public class SymbolLightClassesParentingForSourceTestGenerated extends AbstractS } } - @Nested - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/object") - @TestDataPath("$PROJECT_ROOT") - public class Object { - @Test - public void testAllFilesPresentInObject() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("SimpleObject.kt") - public void testSimpleObject() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.kt"); - } - } - - @Nested - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField") - @TestDataPath("$PROJECT_ROOT") - public class PublicField { - @Test - public void testAllFilesPresentInPublicField() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("CompanionObject.kt") - public void testCompanionObject() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.kt"); - } - - @Test - @TestMetadata("Simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.kt"); - } - } - @Nested @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/script") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/CompanionObject.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/CompanionObject.java diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/CompanionObject.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/CompanionObject.kt diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/SimpleObject.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/SimpleObject.java diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/SimpleObject.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/SimpleObject.kt diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/SimplePublicField.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.java rename to compiler/testData/asJava/lightClasses/lightClassByFqName/SimplePublicField.java diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/SimplePublicField.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.kt rename to compiler/testData/asJava/lightClasses/lightClassByFqName/SimplePublicField.kt diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithPlatformTypes.NoCompile.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithPlatformTypes.NoCompile.java index 93864a39c9d..9351bee9876 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithPlatformTypes.NoCompile.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithPlatformTypes.NoCompile.java @@ -1,6 +1,3 @@ -public final class WithPlatformTypes implements p.J { - public WithPlatformTypes(@org.jetbrains.annotations.NotNull p.J j) { /* compiled code */ } - - @org.jetbrains.annotations.NotNull - public java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String b) { /* compiled code */ } -} \ No newline at end of file +public final class WithPlatformTypes /* p.WithPlatformTypes*/ implements p.J { + public WithPlatformTypes(@org.jetbrains.annotations.NotNull() p.J);// .ctor(p.J) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.java deleted file mode 100644 index 8b137891791..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.java +++ /dev/null @@ -1 +0,0 @@ - diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.kts b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.kts deleted file mode 100644 index dbb4bfd6c6f..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.kts +++ /dev/null @@ -1 +0,0 @@ -println("Hello, I'm in package") diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java deleted file mode 100644 index 164ddcfb7db..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.lib.java +++ /dev/null @@ -1,5 +0,0 @@ -public final class Script /* Script*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { - public Script(@org.jetbrains.annotations.NotNull() java.lang.String[]);// .ctor(java.lang.String[]) - - public static final void main(@org.jetbrains.annotations.NotNull() java.lang.String[]);// main(java.lang.String[]) -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/script.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/script.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.fir.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.kts b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.kts similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.kts rename to compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.kts diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.lib.java new file mode 100644 index 00000000000..ab3632e2d47 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.lib.java @@ -0,0 +1,21 @@ +public final class FunsPropsAndFields /* FunsPropsAndFields*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { + @kotlin.jvm.JvmField() + public final int testField; + + private final int testPropVal; + + private int testPropVar; + + @org.jetbrains.annotations.NotNull() + public final java.lang.String testFun(int);// testFun(int) + + public FunsPropsAndFields(@org.jetbrains.annotations.NotNull() java.lang.String[]);// .ctor(java.lang.String[]) + + public final int getTestPropVal();// getTestPropVal() + + public final int getTestPropVar();// getTestPropVar() + + public final void setTestPropVar(int);// setTestPropVar(int) + + public static final void main(@org.jetbrains.annotations.NotNull() java.lang.String[]);// main(java.lang.String[]) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.fir.java new file mode 100644 index 00000000000..1e1bc72eb77 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.fir.java @@ -0,0 +1 @@ +// NOT_GENERATED diff --git a/compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.java diff --git a/compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.kts b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.kts similarity index 100% rename from compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.kts rename to compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.kts diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.lib.java new file mode 100644 index 00000000000..f463cc286ed --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.lib.java @@ -0,0 +1,5 @@ +public final class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { + public HelloWorld(@org.jetbrains.annotations.NotNull() java.lang.String[]);// .ctor(java.lang.String[]) + + public static final void main(@org.jetbrains.annotations.NotNull() java.lang.String[]);// main(java.lang.String[]) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.fir.java new file mode 100644 index 00000000000..1e1bc72eb77 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.fir.java @@ -0,0 +1 @@ +// NOT_GENERATED diff --git a/compiler/testData/asJava/lightClasses/script/ide/InnerClasses.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java similarity index 94% rename from compiler/testData/asJava/lightClasses/script/ide/InnerClasses.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java index 36c306967d2..ae855acb048 100644 --- a/compiler/testData/asJava/lightClasses/script/ide/InnerClasses.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java @@ -3,6 +3,8 @@ public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.stan public static final void main(java.lang.String[]);// main(java.lang.String[]) + class Bar ... +} public static final class Bar /* InnerClasses.Bar*/ { private final int a; @@ -17,10 +19,11 @@ public static final class Bar /* InnerClasses.Bar*/ { public final int getB();// getB() + class Baz ... +} public static final class Baz /* InnerClasses.Bar.Baz*/ { public Baz();// .ctor() public final void doSomething();// doSomething() - -}}} +} diff --git a/compiler/testData/asJava/lightClasses/script/ide/InnerClasses.kts b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.kts similarity index 84% rename from compiler/testData/asJava/lightClasses/script/ide/InnerClasses.kts rename to compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.kts index 9e7716b9549..d9740d72414 100644 --- a/compiler/testData/asJava/lightClasses/script/ide/InnerClasses.kts +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.kts @@ -1,5 +1,5 @@ -// InnerClasses - +// IGNORE_FIR +// KT-55626 class Bar(val a: Int) { val b: Int = { 0 }() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.lib.java new file mode 100644 index 00000000000..425a16b689a --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.lib.java @@ -0,0 +1,29 @@ +public final class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { + public InnerClasses(@org.jetbrains.annotations.NotNull() java.lang.String[]);// .ctor(java.lang.String[]) + + public static final void main(@org.jetbrains.annotations.NotNull() java.lang.String[]);// main(java.lang.String[]) + + class Bar ... +} + +public static final class Bar /* InnerClasses.Bar*/ { + private final int a; + + private final int b; + + public Bar(int);// .ctor(int) + + public final int getA();// getA() + + public final int getAPlusB();// getAPlusB() + + public final int getB();// getB() + + class Baz ... +} + +public static final class Baz /* InnerClasses.Bar.Baz*/ { + public Baz();// .ctor() + + public final void doSomething();// doSomething() +} diff --git a/compiler/testData/asJava/lightClasses/script/ide/HelloWorld.java b/compiler/testData/asJava/lightClasses/script/ide/HelloWorld.java deleted file mode 100644 index a75336c5572..00000000000 --- a/compiler/testData/asJava/lightClasses/script/ide/HelloWorld.java +++ /dev/null @@ -1,6 +0,0 @@ -public class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { - public HelloWorld(java.lang.String[]);// .ctor(java.lang.String[]) - - public static final void main(java.lang.String[]);// main(java.lang.String[]) - -} diff --git a/compiler/testData/asJava/lightClasses/script/ide/HelloWorld.kts b/compiler/testData/asJava/lightClasses/script/ide/HelloWorld.kts deleted file mode 100644 index 7533d5e0f40..00000000000 --- a/compiler/testData/asJava/lightClasses/script/ide/HelloWorld.kts +++ /dev/null @@ -1,3 +0,0 @@ -// HelloWorld - -println("Hello world!") diff --git a/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.java b/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.java deleted file mode 100644 index ef2825e84f5..00000000000 --- a/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.java +++ /dev/null @@ -1,7 +0,0 @@ -public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { - public InnerClasses(java.lang.String[]);// .ctor(java.lang.String[]) - - public static final void main(java.lang.String[]);// main(java.lang.String[]) - - class Bar ... -} diff --git a/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.kts b/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.kts deleted file mode 100644 index 58fccbb1153..00000000000 --- a/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.kts +++ /dev/null @@ -1,11 +0,0 @@ -class Bar(val a: Int) { - val b: Int = { 0 }() - - fun getAPlusB() = a + b - - class Baz { - fun doSomething() { - - } - } -} diff --git a/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java index d100b1c1aa2..39b7923bd58 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java @@ -74,6 +74,11 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationRepeatable.kt"); } + @TestMetadata("CompanionObject.kt") + public void testCompanionObject() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/CompanionObject.kt"); + } + @TestMetadata("Constructors.kt") public void testConstructors() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/Constructors.kt"); @@ -194,6 +199,16 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/PublishedApi.kt"); } + @TestMetadata("SimpleObject.kt") + public void testSimpleObject() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SimpleObject.kt"); + } + + @TestMetadata("SimplePublicField.kt") + public void testSimplePublicField() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SimplePublicField.kt"); + } + @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt") public void testSpecialAnnotationsOnAnnotationClass() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SpecialAnnotationsOnAnnotationClass.kt"); @@ -491,47 +506,6 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT } } - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/object") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Object extends AbstractCompilerLightClassTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInObject() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName/object"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true); - } - - @TestMetadata("SimpleObject.kt") - public void testSimpleObject() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/object/SimpleObject.kt"); - } - } - - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class PublicField extends AbstractCompilerLightClassTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInPublicField() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true); - } - - @TestMetadata("CompanionObject.kt") - public void testCompanionObject() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/CompanionObject.kt"); - } - - @TestMetadata("Simple.kt") - public void testSimple() throws Exception { - runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/publicField/Simple.kt"); - } - } - @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/script") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)