diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.java b/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.java new file mode 100644 index 00000000000..e2f1a74734b --- /dev/null +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.java @@ -0,0 +1,3 @@ +public final class B { + public B() { /* compiled code */ } +} diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt new file mode 100644 index 00000000000..9062c54364c --- /dev/null +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt @@ -0,0 +1,4 @@ +// p.B +package p + +actual class B \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.java b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.java new file mode 100644 index 00000000000..027cc2431a7 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.java @@ -0,0 +1,2 @@ +public final class ActualTypeAliasKt { +} diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt new file mode 100644 index 00000000000..8f71bd33b22 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt @@ -0,0 +1,4 @@ +// p.ActualTypeAliasKt +package p + +actual typealias B = List \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java new file mode 100644 index 00000000000..5d6d9acee04 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java @@ -0,0 +1,3 @@ +@kotlin.jvm.JvmPackageName(name = "a.b.c") +public final class ActualTypeAliasCustomJvmPackageNameKt { +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt new file mode 100644 index 00000000000..8f318602b4e --- /dev/null +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt @@ -0,0 +1,5 @@ +// a.b.c.ActualTypeAliasCustomJvmPackageNameKt +@file:JvmPackageName("a.b.c") +package p + +actual typealias B = List \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.java b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.java new file mode 100644 index 00000000000..db21da09624 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.java @@ -0,0 +1,4 @@ +@kotlin.jvm.JvmPackageName(name = "a.b.c") +public final class JvmPackageNameKt { + public static final void f() { /* compiled code */ } +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt new file mode 100644 index 00000000000..39df8e290f1 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt @@ -0,0 +1,7 @@ +// a.b.c.JvmPackageNameKt +@file:JvmPackageName("a.b.c") +package p + +fun f() { + +} \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java index 000015b917e..925564c7704 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java @@ -149,6 +149,24 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class CompilationErrors extends AbstractCompilerLightClassTest { + @TestMetadata("ActualClass.kt") + public void testActualClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt"); + doTest(fileName); + } + + @TestMetadata("ActualTypeAlias.kt") + public void testActualTypeAlias() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt"); + doTest(fileName); + } + + @TestMetadata("ActualTypeAliasCustomJvmPackageName.kt") + public void testActualTypeAliasCustomJvmPackageName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt"); + doTest(fileName); + } + public void testAllFilesPresentInCompilationErrors() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @@ -165,6 +183,12 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT doTest(fileName); } + @TestMetadata("JvmPackageName.kt") + public void testJvmPackageName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt"); + doTest(fileName); + } + @TestMetadata("ExpectClass.kt") public void testExpectClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt"); diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java index 769b8f955ea..fb3b7592ea4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java @@ -149,6 +149,24 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class CompilationErrors extends AbstractIdeLightClassTest { + @TestMetadata("ActualClass.kt") + public void testActualClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt"); + doTest(fileName); + } + + @TestMetadata("ActualTypeAlias.kt") + public void testActualTypeAlias() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt"); + doTest(fileName); + } + + @TestMetadata("ActualTypeAliasCustomJvmPackageName.kt") + public void testActualTypeAliasCustomJvmPackageName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt"); + doTest(fileName); + } + public void testAllFilesPresentInCompilationErrors() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } @@ -165,6 +183,12 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { doTest(fileName); } + @TestMetadata("JvmPackageName.kt") + public void testJvmPackageName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt"); + doTest(fileName); + } + @TestMetadata("ExpectClass.kt") public void testExpectClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt");